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/values | |
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/values')
-rw-r--r-- | res/values/config.xml | 6 | ||||
-rw-r--r-- | res/values/styles.xml | 2 |
2 files changed, 7 insertions, 1 deletions
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"> |