Merge "Commandeer full screen user switcher for auto." (03b42004) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/fullscreen_user_pod.xml→packages/SystemUI/res/layout/car_fullscreen_user_pod.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -26,13 +26,13 @@
		<ImageView android:id="@+id/user_avatar"
		android:padding="10dp"
		android:layout_gravity="center"
		android:layout_width="160dp"
		android:layout_height="160dp" />
		android:layout_width="@dimen/car_fullscreen_user_pod_image_avatar_width"
		android:layout_height="@dimen/car_fullscreen_user_pod_image_avatar_height" />

		<TextView android:id="@+id/user_name"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textSize="@dimen/qs_detail_item_secondary_text_size"
		android:textSize="@dimen/car_fullscreen_user_pod_text_size"
		android:textColor="@color/qs_user_detail_name"
		android:gravity="center_horizontal" />
		</LinearLayout>

packages/SystemUI/res/layout/fullscreen_user_switcher.xml→packages/SystemUI/res/layout/car_fullscreen_user_switcher.xml

+51 −0

Original line number	Diff line number	Diff line
		@@ -20,17 +20,32 @@
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:visibility="gone">
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">
		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/car_lockscreen_disclaimer_title"
		android:textSize="@dimen/car_lockscreen_disclaimer_title_size"
		android:paddingStart="@dimen/car_lockscreen_disclaimer_title_padding_start"
		android:paddingTop="@dimen/car_lockscreen_disclaimer_title_padding_top" />
		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/car_lockscreen_disclaimer_text"
		android:textSize="@dimen/car_lockscreen_disclaimer_text_size"
		android:paddingStart="@dimen/car_lockscreen_disclaimer_text_padding_start"
		android:paddingEnd="@dimen/car_lockscreen_disclaimer_text_padding_end"
		android:paddingTop="@dimen/car_lockscreen_disclaimer_text_padding_top" />
		<com.android.systemui.statusbar.UserGridView
		android:id="@+id/user_grid"
		android:layout_gravity="center"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:paddingStart="10dp"
		android:paddingEnd="10dp"
		android:columnWidth="180dp"
		android:verticalSpacing="10dp"
		android:horizontalSpacing="10dp"
		android:stretchMode="columnWidth"
		android:gravity="center">
		android:paddingTop="@dimen/car_lockscreen_user_grid_view_padding_top"
		android:stretchMode="columnWidth">
		</com.android.systemui.statusbar.UserGridView>
		</LinearLayout>
		</FrameLayout>

packages/SystemUI/res/layout/super_status_bar.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@
		</FrameLayout>

		<ViewStub android:id="@+id/fullscreen_user_switcher_stub"
		android:layout="@layout/fullscreen_user_switcher"
		android:layout="@layout/car_fullscreen_user_switcher"
		android:layout_width="match_parent"
		android:layout_height="match_parent"/>

packages/SystemUI/res/values/dimens_car.xml

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		* Copyright (c) 2016, 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.
		*/
		-->
		<resources>
		<dimen name="car_lockscreen_disclaimer_title_size">48sp</dimen>
		<dimen name="car_lockscreen_disclaimer_title_padding_start">96dp</dimen>
		<dimen name="car_lockscreen_disclaimer_title_padding_top">96dp</dimen>
		<dimen name="car_lockscreen_disclaimer_text_size">28sp</dimen>
		<dimen name="car_lockscreen_disclaimer_text_padding_start">96dp</dimen>
		<dimen name="car_lockscreen_disclaimer_text_padding_end">96dp</dimen>
		<dimen name="car_lockscreen_disclaimer_text_padding_top">32dp</dimen>
		<dimen name="car_lockscreen_user_grid_view_padding_start">10dp</dimen>
		<dimen name="car_lockscreen_user_grid_view_padding_end">10dp</dimen>
		<dimen name="car_lockscreen_user_grid_view_padding_top">128dp</dimen>
		<dimen name="car_fullscreen_user_pod_image_avatar_width">128dp</dimen>
		<dimen name="car_fullscreen_user_pod_image_avatar_height">128dp</dimen>
		<dimen name="car_fullscreen_user_pod_text_size">24sp</dimen>
		</resources>

packages/SystemUI/res/values/strings_car.xml

0 → 100644

+29 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/**
		* Copyright (c) 2016, 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.
		*/
		-->
		<resources>
		<string name="car_lockscreen_disclaimer_title">Drive safely</string>
		<string name="car_lockscreen_disclaimer_text">
		Stay fully aware of driving conditions and always obey applicable laws. Directions may be
		inaccurate, incomplete, dangerous, not suitable, prohibited, or involve crossing
		administrative areas. Business information may also be inaccurate or incomplete. Data is
		not real-time, and location accuracy cannot be guaranteed. Do not handle your mobile device
		or use apps not intended for Android Auto while driving.
		</string>

		</resources>