diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-05-12 13:15:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-12 13:15:49 +0000 |
| commit | db808c3e4adfb3b912e052fe72fd4b06efd8cbed (patch) | |
| tree | e3b94428108c32323726edef3abd33a7087de79b /packages/SystemUI/res | |
| parent | b889b6861d5e49149990cdbfaf9f62b3e7340b18 (diff) | |
| parent | f056e35a34a8846a1d7c7a3fd55b9d69b559a590 (diff) | |
| download | frameworks_base-db808c3e4adfb3b912e052fe72fd4b06efd8cbed.zip frameworks_base-db808c3e4adfb3b912e052fe72fd4b06efd8cbed.tar.gz frameworks_base-db808c3e4adfb3b912e052fe72fd4b06efd8cbed.tar.bz2 | |
am b1c07444: Implement intermediate brigthness control on header.
* commit 'b1c074442571c278421f3424d991124af1abf252':
Implement intermediate brigthness control on header.
Diffstat (limited to 'packages/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/status_bar_expanded_header.xml | 6 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/styles.xml | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml b/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml index b7df51d..1efda8c 100644 --- a/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml +++ b/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml @@ -29,7 +29,7 @@ <com.android.systemui.settings.ToggleSlider android:id="@+id/brightness_slider" android:layout_width="0dp" - android:layout_height="40dp" + android:layout_height="44dp" android:layout_gravity="center_vertical" android:layout_weight="1" systemui:text="@string/status_bar_settings_auto_brightness_label" /> diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml index 18cb11f..89fa988 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml @@ -98,6 +98,12 @@ android:layout_marginEnd="4dp" /> + <include + layout="@layout/quick_settings_brightness_dialog" + android:id="@+id/brightness_container" + android:layout_width="match_parent" + /> + <TextView android:id="@+id/header_debug_info" android:visibility="invisible" diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index ebd2daa..acf1f11 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -136,6 +136,7 @@ <item name="android:layout_width">match_parent</item> <item name="android:layout_height">wrap_content</item> <item name="android:padding">16dp</item> + <item name="android:layout_alignParentBottom">true</item> </style> <style name="BrightnessDialogContainer" parent="@style/BaseBrightnessDialogContainer" /> |