From 5d69aaea2a0bab646e8b251e394da6fc4e446395 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Tue, 7 Jul 2015 10:13:12 -0700
Subject: [PATCH] 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
---
 src/com/android/settings/Utils.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 21a5019f039..14b5576b332 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) {