am d6a4bd90: am d08372bc: Merge "Fixed a bug where the alarm could overlap in QS" into lmp-dev

* commit 'd6a4bd90e04a7c43abb3611d4e66de60eb5ee2bd':
  Fixed a bug where the alarm could overlap in QS
This commit is contained in:
Selim Cinek
2014-09-23 14:44:44 +00:00
committed by Android Git Automerger

View File

@@ -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);