diff options
| author | PauloftheWest <paulofthewest@google.com> | 2014-08-12 20:20:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-11 17:55:01 +0000 |
| commit | cccc5defd61d836af3b4d3dbaa8edb4928f2a031 (patch) | |
| tree | d3ff1cc06ff6df03ca981061ecd60cee999e1b1d /res/values | |
| parent | 0cfb3c079f2bcf3cdfb4d8b54ff856ff0228271e (diff) | |
| parent | d60f85daadc27df47d0fb04e73f18c50ac70f3c7 (diff) | |
| download | packages_apps_Settings-cccc5defd61d836af3b4d3dbaa8edb4928f2a031.zip packages_apps_Settings-cccc5defd61d836af3b4d3dbaa8edb4928f2a031.tar.gz packages_apps_Settings-cccc5defd61d836af3b4d3dbaa8edb4928f2a031.tar.bz2 | |
Merge "Added WiFi Assistant settings." into lmp-dev
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/colors.xml | 2 | ||||
| -rwxr-xr-x | res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index 9c199bf..0138772 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -85,4 +85,6 @@ <!-- Avatar color used for guest --> <color name="grey_500">@*android:color/material_grey_500</color> + <color name="wifi_divider">#ffe0e0e0</color> + </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 2b53f96..865b029 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -217,4 +217,6 @@ <dimen name="bluetooth_dialog_padding">8dip</dimen> <integer name="bluetooth_name_length">32</integer> + <dimen name="wifi_divider_height">1px</dimen> + </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 32133b7..f8d5c2c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1486,7 +1486,7 @@ <!-- Checkbox title for option to Automatically manage Wi\u2011Fi [CHAR LIMIT=40] --> <string name="wifi_automatically_manage_title">Automatically manage Wi\u2011Fi</string> <!-- Checkbox summary for option to Automatically manage Wi\u2011Fi [CHAR LIMIT=100] --> - <string name="wifi_automatically_manage_summary">Let a Wi\u2011Fi assistant manage your Wi\u2011Fi connection</string> + <string name="wifi_automatically_manage_summary">Let <xliff:g id="wifi_assistant">%1$s</xliff:g> manage your Wi\u2011Fi connection</string> <!-- Checkbox title for option for Wi\u2011Fi Assistant [CHAR LIMIT=40] --> <string name="wifi_assistant_setting_title">Wi\u2011Fi assistant</string> <!-- Checkbox summary for option for Wi\u2011Fi Assistant [CHAR LIMIT=40] --> |