Snap for 6703926 from 9a85dc9c0a75ff0bb210db9b0712786b57ac5c61 to rvc-qpr1-release (955f2b4d) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,13 @@ public final class SystemUiDeviceConfigFlags {
		*/
		public static final String HASH_SALT_MAX_DAYS = "hash_salt_max_days";

		// Flag related to Privacy Indicators

		/**
		* Whether the Permissions Hub is showing.
		*/
		public static final String PROPERTY_PERMISSIONS_HUB_ENABLED = "permissions_hub_2_enabled";

		// Flags related to Assistant

		/**

data/etc/com.android.systemui.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@
		<permission name="android.permission.MODIFY_PHONE_STATE"/>
		<permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
		<permission name="android.permission.OBSERVE_NETWORK_POLICY"/>
		<permission name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS" />
		<permission name="android.permission.OVERRIDE_WIFI_CONFIG"/>
		<permission name="android.permission.PACKAGE_USAGE_STATS" />
		<permission name="android.permission.READ_DREAM_STATE"/>

packages/CarSystemUI/res/layout/super_notification_shade.xml

deleted100644 → 0

+0 −80

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		**
		** Copyright 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.
		*/
		-->

		<!-- This is the notification shade window. -->
		<com.android.systemui.statusbar.phone.NotificationShadeWindowView
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:sysui="http://schemas.android.com/apk/res-auto"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:fitsSystemWindows="true">

		<com.android.systemui.statusbar.BackDropView
		android:id="@+id/backdrop"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:visibility="gone"
		sysui:ignoreRightInset="true"
		>
		<ImageView android:id="@+id/backdrop_back"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:scaleType="centerCrop"/>
		<ImageView android:id="@+id/backdrop_front"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:scaleType="centerCrop"
		android:visibility="invisible"/>
		</com.android.systemui.statusbar.BackDropView>

		<com.android.systemui.statusbar.ScrimView
		android:id="@+id/scrim_behind"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:importantForAccessibility="no"
		sysui:ignoreRightInset="true"
		/>

		<include layout="@layout/brightness_mirror"/>

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

		<include layout="@layout/notification_center_activity"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_marginBottom="@dimen/navigation_bar_height"
		android:visibility="invisible"/>

		<include layout="@layout/status_bar_expanded"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:visibility="invisible"/>

		<com.android.systemui.statusbar.ScrimView
		android:id="@+id/scrim_in_front"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:importantForAccessibility="no"
		sysui:ignoreRightInset="true"
		/>

		</com.android.systemui.statusbar.phone.NotificationShadeWindowView>

packages/CarSystemUI/res/layout/super_status_bar.xml

deleted100644 → 0

+0 −46

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		**
		** Copyright 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.
		*/
		-->

		<!-- This is the status bar window. -->
		<com.android.systemui.statusbar.phone.StatusBarWindowView
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:sysui="http://schemas.android.com/apk/res-auto"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:fitsSystemWindows="true">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		>
		<FrameLayout
		android:id="@+id/status_bar_container"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:visibility="gone"
		/>

		<FrameLayout
		android:id="@+id/car_top_navigation_bar_container"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"/>
		</LinearLayout>

		</com.android.systemui.statusbar.phone.StatusBarWindowView>

packages/CarSystemUI/res/values/dimens.xml

+15 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,21 @@
		<dimen name="car_keyline_2">96dp</dimen>
		<dimen name="car_keyline_3">128dp</dimen>

		<!-- Height of icons in Ongoing App Ops dialog. Both App Op icon and application icon -->
		<dimen name="ongoing_appops_dialog_icon_height">48dp</dimen>
		<!-- Margin between text lines in Ongoing App Ops dialog -->
		<dimen name="ongoing_appops_dialog_text_margin">15dp</dimen>
		<!-- Padding around Ongoing App Ops dialog content -->
		<dimen name="ongoing_appops_dialog_content_padding">24dp</dimen>
		<!-- Margins around the Ongoing App Ops chip. In landscape, the side margins are 0 -->
		<dimen name="ongoing_appops_chip_margin">12dp</dimen>
		<!-- Start and End padding for Ongoing App Ops chip -->
		<dimen name="ongoing_appops_chip_side_padding">6dp</dimen>
		<!-- Padding between background of Ongoing App Ops chip and content -->
		<dimen name="ongoing_appops_chip_bg_padding">4dp</dimen>
		<!-- Radius of Ongoing App Ops chip corners -->
		<dimen name="ongoing_appops_chip_bg_corner_radius">12dp</dimen>

		<!-- Car volume dimens. -->
		<dimen name="car_volume_item_icon_size">@dimen/car_primary_icon_size</dimen>
		<dimen name="car_volume_item_height">@*android:dimen/car_single_line_list_item_height</dimen>