diff options
4 files changed, 2 insertions, 16 deletions
diff --git a/packages/SystemUI/res/layout/battery_detail.xml b/packages/SystemUI/res/layout/battery_detail.xml index 1f24ab0fad21..8abfcf6057aa 100644 --- a/packages/SystemUI/res/layout/battery_detail.xml +++ b/packages/SystemUI/res/layout/battery_detail.xml @@ -25,7 +25,7 @@ android:id="@+id/charge_and_estimation" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingStart="72dp" + android:paddingStart="16dp" android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="?android:attr/colorAccent" /> diff --git a/packages/SystemUI/res/layout/qs_detail_header.xml b/packages/SystemUI/res/layout/qs_detail_header.xml index c062b6d671a5..f6ca862370ac 100644 --- a/packages/SystemUI/res/layout/qs_detail_header.xml +++ b/packages/SystemUI/res/layout/qs_detail_header.xml @@ -22,19 +22,9 @@ android:background="@drawable/btn_borderless_rect" android:gravity="center"> - <ImageView - android:id="@*android:id/up" - android:layout_width="56dp" - android:layout_height="56dp" - android:layout_marginEnd="16dp" - android:padding="16dp" - android:clickable="true" - android:background="?android:attr/selectableItemBackground" - android:contentDescription="@*android:string/action_bar_up_description" - android:src="?android:attr/homeAsUpIndicator" /> - <TextView android:id="@android:id/title" + android:paddingStart="16dp" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSDetail.java b/packages/SystemUI/src/com/android/systemui/qs/QSDetail.java index a40e5b7789c6..c63be9ce9760 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSDetail.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSDetail.java @@ -63,7 +63,6 @@ public class QSDetail extends LinearLayout { private boolean mScanState; private boolean mClosingDetail; private boolean mFullyExpanded; - private View mQsDetailHeaderBack; private BaseStatusBarHeader mHeader; private boolean mTriggeredExpand; private int mOpenX; @@ -92,7 +91,6 @@ public class QSDetail extends LinearLayout { mDetailDoneButton = (TextView) findViewById(android.R.id.button1); mQsDetailHeader = findViewById(R.id.qs_detail_header); - mQsDetailHeaderBack = mQsDetailHeader.findViewById(com.android.internal.R.id.up); mQsDetailHeaderTitle = (TextView) mQsDetailHeader.findViewById(android.R.id.title); mQsDetailHeaderSwitch = (Switch) mQsDetailHeader.findViewById(android.R.id.toggle); mQsDetailHeaderProgress = (ImageView) findViewById(R.id.qs_detail_header_progress); @@ -109,7 +107,6 @@ public class QSDetail extends LinearLayout { mQsPanel.closeDetail(); } }; - mQsDetailHeaderBack.setOnClickListener(doneListener); mDetailDoneButton.setOnClickListener(doneListener); } diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerZenModePanel.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerZenModePanel.java index cc0ffb0e2653..1ea23bb65107 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/TunerZenModePanel.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerZenModePanel.java @@ -54,7 +54,6 @@ public class TunerZenModePanel extends LinearLayout implements OnClickListener { mHeaderSwitch = findViewById(R.id.tuner_zen_switch); mHeaderSwitch.setVisibility(View.VISIBLE); mHeaderSwitch.setOnClickListener(this); - mHeaderSwitch.findViewById(com.android.internal.R.id.up).setVisibility(View.GONE); ((TextView) mHeaderSwitch.findViewById(android.R.id.title)).setText( R.string.quick_settings_dnd_label); mZenModePanel = (ZenModePanel) findViewById(R.id.zen_mode_panel); |