diff options
| -rw-r--r-- | packages/SystemUI/res/layout/qs_detail.xml | 4 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/qs_detail_header.xml | 60 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/qs_detail_items.xml | 1 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/zen_mode_panel.xml | 1 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/dimens.xml | 1 |
5 files changed, 36 insertions, 31 deletions
diff --git a/packages/SystemUI/res/layout/qs_detail.xml b/packages/SystemUI/res/layout/qs_detail.xml index f41c4944fff8..34e43ce88ebc 100644 --- a/packages/SystemUI/res/layout/qs_detail.xml +++ b/packages/SystemUI/res/layout/qs_detail.xml @@ -26,10 +26,6 @@ android:paddingBottom="8dp" android:visibility="invisible"> - <com.android.systemui.ResizingSpace - android:layout_width="match_parent" - android:layout_height="@dimen/qs_detail_margin_top" /> - <include android:id="@+id/qs_detail_header" layout="@layout/qs_detail_header" diff --git a/packages/SystemUI/res/layout/qs_detail_header.xml b/packages/SystemUI/res/layout/qs_detail_header.xml index 871ed679f4d9..a1f0ee75c23a 100644 --- a/packages/SystemUI/res/layout/qs_detail_header.xml +++ b/packages/SystemUI/res/layout/qs_detail_header.xml @@ -20,34 +20,46 @@ android:layout_height="wrap_content" android:paddingLeft="@dimen/qs_detail_header_padding" android:paddingTop="@dimen/qs_detail_header_padding" - android:paddingBottom="@dimen/qs_detail_header_bottom_padding" + android:paddingBottom="@dimen/qs_detail_items_padding_top" android:paddingEnd="@dimen/qs_panel_padding" android:background="@drawable/btn_borderless_rect" + android:orientation="vertical" android:gravity="center"> - <TextView - android:id="@android:id/title" - android:paddingStart="@dimen/qs_detail_header_text_padding" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:textDirection="locale" - android:textAppearance="@style/TextAppearance.QS.DetailHeader" /> - - <ImageView - android:id="@+id/settings" - android:layout_width="@dimen/qs_detail_image_width" - android:layout_height="@dimen/qs_detail_image_height" - android:background="?android:attr/selectableItemBackground" - android:padding="@dimen/qs_detail_image_padding" - android:src="@drawable/ic_settings" - android:visibility="gone"/> - - <Switch - android:id="@android:id/toggle" - android:layout_width="wrap_content" + <com.android.systemui.ResizingSpace + android:layout_width="match_parent" + android:layout_height="@dimen/qs_detail_margin_top" /> + + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:clickable="false" - android:textAppearance="@style/TextAppearance.QS.DetailHeader" /> + android:orientation="horizontal"> + + <TextView + android:id="@android:id/title" + android:paddingStart="@dimen/qs_detail_header_text_padding" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:textDirection="locale" + android:textAppearance="@style/TextAppearance.QS.DetailHeader" /> + + <ImageView + android:id="@+id/settings" + android:layout_width="@dimen/qs_detail_image_width" + android:layout_height="@dimen/qs_detail_image_height" + android:background="?android:attr/selectableItemBackground" + android:padding="@dimen/qs_detail_image_padding" + android:src="@drawable/ic_settings" + android:visibility="gone"/> + + <Switch + android:id="@android:id/toggle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:clickable="false" + android:textAppearance="@style/TextAppearance.QS.DetailHeader" /> + + </LinearLayout> </com.android.keyguard.AlphaOptimizedLinearLayout> diff --git a/packages/SystemUI/res/layout/qs_detail_items.xml b/packages/SystemUI/res/layout/qs_detail_items.xml index b9cdf28aa456..60cba67cf3d7 100644 --- a/packages/SystemUI/res/layout/qs_detail_items.xml +++ b/packages/SystemUI/res/layout/qs_detail_items.xml @@ -20,7 +20,6 @@ xmlns:sysui="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingTop="@dimen/qs_detail_items_padding_top" android:paddingStart="@dimen/qs_detail_padding_start" android:paddingEnd="16dp"> diff --git a/packages/SystemUI/res/layout/zen_mode_panel.xml b/packages/SystemUI/res/layout/zen_mode_panel.xml index 870784079e77..200eabf80e4e 100644 --- a/packages/SystemUI/res/layout/zen_mode_panel.xml +++ b/packages/SystemUI/res/layout/zen_mode_panel.xml @@ -36,7 +36,6 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:layout_marginTop="8dp" android:layout_marginBottom="8dp" /> <RelativeLayout diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 6604b6cd79c3..4245b1183e08 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -249,7 +249,6 @@ <dimen name="qs_panel_padding_bottom">0dp</dimen> <dimen name="qs_detail_header_height">56dp</dimen> <dimen name="qs_detail_header_padding">0dp</dimen> - <dimen name="qs_detail_header_bottom_padding">0dp</dimen> <dimen name="qs_detail_image_width">56dp</dimen> <dimen name="qs_detail_image_height">56dp</dimen> <dimen name="qs_detail_image_padding">16dp</dimen> |