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: Renaming id to prevent collision.

Bug: 21878123
Change-Id: If4313d217967310ede7ed3fe11bdbe49311e1a4f
---
 res/layout/all_apps_search_bar.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'res/layout')

diff --git a/res/layout/all_apps_search_bar.xml b/res/layout/all_apps_search_bar.xml
index 9f4e3228c..8d75b15a6 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"
-- 
cgit v1.2.3