commit 730e9bceb746e6c50b87cc5a695eb73fea27686e
author Jorim Jaggi <jjaggi@google.com> Wed Aug 20 17:00:36 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Aug 16 04:36:39 2014 +0000
tree bc228012e195380e94b1be4d5a4a7f870401f1c8
parent d26bfec44bc7537ba1697af44562a51912d1c8f7
parent aa6c3640828b7f63ad02fe6142e5a792bf1a2a30

Merge "Make alarm invisible when going to detail in QS" into lmp-dev

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
index 8bc7dd4..807a37b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
@@ -714,6 +714,7 @@
             final boolean showingDetail = detail != null;
             transition(mClock, !showingDetail);
             transition(mDateGroup, !showingDetail);
+            transition(mAlarmStatus, !showingDetail);
             transition(mQsDetailHeader, showingDetail);
             if (showingDetail) {
                 mQsDetailHeaderTitle.setText(detail.getTitle());