1 files changed, 12 insertions, 16 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardMessageAreaController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardMessageAreaController.java
index c2802f7b6843..6a9216218d07 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardMessageAreaController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardMessageAreaController.java
@@ -18,7 +18,6 @@ package com.android.keyguard;
 
 import android.content.res.ColorStateList;
 import android.content.res.Configuration;
-import android.text.TextUtils;
 
 import com.android.systemui.statusbar.policy.ConfigurationController;
 import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener;
@@ -93,31 +92,28 @@ public class KeyguardMessageAreaController<T extends KeyguardMessageArea>
     }
 
     public void setMessage(CharSequence s) {
-        mView.setMessage(s);
-    }
-
-    public void setMessage(int resId) {
-        mView.setMessage(resId);
+        setMessage(s, true);
     }
 
     /**
-     * Set Text if KeyguardMessageArea is empty.
+     * Sets a message to the underlying text view.
      */
-    public void setMessageIfEmpty(int resId) {
-        if (TextUtils.isEmpty(mView.getText())) {
-            setMessage(resId);
-        }
+    public void setMessage(CharSequence s, boolean animate) {
+        mView.setMessage(s, animate);
+    }
+
+    public void setMessage(int resId) {
+        String message = resId != 0 ? mView.getResources().getString(resId) : null;
+        setMessage(message);
     }
 
     public void setNextMessageColor(ColorStateList colorState) {
         mView.setNextMessageColor(colorState);
     }
 
-    /**
-     * Reload colors from resources.
-     **/
-    public void reloadColors() {
-        mView.reloadColor();
+    /** Returns the message of the underlying TextView. */
+    public CharSequence getMessage() {
+        return mView.getText();
     }
 
     /** Factory for creating {@link com.android.keyguard.KeyguardMessageAreaController}. */