diff options
Diffstat (limited to 'res')
-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 | ||||
-rw-r--r-- | res/values-sw720dp/styles.xml | 2 | ||||
-rw-r--r-- | res/values/config.xml | 6 | ||||
-rw-r--r-- | res/values/styles.xml | 2 |
6 files changed, 12 insertions, 6 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 diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml index bb0dbc221..72894dcf3 100644 --- a/res/values-sw720dp/styles.xml +++ b/res/values-sw720dp/styles.xml @@ -26,7 +26,7 @@ <item name="android:windowNoTitle">true</item> <item name="android:windowActionModeOverlay">true</item> <item name="android:colorEdgeEffect">?android:attr/textColorSecondary</item> - <item name="android:keyboardLayout">@layout/all_apps_search_container</item> + <item name="android:keyboardLayout">@layout/search_container_all_apps</item> </style> <!-- Workspace --> diff --git a/res/values/config.xml b/res/values/config.xml index 00db4efe5..e9c62a783 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -140,4 +140,10 @@ <item type="id" name="action_resize" /> <item type="id" name="action_deep_shortcuts" /> <item type="id" name="action_dismiss_notification" /> + +<!-- QSB IDs. DO not change --> + <item type="id" name="search_container_workspace" /> + <item type="id" name="search_container_hotseat" /> + <item type="id" name="search_container_all_apps" /> + </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 813fe8f29..5bdf5125a 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -25,7 +25,7 @@ <item name="android:windowShowWallpaper">true</item> <item name="android:windowNoTitle">true</item> <item name="android:colorEdgeEffect">#FF757575</item> - <item name="android:keyboardLayout">@layout/all_apps_search_container</item> + <item name="android:keyboardLayout">@layout/search_container_all_apps</item> </style> <style name="BaseLauncherThemeWithCustomAttrs" parent="@style/BaseLauncherTheme"> |