diff options
3 files changed, 13 insertions, 5 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) { diff --git a/phone/com/android/internal/policy/impl/LockScreen.java b/phone/com/android/internal/policy/impl/LockScreen.java index f5fc145..a5ef1fa 100644 --- a/phone/com/android/internal/policy/impl/LockScreen.java +++ b/phone/com/android/internal/policy/impl/LockScreen.java @@ -513,11 +513,12 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM getCarrierString( mUpdateMonitor.getTelephonyPlmn(), mUpdateMonitor.getTelephonySpn())); - // unnecessary clutter - //mScreenLocked.setText(R.string.lockscreen_screen_locked); + + // Empty now, but used for sliding tab feedback + mScreenLocked.setText(""); // layout - mScreenLocked.setVisibility(View.INVISIBLE); + mScreenLocked.setVisibility(View.VISIBLE); mSelector.setVisibility(View.VISIBLE); mEmergencyCallText.setVisibility(View.GONE); break; |