Merge master@5406228 into git_qt-dev-plus-aosp. (761145e6) · Commits · e / os / android_packages_apps_PackageInstaller

AndroidManifest.xml

+13 −1

Original line number	Diff line number	Diff line
		@@ -29,12 +29,14 @@
		<uses-permission android:name="android.permission.MANAGE_ROLE_HOLDERS" />
		<uses-permission android:name="android.permission.OBSERVE_ROLE_HOLDERS" />
		<uses-permission android:name="android.permission.SET_PREFERRED_APPLICATIONS" />
		<uses-permission android:name="android.permission.ACCESS_SHARED_LIBRARIES" />
		<uses-permission android:name="com.android.permissioncontroller.permission.MANAGE_ROLES_FROM_CONTROLLER" />
		<uses-permission android:name="android.permission.ACCESS_INSTANT_APPS" />
		<uses-permission android:name="android.permission.REQUEST_INCIDENT_REPORT_APPROVAL" />
		<uses-permission android:name="android.permission.APPROVE_INCIDENT_REPORTS" />
		<uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
		<uses-permission android:name="android.permission.OPEN_ACCESSIBILITY_DETAILS_SETTINGS" />
		<uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />

		<uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" />

		@@ -95,7 +97,6 @@
		<intent-filter android:priority="1">
		<action android:name="android.intent.action.MANAGE_APP_PERMISSIONS" />
		<action android:name="android.intent.action.MANAGE_PERMISSION_APPS" />
		<action android:name="android.intent.action.REVIEW_APP_PERMISSION_USAGE" />
		<action android:name="android.intent.action.MANAGE_PERMISSIONS" />
		<action android:name="android.intent.action.REVIEW_PERMISSION_USAGE" />
		<category android:name="android.intent.category.DEFAULT" />
		@@ -141,6 +142,17 @@
		android:excludeFromRecents="true"
		android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar" />

		<activity android:name="com.android.packageinstaller.permission.ui.ReviewOngoingUsageActivity"
		android:excludeFromRecents="true"
		android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar"
		android:launchMode="singleInstance"
		android:permission="android.permission.GRANT_RUNTIME_PERMISSIONS" >
		<intent-filter android:priority="1">
		<action android:name="android.intent.action.REVIEW_ONGOING_PERMISSION_USAGE" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		</activity>

		<activity android:name="com.android.packageinstaller.permission.ui.ReviewAccessibilityServicesActivity"
		android:excludeFromRecents="true"
		android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar"

res/layout/ongoing_usage_dialog_content.xml

0 → 100644

+45 −0

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

		<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/container"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		style="@style/PermissionUsageDialogContainerScrollView">

		<LinearLayout
		android:id="@+id/dialog_container"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		style="@style/PermissionUsageDialogContainerLayout">

		<TextView
		android:id="@+id/title"
		style="@style/PermissionUsageDialogTitle"/>

		<LinearLayout
		style="@style/PermissionUsageDialogItemsContainerLayout">

		<LinearLayout
		android:id="@+id/items_container"
		style="@style/PermissionUsageDialogItemsContainer"/>

		</LinearLayout>

		</LinearLayout>

		</ScrollView>

res/layout/ongoing_usage_dialog_item.xml

0 → 100644

+38 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2019 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"
		style="@style/PermissionUsageDialogItemContainer">

		<FrameLayout
		style="@style/PermissionUsageDialogItemIconFrame">

		<ImageView
		android:id="@+id/app_icon"
		style="@style/PermissionUsageDialogItemIcon"/>

		</FrameLayout>

		<TextView
		android:id="@+id/app_name"
		style="@style/PermissionUsageDialogItemAppName"/>

		<LinearLayout
		android:id="@+id/icons"
		style="@style/PermissionUsageDialogItemIconsContainer"/>

		</LinearLayout>

res/values-ar/strings.xml

+128 −66

File changed.

Preview size limit exceeded, changes collapsed.

res/values-ca/strings.xml

+128 −50

File changed.

Preview size limit exceeded, changes collapsed.