diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-05-11 13:42:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-11 13:42:14 +0000 |
| commit | a62a54ffc14fede9dd7f0f668680c491a466428e (patch) | |
| tree | 2e678b8864bad1b50edda6ac0c2ea87751a23ff2 /packages/SystemUI/res | |
| parent | 56845144eddc1b8a5e403f9d0db419665217baed (diff) | |
| parent | fe051aa36b2b706b20afa90c5c3cbbead2bb05fe (diff) | |
| download | frameworks_base-a62a54ffc14fede9dd7f0f668680c491a466428e.zip frameworks_base-a62a54ffc14fede9dd7f0f668680c491a466428e.tar.gz frameworks_base-a62a54ffc14fede9dd7f0f668680c491a466428e.tar.bz2 | |
am 879c4491: Merge "Implement new multi-user affordance."
* commit '879c4491af838286878b63af1dbc92eb55f1cc8c':
Implement new multi-user affordance.
Diffstat (limited to 'packages/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/layout/status_bar_expanded_header.xml | 16 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/user_switcher_host.xml | 3 |
2 files changed, 15 insertions, 4 deletions
diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml index ac81e4e..c9da221 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml @@ -25,7 +25,7 @@ android:orientation="horizontal" android:gravity="center_vertical" android:baselineAligned="false" - android:elevation="14dp" + android:elevation="10dp" > <View @@ -74,12 +74,22 @@ android:ellipsize="marquee" android:textAppearance="?android:attr/textAppearanceMedium" /> + <com.android.systemui.statusbar.phone.MultiUserSwitch android:id="@+id/multi_user_switch" + android:layout_width="40dp" + android:layout_height="@dimen/status_bar_header_height" + android:layout_alignParentEnd="true" + android:background="@null" + android:scaleType="centerInside" + android:padding="6dp" + /> + <FrameLayout android:id="@+id/system_icons_container" android:layout_width="wrap_content" android:layout_height="@dimen/status_bar_header_height" - android:layout_alignParentEnd="true" - android:layout_marginEnd="16dp" + android:layout_toStartOf="@id/multi_user_switch" + android:layout_marginEnd="4dp" /> + <TextView android:id="@+id/header_debug_info" android:visibility="invisible" diff --git a/packages/SystemUI/res/layout/user_switcher_host.xml b/packages/SystemUI/res/layout/user_switcher_host.xml index bc56cf6..70c5042 100644 --- a/packages/SystemUI/res/layout/user_switcher_host.xml +++ b/packages/SystemUI/res/layout/user_switcher_host.xml @@ -22,7 +22,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#dd000000"> + android:background="#dd000000" + android:elevation="12dp"> <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content" |