diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-03-27 12:36:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-27 12:36:52 -0700 |
| commit | 07aa7b8e1876298d4460afc775c1dda66e121380 (patch) | |
| tree | 08bfb60b9837f722bff13eade751a37489baf815 /res | |
| parent | 03be9690cf2abc4a3035008ff5f9d877eceae9f8 (diff) | |
| parent | 0fb0d016dd51b0d8b882d92de58f5c2ea28a9208 (diff) | |
| download | packages_apps_Settings-07aa7b8e1876298d4460afc775c1dda66e121380.zip packages_apps_Settings-07aa7b8e1876298d4460afc775c1dda66e121380.tar.gz packages_apps_Settings-07aa7b8e1876298d4460afc775c1dda66e121380.tar.bz2 | |
am 0fb0d016: Merge "Split User settings into limited and trusted." into jb-mr2-dev
* commit '0fb0d016dd51b0d8b882d92de58f5c2ea28a9208':
Split User settings into limited and trusted.
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/colors.xml | 3 | ||||
| -rwxr-xr-x | res/values/dimens.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 6 | ||||
| -rw-r--r-- | res/xml/user_settings.xml | 9 |
4 files changed, 18 insertions, 4 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index e7a00c3..bd385f6 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -37,4 +37,7 @@ <color name="title_color">@android:color/holo_blue_light</color> <color name="setup_divider_color">#333333</color> + <color name="circle_avatar_frame_color">#ffffffff</color> + <color name="circle_avatar_frame_shadow_color">#80000000</color> + <color name="circle_avatar_frame_pressed_color">#ffffffff</color> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 91f293c..759b407 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -61,4 +61,8 @@ <dimen name="keyguard_appwidget_picker_margin_left">6dip</dimen> <dimen name="keyguard_appwidget_picker_margin_right">6dip</dimen> <integer name="keyguard_appwidget_picker_cols">1</integer> + + <dimen name="circle_avatar_size">48dp</dimen> + <dimen name="circle_avatar_frame_stroke_width">1dp</dimen> + <dimen name="circle_avatar_frame_shadow_radius">3dp</dimen> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index a928ab1..0e29392 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4281,8 +4281,10 @@ <string name="user_settings_title">Users</string> <!-- User settings section title for details about you [CHAR LIMIT=25] --> <string name="user_you_section">You</string> - <!-- User settings user list section header [CHAR LIMIT=30] --> - <string name="user_list_title">Other users</string> + <!-- User settings trusted user list section header [CHAR LIMIT=30] --> + <string name="user_trusted_list_title">Trusted users</string> + <!-- User settings limited user list section header [CHAR LIMIT=30] --> + <string name="user_limited_list_title">Limited users</string> <!-- User settings add user menu [CHAR LIMIT=20] --> <string name="user_add_user_menu">Add user</string> <!-- User settings add restricted user label [CHAR LIMIT=20] --> diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml index 3e61bd7..2e73e9e 100644 --- a/res/xml/user_settings.xml +++ b/res/xml/user_settings.xml @@ -35,8 +35,8 @@ android:fragment="com.android.settings.OwnerInfoSettings" /> <PreferenceCategory - android:key="user_list" - android:title="@string/user_list_title"> + android:key="limited_user_list" + android:title="@string/user_limited_list_title"> </PreferenceCategory> <Preference @@ -45,6 +45,11 @@ android:summary="@string/user_add_restricted_summary" android:icon="@drawable/ic_menu_add" /> + <PreferenceCategory + android:key="trusted_user_list" + android:title="@string/user_trusted_list_title"> + </PreferenceCategory> + <Preference android:key="user_add_trusted" android:title="@string/user_add_trusted" |