Snap for 5591454 from 800f7848a3805201f02b449935d2e1a431619e13 to qt-qpr1-release (c0f40ce9) · Commits · e / os / android_packages_apps_PackageInstaller

Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,9 +44,9 @@ android_app {

		static_libs: [
		"iconloader",
		"androidx.car_car",
		"com.google.android.material_material",
		"androidx.transition_transition",
		"androidx-constraintlayout_constraintlayout",
		"androidx.core_core",
		"androidx.media_media",
		"androidx.legacy_legacy-support-core-utils",

AndroidManifest.xml

+10 −5

Original line number	Diff line number	Diff line
		@@ -196,11 +196,6 @@
		<action android:name="android.settings.MANAGE_DEFAULT_APPS_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<!-- TODO: STOPSHIP: Redirect into its own default app page? -->
		<intent-filter android:priority="2">
		<action android:name="android.settings.HOME_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		</activity>

		<activity android:name="com.android.packageinstaller.role.ui.DefaultAppActivity"
		@@ -212,6 +207,16 @@
		</intent-filter>
		</activity>

		<activity android:name="com.android.packageinstaller.role.ui.HomeSettingsActivity"
		android:excludeFromRecents="true"
		android:noHistory="true"
		android:theme="@android:style/Theme.NoDisplay">
		<intent-filter android:priority="2">
		<action android:name="android.settings.HOME_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		</activity>

		<activity android:name="com.android.packageinstaller.role.ui.SpecialAppAccessListActivity"
		android:label="@string/special_app_access"
		android:permission="android.permission.MANAGE_ROLE_HOLDERS"

res/layout/car_app_permissions.xml

deleted100644 → 0

+0 −70

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.
		-->

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">
		<RelativeLayout
		android:layout_width="match_parent"
		android:layout_height="@*android:dimen/car_app_bar_height"
		android:gravity="end\|center_vertical" >
		<FrameLayout
		android:id="@+id/action_bar_icon_container"
		android:layout_width="@*android:dimen/car_margin"
		android:layout_height="@*android:dimen/car_app_bar_height"
		android:foreground="@drawable/button_ripple_bg"
		android:layout_alignParentStart="true">
		<ImageView
		android:layout_width="@*android:dimen/car_primary_icon_size"
		android:layout_height="@*android:dimen/car_primary_icon_size"
		android:tint="@*android:color/car_tint"
		android:scaleType="fitCenter"
		android:layout_gravity="center"
		android:src="@drawable/ic_arrow_back"/>
		</FrameLayout>
		<TextView
		android:id="@+id/title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginStart="@*android:dimen/car_margin"
		android:textAppearance="@*android:style/CarBody1"
		android:fontFamily="medium"
		android:text="@string/app_permissions"
		android:layout_gravity="center_vertical"
		android:layout_centerVertical="true"
		android:layout_alignParentStart="true"
		android:maxLines="1"
		android:ellipsize="end"/>
		</RelativeLayout>

		<View
		android:layout_width="match_parent"
		android:layout_height="@*android:dimen/car_list_divider_height"
		android:background="@*android:color/car_list_divider"/>

		<androidx.car.widget.PagedListView
		android:id="@+id/list"
		android:theme="@style/PagedListTheme"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		app:showPagedListViewDivider="true"
		app:alignDividerStartTo="@id/container"
		app:gutter="both"/>

		</LinearLayout>

res/values/overlayable.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -218,7 +218,6 @@
		<!-- START THEMES -->
		<item type="style" name="Settings" />
		<item type="style" name="TextAppearance.CategoryTitle" />
		<item type="style" name="PagedListTheme" />
		<item type="style" name="ReviewPermissions" />
		<item type="style" name="GrantPermissions" />
		<item type="style" name="Header.Settings" />

res/values/themes.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -30,10 +30,6 @@
		<!-- 0.8 Spacing, 0.8/11 = 0.072727273 -->
		<item name="android:letterSpacing">0.072727273</item>
		</style>
		<style name="PagedListTheme" parent="Theme.Car.NoActionBar">
		<item name="listItemPrimaryIconTint">?android:attr/textColorPrimary</item>
		<item name="android:colorAccent">@*android:color/accent_device_default_light</item>
		</style>

		<style name="ReviewPermissions"
		parent="@android:style/Theme.DeviceDefault.Settings">