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

Merge "Fix QS Detail header touch target" into oc-dev

Browse Source 
am: b25f52c042

Change-Id: I7ec755fdfda3014aecdcfa7ff47ae0c39d3bff92
This commit is contained in:
Jason Monk
2017-05-26 20:52:10 +00:00
committed by android-build-merger
parent f802c625ca b25f52c042
commit d58b721e55
5 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/layout/qs_detail.xml
View File

@@ -26,10 +26,6 @@
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:visibility="invisible"> android:visibility="invisible">
<com.android.systemui.ResizingSpace
android:layout_width="match_parent"
android:layout_height="@dimen/qs_detail_margin_top" />
<include <include
android:id="@+id/qs_detail_header" android:id="@+id/qs_detail_header"
layout="@layout/qs_detail_header" layout="@layout/qs_detail_header"

58
packages/SystemUI/res/layout/qs_detail_header.xml
View File

@@ -20,34 +20,46 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="@dimen/qs_detail_header_padding" android:paddingLeft="@dimen/qs_detail_header_padding"
android:paddingTop="@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:paddingEnd="@dimen/qs_panel_padding"
android:background="@drawable/btn_borderless_rect" android:background="@drawable/btn_borderless_rect"
android:orientation="vertical"
android:gravity="center"> android:gravity="center">
<TextView <com.android.systemui.ResizingSpace
android:id="@android:id/title" android:layout_width="match_parent"
android:paddingStart="@dimen/qs_detail_header_text_padding" android:layout_height="@dimen/qs_detail_margin_top" />
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textDirection="locale"
android:textAppearance="@style/TextAppearance.QS.DetailHeader" />
<ImageView <LinearLayout
android:id="@+id/settings" android:layout_width="match_parent"
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:layout_height="wrap_content"
android:clickable="false" android:orientation="horizontal">
android:textAppearance="@style/TextAppearance.QS.DetailHeader" />
<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> </com.android.keyguard.AlphaOptimizedLinearLayout>

1
packages/SystemUI/res/layout/qs_detail_items.xml
View File

@@ -20,7 +20,6 @@
xmlns:sysui="http://schemas.android.com/apk/res-auto" xmlns:sysui="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingTop="@dimen/qs_detail_items_padding_top"
android:paddingStart="@dimen/qs_detail_padding_start" android:paddingStart="@dimen/qs_detail_padding_start"
android:paddingEnd="16dp"> android:paddingEnd="16dp">

1
packages/SystemUI/res/layout/zen_mode_panel.xml
View File

@@ -36,7 +36,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp" /> android:layout_marginBottom="8dp" />
<RelativeLayout <RelativeLayout

1
packages/SystemUI/res/values/dimens.xml
View File

@@ -249,7 +249,6 @@
<dimen name="qs_panel_padding_bottom">0dp</dimen> <dimen name="qs_panel_padding_bottom">0dp</dimen>
<dimen name="qs_detail_header_height">56dp</dimen> <dimen name="qs_detail_header_height">56dp</dimen>
<dimen name="qs_detail_header_padding">0dp</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_width">56dp</dimen>
<dimen name="qs_detail_image_height">56dp</dimen> <dimen name="qs_detail_image_height">56dp</dimen>
<dimen name="qs_detail_image_padding">16dp</dimen> <dimen name="qs_detail_image_padding">16dp</dimen>