diff options
| author | John Spurlock <jspurlock@google.com> | 2013-12-19 16:39:23 -0500 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2013-12-19 17:47:20 -0500 |
| commit | 8ab172e8d9c2e926921bb52838c2322142fb3c65 (patch) | |
| tree | 4162d6d5f54db56b62ffadf62656de31ae0096cf /packages/SystemUI/res/values | |
| parent | 65048bdce7a14d891d32c39369b3d81dd6916d6f (diff) | |
| download | frameworks_base-8ab172e8d9c2e926921bb52838c2322142fb3c65.zip frameworks_base-8ab172e8d9c2e926921bb52838c2322142fb3c65.tar.gz frameworks_base-8ab172e8d9c2e926921bb52838c2322142fb3c65.tar.bz2 | |
Add rotation-lock to Quick Settings on phones.
Make the rotation-lock QS tile available for display on phones.
Devices < sw600dp are only allowed to lock rotation to their
natural orientation (i.e. portrait on most phones), so tweak
the QS tile label to make this clear. e.g. "Locked to Portrait"
instead of "Rotation Locked" on portrait phones.
Simplify RotationLockController now that the sw600 check is no
longer hardcoded in RotationPolicy.
Remove redundant sw600dp check in SystemUI, everything driven
from the RotationPolicy helper, though SystemUI can still
choose not to display the tile at all with a resource config.
Clean up some of the docs in RotationPolicy to make clear the
subtle distinction between the two ways of locking rotation:
- From Accessibility (locks to natural orientation on all devices)
- From System UI (locks to natural < sw600dp, else current rotation)
Bug:11062710
Change-Id: I5caa4485c9501315da9fed964d6667d3012b43cb
Diffstat (limited to 'packages/SystemUI/res/values')
| -rw-r--r-- | packages/SystemUI/res/values/config.xml | 5 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 3869db3..1dd9300 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -50,7 +50,7 @@ <!-- When true, show 1/2G networks as 3G. --> <bool name="config_showMin3G">false</bool> - <!-- Show rotation lock button in phone-style notification panel. --> + <!-- Show rotation lock toggle in System UI--> <bool name="config_showRotationLock">true</bool> <!-- Amount of time to hold off before showing the search panel when the user presses home --> @@ -84,9 +84,6 @@ <!-- The number of columns that the top level tiles span in the QuickSettings --> <integer name="quick_settings_user_time_settings_tile_span">1</integer> - <!-- Whether rotation lock shows up in quick settings or not --> - <bool name="quick_settings_show_rotation_lock">false</bool> - <!-- Whether or not the RSSI tile is capitalized or not. --> <bool name="quick_settings_rssi_tile_capitalization">true</bool> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 5afd55b..94796af 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -464,6 +464,10 @@ <string name="quick_settings_rotation_unlocked_label">Auto Rotate</string> <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] --> <string name="quick_settings_rotation_locked_label">Rotation Locked</string> + <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] --> + <string name="quick_settings_rotation_locked_portrait_label">Locked to Portrait</string> + <!-- QuickSettings: Locked to Landscape [CHAR LIMIT=NONE] --> + <string name="quick_settings_rotation_locked_landscape_label">Locked to Landscape</string> <!-- QuickSettings: IME [CHAR LIMIT=NONE] --> <string name="quick_settings_ime_label">Input Method</string> <!-- QuickSettings: Location [CHAR LIMIT=NONE] --> |