diff options
| author | Jason Monk <jmonk@google.com> | 2015-07-14 20:20:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-14 20:20:36 +0000 |
| commit | 2061049d69390a7f4ace9b37bb983ebbb4caa678 (patch) | |
| tree | 643c255e0a770494515e0c71b960c33db774ed50 | |
| parent | 92a3914fb353b725646a96185d1c1daaf3977e7b (diff) | |
| parent | f05ca67ce4683bfdd8bd5dbc7cd323bbed770062 (diff) | |
| download | frameworks_base-2061049d69390a7f4ace9b37bb983ebbb4caa678.zip frameworks_base-2061049d69390a7f4ace9b37bb983ebbb4caa678.tar.gz frameworks_base-2061049d69390a7f4ace9b37bb983ebbb4caa678.tar.bz2 | |
Merge "Move wifi accessibility strings to SettingsLib" into mnc-dev
| -rw-r--r-- | packages/SettingsLib/res/values/strings.xml | 13 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 13 |
2 files changed, 13 insertions, 13 deletions
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index 377a9a4..b03f100 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -182,4 +182,17 @@ <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. --> <string name="bluetooth_pairing_rejected_error_message">Pairing rejected by <xliff:g id="device_name">%1$s</xliff:g>.</string> + <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> + <string name="accessibility_wifi_off">Wifi off.</string> + <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> + <string name="accessibility_no_wifi">Wifi disconnected.</string> + <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> + <string name="accessibility_wifi_one_bar">Wifi one bar.</string> + <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> + <string name="accessibility_wifi_two_bars">Wifi two bars.</string> + <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> + <string name="accessibility_wifi_three_bars">Wifi three bars.</string> + <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> + <string name="accessibility_wifi_signal_full">Wifi signal full.</string> + </resources> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index d32ce55..fcf7e3e 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -276,19 +276,6 @@ <!-- Content description of the data signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> <string name="accessibility_data_signal_full">Data signal full.</string> - <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> - <string name="accessibility_wifi_off">Wifi off.</string> - <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> - <string name="accessibility_no_wifi">Wifi disconnected.</string> - <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> - <string name="accessibility_wifi_one_bar">Wifi one bar.</string> - <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> - <string name="accessibility_wifi_two_bars">Wifi two bars.</string> - <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> - <string name="accessibility_wifi_three_bars">Wifi three bars.</string> - <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> - <string name="accessibility_wifi_signal_full">Wifi signal full.</string> - <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] --> <string name="accessibility_wifi_name">Connected to <xliff:g id="wifi" example="Home Network">%s</xliff:g>.</string> |