am 01d40534: Renaming id to prevent collision.
* commit '01d4053436a6a771b36b527a4f0ff49bbf468632':
Renaming id to prevent collision.
diff --git a/res/layout/all_apps_search_bar.xml b/res/layout/all_apps_search_bar.xml
index 9f4e322..8d75b15 100644
--- a/res/layout/all_apps_search_bar.xml
+++ b/res/layout/all_apps_search_bar.xml
@@ -40,7 +40,7 @@
android:src="@drawable/ic_arrow_back_grey" />
<com.android.launcher3.allapps.AllAppsSearchEditView
- android:id="@+id/search_box"
+ android:id="@+id/search_box_input"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/transparent"
diff --git a/src/com/android/launcher3/allapps/DefaultAppSearchController.java b/src/com/android/launcher3/allapps/DefaultAppSearchController.java
index a61df3a..20924af 100644
--- a/src/com/android/launcher3/allapps/DefaultAppSearchController.java
+++ b/src/com/android/launcher3/allapps/DefaultAppSearchController.java
@@ -83,7 +83,7 @@
mDismissSearchButtonView = mSearchBarContainerView.findViewById(R.id.dismiss_search_button);
mDismissSearchButtonView.setOnClickListener(this);
mSearchBarEditView = (AllAppsSearchEditView)
- mSearchBarContainerView.findViewById(R.id.search_box);
+ mSearchBarContainerView.findViewById(R.id.search_box_input);
mSearchBarEditView.addTextChangedListener(this);
mSearchBarEditView.setOnEditorActionListener(this);
mSearchBarEditView.setOnBackKeyListener(