diff options
| author | Jim Miller <jaggies@google.com> | 2011-10-17 18:03:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-17 18:03:38 -0700 |
| commit | 9a7e4ce72a1f97832e71386ad023439ed9b179bd (patch) | |
| tree | ab5b581b36df382ac18a1abe36a2a0820bba06cc /policy/src | |
| parent | 7788c51d82963a8645655675c675424db694ad85 (diff) | |
| parent | 305c78cce649056643641c51f12f2b6d2eb839f3 (diff) | |
| download | frameworks_base-9a7e4ce72a1f97832e71386ad023439ed9b179bd.zip frameworks_base-9a7e4ce72a1f97832e71386ad023439ed9b179bd.tar.gz frameworks_base-9a7e4ce72a1f97832e71386ad023439ed9b179bd.tar.bz2 | |
Merge "Fix 5466678: use new setSystemUiVisibility() API to enable clock in statusbar" into ics-mr0
Diffstat (limited to 'policy/src')
3 files changed, 8 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/KeyguardUpdateMonitor.java b/policy/src/com/android/internal/policy/impl/KeyguardUpdateMonitor.java index 2d8185b..008f5d8 100644 --- a/policy/src/com/android/internal/policy/impl/KeyguardUpdateMonitor.java +++ b/policy/src/com/android/internal/policy/impl/KeyguardUpdateMonitor.java @@ -524,6 +524,7 @@ public class KeyguardUpdateMonitor { callback.onRingerModeChanged(mRingMode); callback.onPhoneStateChanged(mPhoneState); callback.onRefreshCarrierInfo(mTelephonyPlmn, mTelephonySpn); + callback.onClockVisibilityChanged(); } else { if (DEBUG) Log.e(TAG, "Object tried to add another INFO callback", new Exception("Whoops")); diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java b/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java index 2fd165a..0499cfa 100644 --- a/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java +++ b/policy/src/com/android/internal/policy/impl/KeyguardViewManager.java @@ -178,7 +178,6 @@ public class KeyguardViewManager implements KeyguardWindowController { int visFlags = ( View.STATUS_BAR_DISABLE_BACK | View.STATUS_BAR_DISABLE_HOME - | View.STATUS_BAR_DISABLE_CLOCK ); mKeyguardHost.setSystemUiVisibility(visFlags); diff --git a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java index ebf380a..96998af 100644 --- a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java +++ b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java @@ -709,8 +709,14 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler public void onRefreshCarrierInfo(CharSequence plmn, CharSequence spn) {} @Override public void onRingerModeChanged(int state) {} + @Override - public void onClockVisibilityChanged() {} + public void onClockVisibilityChanged() { + int visFlags = getSystemUiVisibility() & ~View.STATUS_BAR_DISABLE_CLOCK; + setSystemUiVisibility(visFlags + | (mUpdateMonitor.isClockVisible() ? View.STATUS_BAR_DISABLE_CLOCK : 0)); + } + @Override public void onDeviceProvisioned() {} |