diff options
| author | Selim Cinek <cinek@google.com> | 2014-09-23 14:25:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-23 14:25:09 +0000 |
| commit | 0eba4e279fdadf296378e01fa244b7a816fce80c (patch) | |
| tree | 981333d35b19784d936ec54449c0eae5295a974a | |
| parent | 6ec76b0ff92889bff0b836dbfd59fe58e57aa386 (diff) | |
| parent | ba5b3a0b4e334d56fa08a6c39eeee54384eec003 (diff) | |
| download | frameworks_base-0eba4e279fdadf296378e01fa244b7a816fce80c.zip frameworks_base-0eba4e279fdadf296378e01fa244b7a816fce80c.tar.gz frameworks_base-0eba4e279fdadf296378e01fa244b7a816fce80c.tar.bz2 | |
Merge "Fixed a bug where the alarm could overlap in QS" into lmp-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java | 5 |
1 files changed, 4 insertions, 1 deletions
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 072fb29..2cd2787 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java @@ -623,7 +623,10 @@ public class StatusBarHeaderView extends RelativeLayout implements View.OnClickL mSettingsButton.setTranslationX(values.settingsTranslation); mSettingsButton.setRotation(values.settingsRotation); applyAlpha(mEmergencyCallsOnly, values.emergencyCallsOnlyAlpha); - applyAlpha(mAlarmStatus, values.alarmStatusAlpha); + if (!mShowingDetail) { + // Otherwise it needs to stay invisible + applyAlpha(mAlarmStatus, values.alarmStatusAlpha); + } applyAlpha(mDateCollapsed, values.dateCollapsedAlpha); applyAlpha(mDateExpanded, values.dateExpandedAlpha); applyAlpha(mBatteryLevel, values.batteryLevelAlpha); |