diff options
| author | Adrian Roos <roosa@google.com> | 2014-09-05 13:57:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-05 13:58:33 +0000 |
| commit | c2c661fccc97705a8d43eb76ae5d6607b93301ff (patch) | |
| tree | b8801cbee7c7acaab16695dfd3b1a30fdbe384c8 /packages | |
| parent | 88dcd1a5f7d0109e460f8938096063d1a18224c3 (diff) | |
| parent | cc74113ac609072124de9b57e64b4f0236a851c8 (diff) | |
| download | frameworks_base-c2c661fccc97705a8d43eb76ae5d6607b93301ff.zip frameworks_base-c2c661fccc97705a8d43eb76ae5d6607b93301ff.tar.gz frameworks_base-c2c661fccc97705a8d43eb76ae5d6607b93301ff.tar.bz2 | |
Merge "Reorder brightness slider mirror in front of album art" into lmp-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/res/layout/super_status_bar.xml | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/packages/SystemUI/res/layout/super_status_bar.xml b/packages/SystemUI/res/layout/super_status_bar.xml index 09e541f..29fec41 100644 --- a/packages/SystemUI/res/layout/super_status_bar.xml +++ b/packages/SystemUI/res/layout/super_status_bar.xml @@ -26,24 +26,6 @@ android:fitsSystemWindows="true" android:descendantFocusability="afterDescendants"> - <FrameLayout android:id="@+id/brightness_mirror" - android:layout_width="@dimen/notification_panel_width" - android:layout_height="wrap_content" - android:layout_gravity="@integer/notification_panel_layout_gravity" - android:paddingLeft="@dimen/notification_side_padding" - android:paddingRight="@dimen/notification_side_padding" - android:visibility="gone"> - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:elevation="2dp" - android:background="@drawable/brightness_mirror_background"> - <include layout="@layout/quick_settings_brightness_dialog" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - </FrameLayout> - </FrameLayout> - <com.android.systemui.statusbar.AlphaOptimizedFrameLayout android:id="@+id/backdrop" android:layout_width="match_parent" @@ -69,6 +51,24 @@ android:layout_width="match_parent" android:layout_height="@dimen/status_bar_height" /> + <FrameLayout android:id="@+id/brightness_mirror" + android:layout_width="@dimen/notification_panel_width" + android:layout_height="wrap_content" + android:layout_gravity="@integer/notification_panel_layout_gravity" + android:paddingLeft="@dimen/notification_side_padding" + android:paddingRight="@dimen/notification_side_padding" + android:visibility="gone"> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:elevation="2dp" + android:background="@drawable/brightness_mirror_background"> + <include layout="@layout/quick_settings_brightness_dialog" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + </FrameLayout> + </FrameLayout> + <com.android.systemui.statusbar.phone.PanelHolder android:id="@+id/panel_holder" android:layout_width="match_parent" |