diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2015-06-18 22:07:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-18 22:07:09 +0000 |
| commit | c44de1adcf57c52ee93b4a9d2f4505e17b6cc857 (patch) | |
| tree | 0e4ccaa3aa7a9da48c0e12c9c5e93ad5b2eaa8a6 /res | |
| parent | 7b933a5ef764d4716177dc7f060af823a38fa628 (diff) | |
| parent | 60331a9be74a14051e6e192db69307ce652da2ae (diff) | |
| download | android_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')
| -rw-r--r-- | res/layout-land/launcher.xml | 2 | ||||
| -rw-r--r-- | res/layout-port/launcher.xml | 2 | ||||
| -rw-r--r-- | res/layout-sw720dp/launcher.xml | 5 | ||||
| -rw-r--r-- | res/layout/all_apps_container.xml | 3 | ||||
| -rw-r--r-- | res/layout/widgets_view.xml | 1 |
5 files changed, 10 insertions, 3 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 1c917bf09..6500ebcd2 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -34,6 +34,7 @@ android:layout_height="52dp" /> <!-- The workspace contains 5 screens of cells --> + <!-- DO NOT CHANGE THE ID --> <com.android.launcher3.Workspace android:id="@+id/workspace" android:layout_width="match_parent" @@ -41,6 +42,7 @@ android:layout_gravity="center" launcher:defaultScreen="@integer/config_workspaceDefaultScreen" /> + <!-- DO NOT CHANGE THE ID --> <include layout="@layout/hotseat" android:id="@+id/hotseat" android:layout_width="match_parent" diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 8ff7762a9..d0772ee70 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -35,6 +35,7 @@ android:layout_height="52dp" /> <!-- The workspace contains 5 screens of cells --> + <!-- DO NOT CHANGE THE ID --> <com.android.launcher3.Workspace android:id="@+id/workspace" android:layout_width="match_parent" @@ -43,6 +44,7 @@ launcher:pageIndicator="@+id/page_indicator"> </com.android.launcher3.Workspace> + <!-- DO NOT CHANGE THE ID --> <include layout="@layout/hotseat" android:id="@+id/hotseat" android:layout_width="match_parent" diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index b27f33bbf..d382c6a9f 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -35,6 +35,7 @@ android:layout_height="52dp" /> <!-- The workspace contains 5 screens of cells --> + <!-- DO NOT CHANGE THE ID --> <com.android.launcher3.Workspace android:id="@+id/workspace" android:layout_width="match_parent" @@ -43,6 +44,7 @@ launcher:pageIndicator="@id/page_indicator"> </com.android.launcher3.Workspace> + <!-- DO NOT CHANGE THE ID --> <include layout="@layout/hotseat" android:id="@+id/hotseat" android:layout_width="match_parent" @@ -58,8 +60,7 @@ <!-- Keep these behind the workspace so that they are not visible when we go into AllApps --> - <include - android:id="@+id/page_indicator" + <include android:id="@+id/page_indicator" layout="@layout/page_indicator" android:layout_width="wrap_content" android:layout_height="wrap_content" 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" |