diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2015-05-08 15:54:38 -0700 |
|---|---|---|
| committer | Fyodor Kupolov <fkupolov@google.com> | 2015-05-19 16:44:13 -0700 |
| commit | a7a7bfe59fc03ffb00d2f2f0fe0fb011834bf22e (patch) | |
| tree | cae4668709ce4e55061c13671213499854ecd748 /res | |
| parent | c80084e55afeaeebfb0546c0112fb2e666e35700 (diff) | |
| download | packages_apps_Settings-a7a7bfe59fc03ffb00d2f2f0fe0fb011834bf22e.tar.gz packages_apps_Settings-a7a7bfe59fc03ffb00d2f2f0fe0fb011834bf22e.tar.bz2 packages_apps_Settings-a7a7bfe59fc03ffb00d2f2f0fe0fb011834bf22e.zip | |
Use DimmableIconPreference for Add user action
Moved DimmableIconPreference from location to the root package since it is
now used in several places.
Add user action now uses DimmableIconPreference. Added a new summary string,
which is displayed when no more users can be added.
Bug: 20892920
Change-Id: I00b00f80ba8933a00a2de85777b9f7e55d03c31b
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/xml/user_settings.xml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index c00d904dc..63278a897 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5425,6 +5425,8 @@ <string name="user_nickname">Nickname</string> <!-- Title for add user type dialog [CHAR LIMIT=45] --> <string name="user_add_user_type_title">Add</string> + <!-- Summary for add user action, when it's disabled [CHAR LIMIT=100] --> + <string name="user_add_max_count">You can add up to <xliff:g id="user_count">%1$d</xliff:g> users</string> <!-- Summary for add user entry in the choice dialog [CHAR LIMIT=none] --> <string name="user_add_user_item_summary">Users have their own apps and content</string> <!-- Summary for add restricted profile entry in the choice dialog [CHAR LIMIT=none] --> diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml index 6bbeffa24..f33177c71 100644 --- a/res/xml/user_settings.xml +++ b/res/xml/user_settings.xml @@ -23,7 +23,7 @@ android:title="@string/user_list_title"> </PreferenceCategory> - <Preference + <com.android.settings.DimmableIconPreference android:key="user_add" android:title="@string/user_add_user_or_profile_menu" android:icon="@drawable/ic_menu_add_dark" /> |