Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "QS Header: remove collapsed alarm ripple" into nyc-dev

Browse Source
This commit is contained in:
Jason Monk
2016-05-06 18:35:58 +00:00
committed by Android (Google) Code Review
parent 5d6a218d9e b8ae788f07
commit 5df0ee53ac
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml
View File

@@ -141,17 +141,13 @@
android:gravity="top" android:gravity="top"
systemui:datePattern="@string/abbrev_wday_month_day_no_year_alarm" /> systemui:datePattern="@string/abbrev_wday_month_day_no_year_alarm" />
<com.android.systemui.statusbar.AlphaOptimizedButton <com.android.systemui.statusbar.AlphaOptimizedImageView
android:id="@+id/alarm_status_collapsed" android:id="@+id/alarm_status_collapsed"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:drawablePadding="6dp" android:src="@drawable/ic_access_alarms_small"
android:drawableStart="@drawable/ic_access_alarms_small"
android:textColor="#64ffffff"
android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date"
android:paddingStart="6dp" android:paddingStart="6dp"
android:gravity="top" android:gravity="center"
android:background="?android:attr/selectableItemBackground"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
View File

@@ -57,7 +57,7 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements
protected View mSettingsContainer; protected View mSettingsContainer;
private TextView mAlarmStatus; private TextView mAlarmStatus;
private TextView mAlarmStatusCollapsed; private View mAlarmStatusCollapsed;
private QSPanel mQsPanel; private QSPanel mQsPanel;
@@ -117,7 +117,7 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements
mSettingsContainer = findViewById(R.id.settings_button_container); mSettingsContainer = findViewById(R.id.settings_button_container);
mSettingsButton.setOnClickListener(this); mSettingsButton.setOnClickListener(this);
mAlarmStatusCollapsed = (TextView) findViewById(R.id.alarm_status_collapsed); mAlarmStatusCollapsed = findViewById(R.id.alarm_status_collapsed);
mAlarmStatus = (TextView) findViewById(R.id.alarm_status); mAlarmStatus = (TextView) findViewById(R.id.alarm_status);
mAlarmStatus.setOnClickListener(this); mAlarmStatus.setOnClickListener(this);