diff options
| author | Jason Monk <jmonk@google.com> | 2015-07-30 00:36:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-30 00:36:29 +0000 |
| commit | 414028675297b33d9899ccab2f04e908b7aa8c1d (patch) | |
| tree | a033e054a67c47a91156821b69571ba8a4f94e5b /packages/SystemUI | |
| parent | 8e43c3e76f8edb9408dd49d673f76044e335ecd6 (diff) | |
| parent | beb3185f01ce5d06f1503d37a4ed8f93b8bf76e0 (diff) | |
| download | frameworks_base-414028675297b33d9899ccab2f04e908b7aa8c1d.zip frameworks_base-414028675297b33d9899ccab2f04e908b7aa8c1d.tar.gz frameworks_base-414028675297b33d9899ccab2f04e908b7aa8c1d.tar.bz2 | |
am beb3185f: Merge "Fix touch target for settings icon" into mnc-dev
* commit 'beb3185f01ce5d06f1503d37a4ed8f93b8bf76e0':
Fix touch target for settings icon
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/res/layout/status_bar_expanded_header.xml | 14 |
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" |