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

* commit '51bc341620f3aa7e63f5dd33954ececf9503f6cf':
  Fixed a bug where the alarm could overlap in QS
This commit is contained in:
Selim Cinek
2014-09-23 15:53:38 +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);