diff options
| author | John Wang <johnwang@google.com> | 2011-06-08 20:41:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-08 20:41:41 -0700 |
| commit | 4d042048243f38d3062ab4719ac26c9154380115 (patch) | |
| tree | 9f4b3c8d986685a125c7d3ccee11afdff199ab17 /policy | |
| parent | 60ee24fe487e765c1e6d598aff99b9a5355ef50a (diff) | |
| parent | 08a8f3f9dc035bc462061ae87090a8da59c6713a (diff) | |
| download | frameworks_base-4d042048243f38d3062ab4719ac26c9154380115.zip frameworks_base-4d042048243f38d3062ab4719ac26c9154380115.tar.gz frameworks_base-4d042048243f38d3062ab4719ac26c9154380115.tar.bz2 | |
am 08a8f3f9: Merge "Set emergency call text visibility." into honeycomb-LTE
* commit '08a8f3f9dc035bc462061ae87090a8da59c6713a':
Set emergency call text visibility.
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/LockScreen.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/policy/src/com/android/internal/policy/impl/LockScreen.java b/policy/src/com/android/internal/policy/impl/LockScreen.java index 7331bda..6f7a6ee 100644 --- a/policy/src/com/android/internal/policy/impl/LockScreen.java +++ b/policy/src/com/android/internal/policy/impl/LockScreen.java @@ -538,7 +538,7 @@ class LockScreen extends LinearLayout implements KeyguardScreen, // layout mScreenLocked.setVisibility(View.VISIBLE); - mEmergencyCallText.setVisibility(View.VISIBLE); + mLockPatternUtils.updateEmergencyCallText(mEmergencyCallText); enableUnlock(); // do not need to show the e-call button; user may unlock break; @@ -552,8 +552,8 @@ class LockScreen extends LinearLayout implements KeyguardScreen, // layout mScreenLocked.setVisibility(View.VISIBLE); - mEmergencyCallText.setVisibility(View.VISIBLE); - mEmergencyCallButton.setVisibility(View.VISIBLE); + mLockPatternUtils.updateEmergencyCallText(mEmergencyCallText); + mLockPatternUtils.updateEmergencyCallButtonState(mEmergencyCallButton); disableUnlock(); break; @@ -579,14 +579,13 @@ class LockScreen extends LinearLayout implements KeyguardScreen, mScreenLocked.setText(R.string.lockscreen_sim_puk_locked_instructions); // layout + mLockPatternUtils.updateEmergencyCallText(mEmergencyCallText); + mLockPatternUtils.updateEmergencyCallButtonState(mEmergencyCallButton); if (mLockPatternUtils.isPukUnlockScreenEnable()) { mScreenLocked.setVisibility(View.INVISIBLE); - mEmergencyCallText.setVisibility(View.GONE); enableUnlock(); } else { mScreenLocked.setVisibility(View.VISIBLE); - mEmergencyCallText.setVisibility(View.VISIBLE); - mEmergencyCallButton.setVisibility(View.VISIBLE); disableUnlock(); } break; |