commit c7b8df83297b1e765ee25871c4c796ee6a8440df
author Sunny Goyal <sunnygoyal@google.com> Tue Jun 27 11:11:03 2017 -0700
committer Sunny Goyal <sunnygoyal@google.com> Tue Jun 27 11:11:32 2017 -0700
tree e45f882924336d834807d86b8420a55b44a75bd8
parent 89b5b918f006fffa83203a981055a754a8210128

Sanitizing various search container ids and layout names

Bug: 63014381
Change-Id: Ia75a8a048c7a85c6324f8861abd2bcf1721032fa

res/layout/all_apps.xml

diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml
index 93662fc..6340619 100644
--- a/res/layout/all_apps.xml
+++ b/res/layout/all_apps.xml
@@ -49,7 +49,7 @@
         <!-- DO NOT CHANGE THE ID -->
         <com.android.launcher3.allapps.AllAppsRecyclerView
             android:id="@+id/apps_list_view"
-            android:layout_below="@+id/search_container"
+            android:layout_below="@id/search_container_all_apps"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="center_horizontal|top"
@@ -62,7 +62,7 @@
          platform bug, which prevents using custom attributes in <include> tag -->
         <include
             layout="?android:attr/keyboardLayout"
-            android:id="@+id/search_container" />
+            android:id="@id/search_container_all_apps" />
 
         <include layout="@layout/all_apps_fast_scroller" />