diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-07-25 19:25:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-25 19:25:15 +0000 |
| commit | fbb55b5ab99798940b2fea3351130e0d866e75bc (patch) | |
| tree | 903ba8c71a231aba62dfcb6c1c9b172a011be46b /packages/SystemUI/res | |
| parent | b64fd1957f573ba649497c84c2cf5af9828ec5c0 (diff) | |
| parent | 27f37bba906823eb09788f452678ff7e6cdf3eff (diff) | |
| download | frameworks_base-fbb55b5ab99798940b2fea3351130e0d866e75bc.zip frameworks_base-fbb55b5ab99798940b2fea3351130e0d866e75bc.tar.gz frameworks_base-fbb55b5ab99798940b2fea3351130e0d866e75bc.tar.bz2 | |
am ec5eb56f: am 1437fc51: am bf8ece49: Fix ordering of notifications, user switcher and QS panel
* commit 'ec5eb56f39890acf833ea56a29eaf3e67291085d':
Fix ordering of notifications, user switcher and QS panel
Diffstat (limited to 'packages/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/layout/status_bar_expanded.xml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index 1f68cd8..9af2879 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -56,14 +56,6 @@ android:clipToPadding="false" android:clipChildren="false"> - <ViewStub - android:id="@+id/keyguard_user_switcher" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_marginTop="@dimen/status_bar_header_height_keyguard" - android:layout_gravity="end" - android:layout="@layout/keyguard_user_switcher" /> - <com.android.systemui.statusbar.phone.ObservableScrollView android:id="@+id/scroll_view" android:layout_width="match_parent" @@ -103,6 +95,14 @@ android:layout_height="match_parent" android:layout_marginBottom="@dimen/close_handle_underlap"/> + <ViewStub + android:id="@+id/keyguard_user_switcher" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_marginTop="@dimen/status_bar_header_height_keyguard" + android:layout_gravity="end" + android:layout="@layout/keyguard_user_switcher" /> + </com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer> <include layout="@layout/status_bar_expanded_header" /> |