diff options
| author | Jim Miller <jaggies@google.com> | 2010-04-12 19:15:42 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-12 19:15:42 -0700 |
| commit | 14c90fa5436fb91868f663681c8eb03668272590 (patch) | |
| tree | 46ad2e89294c6d2281767caffe1fab8afbdbfba8 | |
| parent | b0d3a2371f92d19d01aa2ca8e4f382738273f2dd (diff) | |
| parent | d1ecfc2de1059504cfbe35eebe42c4cda8461af6 (diff) | |
| download | base-14c90fa5436fb91868f663681c8eb03668272590.tar.gz | |
Merge "Fix 2575838: Update emergency button in AccountUnlockScreen DO NOT MERGE" into froyo
| -rw-r--r-- | phone/com/android/internal/policy/impl/AccountUnlockScreen.java | 10 | ||||
| -rw-r--r-- | phone/com/android/internal/policy/impl/LockPatternKeyguardView.java | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/phone/com/android/internal/policy/impl/AccountUnlockScreen.java b/phone/com/android/internal/policy/impl/AccountUnlockScreen.java index 9921069..cb88916 100644 --- a/phone/com/android/internal/policy/impl/AccountUnlockScreen.java +++ b/phone/com/android/internal/policy/impl/AccountUnlockScreen.java @@ -29,7 +29,6 @@ import android.content.Context; import android.content.Intent; import android.content.res.Configuration; import android.graphics.Rect; -import android.telephony.TelephonyManager; import android.text.Editable; import android.text.InputFilter; import android.text.LoginFilter; @@ -65,6 +64,7 @@ public class AccountUnlockScreen extends RelativeLayout implements KeyguardScree private final KeyguardScreenCallback mCallback; private final LockPatternUtils mLockPatternUtils; + private KeyguardUpdateMonitor mUpdateMonitor; private TextView mTopHeader; private TextView mInstructions; @@ -81,9 +81,11 @@ public class AccountUnlockScreen extends RelativeLayout implements KeyguardScree /** * AccountUnlockScreen constructor. * @param configuration + * @param updateMonitor */ public AccountUnlockScreen(Context context,Configuration configuration, - KeyguardScreenCallback callback, LockPatternUtils lockPatternUtils) { + KeyguardUpdateMonitor updateMonitor, KeyguardScreenCallback callback, + LockPatternUtils lockPatternUtils) { super(context); mCallback = callback; mLockPatternUtils = lockPatternUtils; @@ -111,6 +113,9 @@ public class AccountUnlockScreen extends RelativeLayout implements KeyguardScree mEmergencyCall = (Button) findViewById(R.id.emergencyCall); mEmergencyCall.setOnClickListener(this); mLockPatternUtils.updateEmergencyCallButtonState(mEmergencyCall); + + mUpdateMonitor = updateMonitor; + mUpdateMonitor.registerInfoCallback(this); } public void afterTextChanged(Editable s) { @@ -154,6 +159,7 @@ public class AccountUnlockScreen extends RelativeLayout implements KeyguardScree if (mCheckingDialog != null) { mCheckingDialog.hide(); } + mUpdateMonitor.removeCallback(this); } /** {@inheritDoc} */ diff --git a/phone/com/android/internal/policy/impl/LockPatternKeyguardView.java b/phone/com/android/internal/policy/impl/LockPatternKeyguardView.java index c1b14c4..27706ef 100644 --- a/phone/com/android/internal/policy/impl/LockPatternKeyguardView.java +++ b/phone/com/android/internal/policy/impl/LockPatternKeyguardView.java @@ -601,6 +601,7 @@ public class LockPatternKeyguardView extends KeyguardViewBase { unlockView = new AccountUnlockScreen( mContext, mConfiguration, + mUpdateMonitor, mKeyguardScreenCallback, mLockPatternUtils); } catch (IllegalStateException e) { |