From 01d4053436a6a771b36b527a4f0ff49bbf468632 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 16 Jun 2015 17:20:56 -0700
Subject: [PATCH] Renaming id to prevent collision.

Bug: 21878123
Change-Id: If4313d217967310ede7ed3fe11bdbe49311e1a4f
---
 res/layout/all_apps_search_bar.xml                              | 2 +-
 .../android/launcher3/allapps/DefaultAppSearchController.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/layout/all_apps_search_bar.xml b/res/layout/all_apps_search_bar.xml
index 9f4e3228c8..8d75b15a69 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 a61df3a7de..20924af945 100644
--- a/src/com/android/launcher3/allapps/DefaultAppSearchController.java
+++ b/src/com/android/launcher3/allapps/DefaultAppSearchController.java
@@ -83,7 +83,7 @@ final class DefaultAppSearchController extends AllAppsSearchBarController
         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(