diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-04-20 16:45:18 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-04-20 16:45:18 +0000 |
commit | 2f23a6ece16581f1c69192fbb2e9d9e22603fa72 (patch) | |
tree | 26a20a072f94c29992c961c107da3757d460811b /quickstep/res | |
parent | ee3c67cff0f742e76d26a80b1282dca1b37aa8f4 (diff) | |
parent | 4926cffb3b297ba810c4d9226f8678c03506abf4 (diff) | |
download | android_packages_apps_Trebuchet-2f23a6ece16581f1c69192fbb2e9d9e22603fa72.tar.gz android_packages_apps_Trebuchet-2f23a6ece16581f1c69192fbb2e9d9e22603fa72.tar.bz2 android_packages_apps_Trebuchet-2f23a6ece16581f1c69192fbb2e9d9e22603fa72.zip |
Merge changes from topic "auto-rotate-settings" into ub-launcher3-master
* changes:
[automerger] Bringing back auto-rotate settings am: 40253329c5
Bringing back auto-rotate settings
Diffstat (limited to 'quickstep/res')
-rw-r--r-- | quickstep/res/xml/indexable_launcher_prefs.xml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/quickstep/res/xml/indexable_launcher_prefs.xml b/quickstep/res/xml/indexable_launcher_prefs.xml index 265540201..30f310021 100644 --- a/quickstep/res/xml/indexable_launcher_prefs.xml +++ b/quickstep/res/xml/indexable_launcher_prefs.xml @@ -20,8 +20,14 @@ android:key="pref_add_icon_to_home" android:title="@string/auto_add_shortcuts_label" android:summary="@string/auto_add_shortcuts_description" - android:defaultValue="true" - /> + android:defaultValue="true" /> + + <SwitchPreference + android:key="pref_allowRotation" + android:title="@string/allow_rotation_title" + android:summary="@string/allow_rotation_desc" + android:defaultValue="@bool/allow_rotation" + android:persistent="true" /> <ListPreference android:key="pref_override_icon_shape" |