diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-04-29 12:14:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-29 12:14:41 -0700 |
| commit | 5c460bbafefdcf1dd8609bc2d01db019544ca9d3 (patch) | |
| tree | ab4983ea4a1efbda83e6e19bca09601a49153e32 /res | |
| parent | 52351051e67804876416ed1acf6a0989bbf70762 (diff) | |
| parent | b4a0838d08198fd93be99ce2907b3f9b70f0d7bc (diff) | |
| download | packages_apps_Settings-5c460bbafefdcf1dd8609bc2d01db019544ca9d3.zip packages_apps_Settings-5c460bbafefdcf1dd8609bc2d01db019544ca9d3.tar.gz packages_apps_Settings-5c460bbafefdcf1dd8609bc2d01db019544ca9d3.tar.bz2 | |
am b4a0838d: am b0171715: Three kinds of owner info - owner, user and profile
* commit 'b4a0838d08198fd93be99ce2907b3f9b70f0d7bc':
Three kinds of owner info - owner, user and profile
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/user_info_header.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/res/layout/user_info_header.xml b/res/layout/user_info_header.xml index f2b0c59..506dd2e2 100644 --- a/res/layout/user_info_header.xml +++ b/res/layout/user_info_header.xml @@ -72,11 +72,11 @@ android:layout_below="@android:id/title" android:layout_alignStart="@android:id/title" android:paddingBottom="3dip" - android:visibility="gone" android:textAppearance="?android:attr/textAppearanceSmall" android:textSize="13sp" android:textColor="?android:attr/textColorSecondary" android:focusable="false" + android:text="@string/user_summary_restricted_profile" android:maxLines="4" /> </RelativeLayout> </LinearLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index e77254e..3885f0b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -679,6 +679,10 @@ <string name="show_user_info_on_lockscreen_label">Show user info on lock screen</string> <!-- Text shown for title of user info setting [CHAR LIMIT=20]--> <string name="user_info_settings_title">User info</string> + <!-- Text shown next to checkbox for showing profile info on LockScreen [CHAR LIMIT=50]--> + <string name="show_profile_info_on_lockscreen_label">Show profile info on lock screen</string> + <!-- Text shown for title of profile info setting [CHAR LIMIT=20]--> + <string name="profile_info_settings_title">Profile info</string> <!-- Main Settings screen setting option title for the item to take you to the location screen --> <string name="location_settings_title">Location access</string> <!-- Main Settings screen setting option title for the item to take you to the security screen --> |