diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-07-04 09:06:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-07-04 09:06:53 +0000 |
| commit | efbfcb838d5ff45d086736041ab82f1ab4ea6c63 (patch) | |
| tree | 7d0e2f08902afa5c00b1a8781958bca853fe7805 /res/layout | |
| parent | f593fb916e1da8f218b265ba4a752b31cf3b2fb6 (diff) | |
| parent | c7b8df83297b1e765ee25871c4c796ee6a8440df (diff) | |
| download | android_packages_apps_Trebuchet-efbfcb838d5ff45d086736041ab82f1ab4ea6c63.tar.gz android_packages_apps_Trebuchet-efbfcb838d5ff45d086736041ab82f1ab4ea6c63.tar.bz2 android_packages_apps_Trebuchet-efbfcb838d5ff45d086736041ab82f1ab4ea6c63.zip | |
Merge "Sanitizing various search container ids and layout names" into ub-launcher3-dorval-polish
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/all_apps.xml | 4 | ||||
| -rw-r--r-- | res/layout/search_container_all_apps.xml (renamed from res/layout/all_apps_search_container.xml) | 2 | ||||
| -rw-r--r-- | res/layout/search_container_workspace.xml (renamed from res/layout/qsb_container.xml) | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml index 93662fc08..6340619ab 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" /> diff --git a/res/layout/all_apps_search_container.xml b/res/layout/search_container_all_apps.xml index 2528034eb..c4305214d 100644 --- a/res/layout/all_apps_search_container.xml +++ b/res/layout/search_container_all_apps.xml @@ -15,7 +15,7 @@ --> <com.android.launcher3.allapps.search.AppsSearchContainerLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/search_container" + android:id="@id/search_container_all_apps" android:layout_width="match_parent" android:layout_height="@dimen/all_apps_search_bar_height" android:layout_gravity="center|top" diff --git a/res/layout/qsb_container.xml b/res/layout/search_container_workspace.xml index 6fa843d63..1c617b174 100644 --- a/res/layout/qsb_container.xml +++ b/res/layout/search_container_workspace.xml @@ -19,7 +19,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="0dp" - android:id="@+id/qsb_container" + android:id="@id/search_container_workspace" android:padding="0dp" > <fragment |