diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-09-21 17:48:49 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2012-09-21 18:10:34 -0700 |
| commit | 8fd96ec2dc215095d12ef3e9bd7dc50ebc78625e (patch) | |
| tree | e92988bb4ef34f014fe81e1051b5af9fce2f3006 /core/java/com/android/internal/widget/LockPatternUtils.java | |
| parent | 059aedf808c8b9b3da1457eef52f3d477878d50b (diff) | |
| download | frameworks_base-8fd96ec2dc215095d12ef3e9bd7dc50ebc78625e.zip frameworks_base-8fd96ec2dc215095d12ef3e9bd7dc50ebc78625e.tar.gz frameworks_base-8fd96ec2dc215095d12ef3e9bd7dc50ebc78625e.tar.bz2 | |
Show lockscreen widgets for the current user.
Also shows the owner info and next alarm for the current user.
AppWidgetService now assumes that any widgets running in the system process are for the
current user, so that lockscreen shows widgets for the current user
Bug: 7211754
Bug: 7212421
Change-Id: Iaf0edc60e49af0afe42625c0b2dcf100c9ecc178
Diffstat (limited to 'core/java/com/android/internal/widget/LockPatternUtils.java')
| -rw-r--r-- | core/java/com/android/internal/widget/LockPatternUtils.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index f3bef08..b97539c 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -1007,8 +1007,8 @@ public class LockPatternUtils { * or null if there is no next alarm. */ public String getNextAlarm() { - String nextAlarm = Settings.System.getString(mContentResolver, - Settings.System.NEXT_ALARM_FORMATTED); + String nextAlarm = Settings.System.getStringForUser(mContentResolver, + Settings.System.NEXT_ALARM_FORMATTED, UserHandle.USER_CURRENT); if (nextAlarm == null || TextUtils.isEmpty(nextAlarm)) { return null; } @@ -1035,8 +1035,9 @@ public class LockPatternUtils { public int[] getUserDefinedWidgets() { int appWidgetId = -1; - String appWidgetIdString = Settings.Secure.getString( - mContentResolver, Settings.Secure.LOCK_SCREEN_USER_SELECTED_APPWIDGET_ID); + String appWidgetIdString = Settings.Secure.getStringForUser( + mContentResolver, Settings.Secure.LOCK_SCREEN_USER_SELECTED_APPWIDGET_ID, + UserHandle.USER_CURRENT); if (appWidgetIdString != null) { appWidgetId = (int) Integer.decode(appWidgetIdString); } @@ -1046,8 +1047,9 @@ public class LockPatternUtils { public int getStatusWidget() { int appWidgetId = -1; - String appWidgetIdString = Settings.Secure.getString( - mContentResolver, Settings.Secure.LOCK_SCREEN_STATUS_APPWIDGET_ID); + String appWidgetIdString = Settings.Secure.getStringForUser( + mContentResolver, Settings.Secure.LOCK_SCREEN_STATUS_APPWIDGET_ID, + UserHandle.USER_CURRENT); if (appWidgetIdString != null) { appWidgetId = (int) Integer.decode(appWidgetIdString); } |