diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java | 3 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java index 1607b464b80..76344345d82 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java @@ -289,7 +289,8 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue */ private int clockHiddenMode() { if (!mStatusBar.isClosed() && !mKeyguardMonitor.isShowing() - && !mStatusBarStateController.isDozing()) { + && !mStatusBarStateController.isDozing() + && mClockController.getClock().shouldBeVisible()) { return View.INVISIBLE; } return View.GONE; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java index f1808c133c9..b89f27d5b5d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java @@ -268,7 +268,7 @@ public class Clock extends TextView implements DemoMode, Tunable, CommandQueue.C updateClockVisibility(); } - private boolean shouldBeVisible() { + public boolean shouldBeVisible() { return mClockVisibleByPolicy && mClockVisibleByUser; } |