Merge "Update User switcher to new spec, implement adding users" into lmp-dev (04e5f72c) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/color/qs_user_detail_name.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,6 @@
		-->

		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:state_activated="true" android:color="#ffffffff" />
		<item android:state_activated="true" android:color="@color/current_user_border_color" />
		<item android:color="#66ffffff" /> <!-- 40% white -->
		</selector>
		No newline at end of file

packages/SystemUI/res/drawable/ic_account_circle_qs.xml

+16 −4

Original line number	Diff line number	Diff line
		@@ -16,7 +16,19 @@
		~ limitations under the License
		-->

		<selector xmlns:android="http://schemas.android.com/apk/res/android" >
		<item android:state_activated="true" android:drawable="@drawable/ic_account_circle" />
		<item android:drawable="@drawable/ic_account_circle_qs_muted" />
		</selector>
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0">

		<group
		android:scaleX="1.2"
		android:scaleY="1.2"
		android:pivotX="12.0"
		android:pivotY="12.0">
		<path
		android:fillColor="@color/qs_user_detail_icon_muted"
		android:pathData="M12.0,2.0C6.5,2.0 2.0,6.5 2.0,12.0s4.5,10.0 10.0,10.0c5.5,0.0 10.0,-4.5 10.0,-10.0S17.5,2.0 12.0,2.0zM12.0,5.0c1.7,0.0 3.0,1.3 3.0,3.0c0.0,1.7 -1.3,3.0 -3.0,3.0c-1.7,0.0 -3.0,-1.3 -3.0,-3.0C9.0,6.3 10.3,5.0 12.0,5.0zM12.0,19.2c-2.5,0.0 -4.7,-1.3 -6.0,-3.2c0.0,-2.0 4.0,-3.1 6.0,-3.1c2.0,0.0 6.0,1.1 6.0,3.1C16.7,17.9 14.5,19.2 12.0,19.2z"/>
		</group>
		</vector>

packages/SystemUI/res/drawable/ic_account_circle_qs_muted.xml

deleted100644 → 0

+0 −34

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>

		<!--
		~ Copyright (C) 2014 The Android Open Source Project
		~
		~ Licensed under the Apache License, Version 2.0 (the "License");
		~ you may not use this file except in compliance with the License.
		~ You may obtain a copy of the License at
		~
		~ http://www.apache.org/licenses/LICENSE-2.0
		~
		~ Unless required by applicable law or agreed to in writing, software
		~ distributed under the License is distributed on an "AS IS" BASIS,
		~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		~ See the License for the specific language governing permissions and
		~ limitations under the License
		-->

		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0">

		<group
		android:scaleX="1.2"
		android:scaleY="1.2"
		android:pivotX="12.0"
		android:pivotY="12.0">
		<path
		android:fillColor="@color/qs_user_detail_icon_muted"
		android:pathData="M12.0,2.0C6.5,2.0 2.0,6.5 2.0,12.0s4.5,10.0 10.0,10.0c5.5,0.0 10.0,-4.5 10.0,-10.0S17.5,2.0 12.0,2.0zM12.0,5.0c1.7,0.0 3.0,1.3 3.0,3.0c0.0,1.7 -1.3,3.0 -3.0,3.0c-1.7,0.0 -3.0,-1.3 -3.0,-3.0C9.0,6.3 10.3,5.0 12.0,5.0zM12.0,19.2c-2.5,0.0 -4.7,-1.3 -6.0,-3.2c0.0,-2.0 4.0,-3.1 6.0,-3.1c2.0,0.0 6.0,1.1 6.0,3.1C16.7,17.9 14.5,19.2 12.0,19.2z"/>
		</group>
		</vector>

packages/SystemUI/res/drawable/ic_add_circle_qs.xml

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2014 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="48.0dp"
		android:height="48.0dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0">
		<group
		android:scaleX="1.2"
		android:scaleY="1.2"
		android:pivotX="12.0"
		android:pivotY="12.0">
		<path
		android:fillColor="@color/qs_user_detail_icon_muted"
		android:pathData="M12.000000,2.000000C6.500000,2.000000 2.000000,6.500000 2.000000,12.000000s4.500000,10.000000 10.000000,10.000000c5.500000,0.000000 10.000000,-4.500000 10.000000,-10.000000S17.500000,2.000000 12.000000,2.000000zM17.000000,13.000000l-4.000000,0.000000l0.000000,4.000000l-2.000000,0.000000l0.000000,-4.000000L7.000000,13.000000l0.000000,-2.000000l4.000000,0.000000L11.000000,7.000000l2.000000,0.000000l0.000000,4.000000l4.000000,0.000000L17.000000,13.000000z"/>
		</group>
		</vector>

packages/SystemUI/res/layout/keyguard_user_switcher_item.xml

+11 −5

Original line number	Diff line number	Diff line
		@@ -16,7 +16,9 @@
		~ limitations under the License
		-->

		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		<!-- LinearLayout -->
		<com.android.systemui.qs.tiles.UserDetailItemView
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:sysui="http://schemas.android.com/apk/res-auto"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		@@ -24,17 +26,21 @@
		android:layout_marginEnd="8dp"
		android:gravity="center_vertical"
		android:clickable="true"
		android:background="@drawable/ripple_drawable">
		<TextView android:id="@+id/name"
		android:background="@drawable/ripple_drawable"
		android:clipChildren="false"
		android:clipToPadding="false"
		sysui:activatedFontFamily="sans-serif-medium">
		<TextView android:id="@+id/user_name"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginEnd="16dp"
		android:textAppearance="@style/TextAppearance.StatusBar.Expanded.UserSwitcher.UserName"
		/>
		<com.android.systemui.statusbar.phone.UserAvatarView android:id="@+id/picture"
		<com.android.systemui.statusbar.phone.UserAvatarView android:id="@+id/user_picture"
		android:layout_width="@dimen/max_avatar_size"
		android:layout_height="@dimen/max_avatar_size"
		android:contentDescription="@null"
		sysui:frameWidth="@dimen/keyguard_user_switcher_border_thickness"
		sysui:framePadding="6dp"
		sysui:activeFrameColor="@color/current_user_border_color" />
		</LinearLayout>
		No newline at end of file
		</com.android.systemui.qs.tiles.UserDetailItemView>
		No newline at end of file