diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-08-06 17:57:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-06 17:19:40 +0000 |
| commit | bce84e798bbfbb9fd576cb785d90bf69cb3843e0 (patch) | |
| tree | eab0274e03e54c8b7aaa9e25ae9bbc4e2ec3e40a /res | |
| parent | 1fcd7faad666cfb56553c7313723a5c6fc8df3cb (diff) | |
| parent | df77106e942574e3bc26134f8d649ee60bd419f8 (diff) | |
| download | packages_apps_Settings-bce84e798bbfbb9fd576cb785d90bf69cb3843e0.zip packages_apps_Settings-bce84e798bbfbb9fd576cb785d90bf69cb3843e0.tar.gz packages_apps_Settings-bce84e798bbfbb9fd576cb785d90bf69cb3843e0.tar.bz2 | |
Merge "Fix bug #16712121 Add 'Experimental' substring to 'High contrast text'" into lmp-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 4 | ||||
| -rw-r--r-- | res/xml/accessibility_settings.xml | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 6219802..5ce4387 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5870,4 +5870,8 @@ <!-- Title for a managed (work) profile. [CHAR LIMIT=25] --> <string name="managed_user_title">Work profile</string> + + <!-- Summary Title for saying that the preference is experimental and will evolve over time due to User feedback. [CHAR LIMIT=NONE] --> + <string name="experimental_preference">(Experimental)</string> + </resources> diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml index 14129da..a870074 100644 --- a/res/xml/accessibility_settings.xml +++ b/res/xml/accessibility_settings.xml @@ -45,6 +45,7 @@ <CheckBoxPreference android:key="toggle_high_text_contrast_preference" android:title="@string/accessibility_toggle_high_text_contrast_preference_title" + android:summary="@string/experimental_preference" android:persistent="false"/> <CheckBoxPreference |