diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-07-25 16:42:34 +0200 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2014-07-25 19:03:47 +0000 |
| commit | bc976e3f4c79a8565ec625564c92d316825f26a7 (patch) | |
| tree | e74a4d33bf692bd550326204c958752fbe4d3ecd /packages/SystemUI/res | |
| parent | 22fa6e5c491eb38419bb5a3df3009094350a8d46 (diff) | |
| download | frameworks_base-bc976e3f4c79a8565ec625564c92d316825f26a7.zip frameworks_base-bc976e3f4c79a8565ec625564c92d316825f26a7.tar.gz frameworks_base-bc976e3f4c79a8565ec625564c92d316825f26a7.tar.bz2 | |
Fix ordering of notifications, user switcher and QS panel
Also closes the user switcher when opening QS on Keyguard because
touch logic would interleave with QS.
Change-Id: I391dc9bcba7f9e2e99c0854d34ed0ec6efbb2f44
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" /> |