summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-07-30 00:32:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-30 00:32:17 +0000
commitbeb3185f01ce5d06f1503d37a4ed8f93b8bf76e0 (patch)
treeec33790cc9b467b042465b67f9c5a04da4feefec /packages
parent26aa04c3c4d16ab7bf47d414fac697721e5843cd (diff)
parentbd6f1c87a5bbedd37417cff2fb9f6306e2a1d22f (diff)
downloadframeworks_base-beb3185f01ce5d06f1503d37a4ed8f93b8bf76e0.zip
frameworks_base-beb3185f01ce5d06f1503d37a4ed8f93b8bf76e0.tar.gz
frameworks_base-beb3185f01ce5d06f1503d37a4ed8f93b8bf76e0.tar.bz2
Merge "Fix touch target for settings icon" into mnc-dev
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/res/layout/status_bar_expanded_header.xml14
1 files changed, 7 insertions, 7 deletions
diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml
index 8c8a3dd..5eca471 100644
--- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml
+++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml
@@ -44,31 +44,31 @@
android:scaleType="centerInside"/>
</com.android.systemui.statusbar.phone.MultiUserSwitch>
- <com.android.keyguard.AlphaOptimizedLinearLayout
+ <com.android.systemui.statusbar.AlphaOptimizedFrameLayout
android:id="@+id/settings_button_container"
android:layout_width="48dp"
android:layout_height="@dimen/status_bar_header_height"
- android:paddingStart="12dp"
android:clipChildren="false"
android:clipToPadding="false"
android:layout_toStartOf="@id/multi_user_switch">
<com.android.systemui.statusbar.phone.SettingsButton android:id="@+id/settings_button"
style="@android:style/Widget.Material.Button.Borderless"
- android:layout_width="24dp"
- android:layout_height="@dimen/status_bar_header_height"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:background="@drawable/ripple_drawable"
android:src="@drawable/ic_settings"
android:contentDescription="@string/accessibility_desc_settings" />
<com.android.systemui.statusbar.AlphaOptimizedImageView android:id="@+id/tuner_icon"
- android:layout_width="12dp"
- android:layout_height="@dimen/status_bar_header_height"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingStart="36dp"
android:tint="#4DFFFFFF"
android:tintMode="src_in"
android:visibility="invisible"
android:src="@drawable/tuner" />
- </com.android.keyguard.AlphaOptimizedLinearLayout>
+ </com.android.systemui.statusbar.AlphaOptimizedFrameLayout>
<LinearLayout android:id="@+id/system_icons_super_container"
android:layout_width="wrap_content"