Use settings to persist sticky widget.

Addressing some comments:
 - Sticky widget is now saved in a user-scoped setting.
 - Removed multi-user widget from computation (obsolete).
 - Removed status widget from computation (just use right-most).
 - Removed duplicate isMusicPlaying logic.

(frameworks/base)

Change-Id: I8ef8f826677d78ac24da52adf2d99d47c8d965ac

1 files changed, 15 insertions, 9 deletions

diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java
index f6ae83c..f8c3b4d 100644
--- a/core/java/com/android/internal/widget/LockPatternUtils.java
+++ b/core/java/com/android/internal/widget/LockPatternUtils.java
@@ -150,7 +150,6 @@ public class LockPatternUtils {
     private final ContentResolver mContentResolver;
     private DevicePolicyManager mDevicePolicyManager;
     private ILockSettings mLockSettingsService;
-    private int mStickyWidgetIndex = -1;
 
     // The current user is set by KeyguardViewMediator and shared by all LockPatternUtils.
     private static volatile int sCurrentUserId = UserHandle.USER_NULL;
@@ -1162,6 +1161,21 @@ public class LockPatternUtils {
         return true;
     }
 
+    public int getStickyAppWidgetIndex() {
+        return Settings.Secure.getIntForUser(
+                mContentResolver,
+                Settings.Secure.LOCK_SCREEN_STICKY_APPWIDGET,
+                -1,
+                UserHandle.USER_CURRENT);
+    }
+
+    public void setStickyAppWidgetIndex(int value) {
+        Settings.Secure.putIntForUser(mContentResolver,
+                Settings.Secure.LOCK_SCREEN_STICKY_APPWIDGET,
+                value,
+                UserHandle.USER_CURRENT);
+    }
+
     private long getLong(String secureSettingKey, long defaultValue) {
         try {
             return getLockSettings().getLong(secureSettingKey, defaultValue,
@@ -1311,12 +1325,4 @@ public class LockPatternUtils {
         return getBoolean(LOCKSCREEN_POWER_BUTTON_INSTANTLY_LOCKS, true);
     }
 
-    public int getStickyWidgetIndex() {
-        return mStickyWidgetIndex;
-    }
-
-    public void setStickyWidgetIndex(int stickyWidgetIndex) {
-        mStickyWidgetIndex = stickyWidgetIndex;
-    }
-
 }