diff options
author | Adrian Roos <roosa@google.com> | 2015-01-14 22:32:06 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-14 22:32:08 +0000 |
commit | 4bc5b2bce9b1e3483357966f4ef074391565255f (patch) | |
tree | 7e07e654b3726710caa8572b839e92ddc0f94746 /packages/Keyguard | |
parent | c00fdf5f502fae71d7c3c55184f11806e8704da4 (diff) | |
parent | 9dd16ebcf2a25c189a39b72847d3db2b1189cb4d (diff) | |
download | frameworks_base-4bc5b2bce9b1e3483357966f4ef074391565255f.zip frameworks_base-4bc5b2bce9b1e3483357966f4ef074391565255f.tar.gz frameworks_base-4bc5b2bce9b1e3483357966f4ef074391565255f.tar.bz2 |
Merge "LockPatternUtils clean up continued"
Diffstat (limited to 'packages/Keyguard')
-rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java index 318fdd6..af6360a 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java @@ -22,7 +22,7 @@ import android.content.ContentResolver; import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; -import android.provider.AlarmClock; +import android.os.UserHandle; import android.text.TextUtils; import android.text.format.DateFormat; import android.util.AttributeSet; @@ -42,7 +42,8 @@ public class KeyguardStatusView extends GridLayout { private static final boolean DEBUG = KeyguardConstants.DEBUG; private static final String TAG = "KeyguardStatusView"; - private LockPatternUtils mLockPatternUtils; + private final LockPatternUtils mLockPatternUtils; + private final AlarmManager mAlarmManager; private TextView mAlarmStatusView; private TextClock mDateView; @@ -92,6 +93,8 @@ public class KeyguardStatusView extends GridLayout { public KeyguardStatusView(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); + mAlarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE); + mLockPatternUtils = new LockPatternUtils(getContext()); } private void setEnableMarquee(boolean enabled) { @@ -109,7 +112,7 @@ public class KeyguardStatusView extends GridLayout { mDateView.setShowCurrentUserTime(true); mClockView.setShowCurrentUserTime(true); mOwnerInfo = (TextView) findViewById(R.id.owner_info); - mLockPatternUtils = new LockPatternUtils(getContext()); + final boolean screenOn = KeyguardUpdateMonitor.getInstance(mContext).isScreenOn(); setEnableMarquee(screenOn); refresh(); @@ -140,7 +143,8 @@ public class KeyguardStatusView extends GridLayout { } private void refresh() { - AlarmManager.AlarmClockInfo nextAlarm = mLockPatternUtils.getNextAlarm(); + AlarmManager.AlarmClockInfo nextAlarm = + mAlarmManager.getNextAlarmClock(UserHandle.USER_CURRENT); Patterns.update(mContext, nextAlarm != null); refreshTime(); |