summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/Utils.java
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2015-07-07 10:13:12 -0700
committerAmith Yamasani <yamasani@google.com>2015-07-07 10:13:12 -0700
commit5d69aaea2a0bab646e8b251e394da6fc4e446395 (patch)
tree81bc5f6d2b28941f9a65c486025d434373f48200 /src/com/android/settings/Utils.java
parente21573da9205343e5b531f468b534a1bf02098fe (diff)
downloadpackages_apps_Settings-5d69aaea2a0bab646e8b251e394da6fc4e446395.zip
packages_apps_Settings-5d69aaea2a0bab646e8b251e394da6fc4e446395.tar.gz
packages_apps_Settings-5d69aaea2a0bab646e8b251e394da6fc4e446395.tar.bz2
Use localized name for guest user
Rather than use the stored name, which depends on the language in use when the Guest was created, always try to use the localized word for Guest. Bug: 22205776 Change-Id: I1a4912b9561196eee811eae31c8df2b72413648f
Diffstat (limited to 'src/com/android/settings/Utils.java')
-rw-r--r--src/com/android/settings/Utils.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 21a5019..14b5576 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -923,11 +923,13 @@ public final class Utils {
* Returns a label for the user, in the form of "User: user name" or "Work profile".
*/
public static String getUserLabel(Context context, UserInfo info) {
+ String name = info != null ? info.name : null;
if (info.isManagedProfile()) {
// We use predefined values for managed profiles
return context.getString(R.string.managed_user_title);
+ } else if (info.isGuest()) {
+ name = context.getString(R.string.user_guest);
}
- String name = info != null ? info.name : null;
if (name == null && info != null) {
name = Integer.toString(info.id);
} else if (info == null) {