Merge "Implement UserSwitchingDialog in SystemUI mounted to OverlayWindow."... (ef4d90d0) · Commits · e / os / android_frameworks_base

core/res/res/layout/car_user_switching_dialog.xml

deleted100644 → 0

+0 −37

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2018 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.
		-->
		<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:fitsSystemWindows="true"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content">

		<ImageView
		android:id="@+id/user_loading_avatar"
		android:layout_width="@dimen/car_fullscreen_user_pod_image_avatar_width"
		android:layout_height="@dimen/car_fullscreen_user_pod_image_avatar_height"
		android:layout_centerHorizontal="true"/>

		<TextView android:id="@+id/user_loading"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="@dimen/car_padding_4"
		android:textSize="@dimen/car_body1_size"
		android:textColor="@color/car_body1"
		android:layout_below="@id/user_loading_avatar"
		android:gravity="center"/>

		</RelativeLayout>
		No newline at end of file

core/res/res/values/dimens_car.xml

+0 −7

Original line number	Diff line number	Diff line
		@@ -16,14 +16,7 @@
		*/
		-->
		<resources>
		<dimen name="car_fullscreen_user_pod_icon_text_size">64sp</dimen>
		<dimen name="car_fullscreen_user_pod_width">243dp</dimen>
		<dimen name="car_fullscreen_user_pod_height">356dp</dimen>
		<dimen name="car_fullscreen_user_pod_image_avatar_width">96dp</dimen>
		<dimen name="car_fullscreen_user_pod_image_avatar_height">96dp</dimen>
		<dimen name="car_large_avatar_size">96dp</dimen>


		<!-- Application Bar -->
		<dimen name="car_app_bar_height">80dp</dimen>
		<!-- Margin -->

core/res/res/values/symbols.xml

+0 −7

Original line number	Diff line number	Diff line
		@@ -3641,13 +3641,6 @@
		<java-symbol type="color" name="car_card_dark" />
		<java-symbol type="dimen" name="car_body1_size" />
		<java-symbol type="dimen" name="car_padding_4" />
		<java-symbol type="dimen" name="car_fullscreen_user_pod_icon_text_size" />
		<java-symbol type="dimen" name="car_fullscreen_user_pod_image_avatar_height" />
		<java-symbol type="dimen" name="car_fullscreen_user_pod_image_avatar_width" />
		<java-symbol type="dimen" name="car_large_avatar_size" />
		<java-symbol type="layout" name="car_user_switching_dialog" />
		<java-symbol type="id" name="user_loading_avatar" />
		<java-symbol type="id" name="user_loading" />
		<java-symbol type="style" name="Theme.DeviceDefault.Light.Dialog.Alert.UserSwitchingDialog" />

		<java-symbol type="string" name="battery_saver_description_with_learn_more" />

packages/CarSystemUI/AndroidManifest.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -25,4 +25,6 @@
		<uses-permission android:name="android.car.permission.CAR_ENROLL_TRUST"/>
		<!-- This permission is required to get bluetooth broadcast. -->
		<uses-permission android:name="android.permission.BLUETOOTH" />
		<!-- This permission is required to check the foreground user id. -->
		<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
		</manifest>

packages/CarSystemUI/res/layout/car_user_switching_dialog.xml

0 → 100644

+43 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2020 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.
		-->
		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:fitsSystemWindows="true"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:gravity="center"
		android:background="@color/car_user_switching_dialog_background_color">
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:layout_gravity="center"
		android:gravity="center_horizontal">
		<ImageView
		android:id="@+id/user_loading_avatar"
		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_loading"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="@dimen/car_user_switching_dialog_loading_text_margin_top"
		android:textSize="@dimen/car_user_switching_dialog_loading_text_font_size"
		android:textColor="@color/car_user_switching_dialog_loading_text_color"
		android:layout_below="@id/user_loading_avatar"/>
		</LinearLayout>
		</FrameLayout>