summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2015-06-18 22:07:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-18 22:07:09 +0000
commitc44de1adcf57c52ee93b4a9d2f4505e17b6cc857 (patch)
tree0e4ccaa3aa7a9da48c0e12c9c5e93ad5b2eaa8a6 /res/layout
parent7b933a5ef764d4716177dc7f060af823a38fa628 (diff)
parent60331a9be74a14051e6e192db69307ce652da2ae (diff)
downloadandroid_packages_apps_Trebuchet-c44de1adcf57c52ee93b4a9d2f4505e17b6cc857.tar.gz
android_packages_apps_Trebuchet-c44de1adcf57c52ee93b4a9d2f4505e17b6cc857.tar.bz2
android_packages_apps_Trebuchet-c44de1adcf57c52ee93b4a9d2f4505e17b6cc857.zip
Merge "Revert resource name to what platform ui automator test defines. b/21923650" into ub-launcher3-burnaby
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/all_apps_container.xml3
-rw-r--r--res/layout/widgets_view.xml1
2 files changed, 3 insertions, 1 deletions
diff --git a/res/layout/all_apps_container.xml b/res/layout/all_apps_container.xml
index 5801a0e8e..1de82019c 100644
--- a/res/layout/all_apps_container.xml
+++ b/res/layout/all_apps_container.xml
@@ -24,8 +24,9 @@
android:focusable="true"
android:focusableInTouchMode="true">
+ <!-- DO NOT CHANGE THE ID -->
<com.android.launcher3.allapps.AllAppsRecyclerView
- android:id="@+id/collection"
+ android:id="@+id/apps_list_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal|top"
diff --git a/res/layout/widgets_view.xml b/res/layout/widgets_view.xml
index c27e79bbd..161c2686d 100644
--- a/res/layout/widgets_view.xml
+++ b/res/layout/widgets_view.xml
@@ -37,6 +37,7 @@
android:elevation="2dp"
android:visibility="invisible" />
+ <!-- DO NOT CHANGE THE ID -->
<com.android.launcher3.widget.WidgetsRecyclerView
android:id="@+id/widgets_list_view"
android:layout_width="match_parent"