diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-07 18:50:52 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-07 18:50:52 -0800 |
| commit | 10c07f778a611d8723619f67e5709cbd9e502a07 (patch) | |
| tree | 2747712ffb2d61348ec7b241d0c2a764397a07a5 /packages/SystemUI/res/values | |
| parent | 45c11b1020a64aae88b859870d5b2e312dab4f76 (diff) | |
| parent | 4d70bd7a928903b35c92619437c70bc382587b71 (diff) | |
| download | frameworks_base-10c07f778a611d8723619f67e5709cbd9e502a07.zip frameworks_base-10c07f778a611d8723619f67e5709cbd9e502a07.tar.gz frameworks_base-10c07f778a611d8723619f67e5709cbd9e502a07.tar.bz2 | |
Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/frameworks/base into cm-13.0
Android 6.0.1 release 3
Change-Id: I59b9e5a943e0860d43bcfb36ee0e8b8b072412ea
Diffstat (limited to 'packages/SystemUI/res/values')
| -rw-r--r-- | packages/SystemUI/res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/donottranslate.xml | 6 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 10 |
3 files changed, 11 insertions, 6 deletions
diff --git a/packages/SystemUI/res/values/attrs.xml b/packages/SystemUI/res/values/attrs.xml index 527248c..49f7bdb 100644 --- a/packages/SystemUI/res/values/attrs.xml +++ b/packages/SystemUI/res/values/attrs.xml @@ -20,6 +20,7 @@ <attr name="keyCode" format="integer" /> <!-- does this button generate longpress / repeat events? --> <attr name="keyRepeat" format="boolean" /> + <attr name="android:contentDescription" /> </declare-styleable> <declare-styleable name="ToggleSlider"> <attr name="text" format="string" /> diff --git a/packages/SystemUI/res/values/donottranslate.xml b/packages/SystemUI/res/values/donottranslate.xml index 30ff704..351a1fd 100644 --- a/packages/SystemUI/res/values/donottranslate.xml +++ b/packages/SystemUI/res/values/donottranslate.xml @@ -20,10 +20,4 @@ <!-- Date format for display: should match the lockscreen in /policy. --> <string name="system_ui_date_pattern">@*android:string/system_ui_date_pattern</string> - <!-- DO NOT TRANSLATE - temporary hack to show the speed-less label if no translation is available --> - <item type="string" name="keyguard_indication_charging_time_fast_if_translated">@string/keyguard_indication_charging_time</item> - - <!-- DO NOT TRANSLATE - temporary hack to show the speed-less label if no translation is available --> - <item type="string" name="keyguard_indication_charging_time_slowly_if_translated">@string/keyguard_indication_charging_time</item> - </resources> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index a2faf90..5d5522e 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1129,4 +1129,14 @@ <!-- Dialog asking if the tuner should really be removed from settings [CHAR LIMIT=NONE]--> <string name="remove_from_settings_prompt">Remove System UI Tuner from Settings and stop using all of its features?"</string> + <!-- Dialog title asking if Bluetooth should be enabled [CHAR LIMIT=NONE] --> + <string name="enable_bluetooth_title">Turn on Bluetooth?</string> + + <!-- Dialog message explaining why Bluetooth should be enabled when a packaged keyboard is + conncted to the device [CHAR LIMIT=NONE] --> + <string name="enable_bluetooth_message">To connect your keyboard with your tablet, you first have to turn on Bluetooth.</string> + + <!-- Bluetooth enablement ok text [CHAR LIMIT=40] --> + <string name="enable_bluetooth_confirmation_ok">Turn on</string> + </resources> |