Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: c57e5c0e2c am: 632da3759f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22223104

Change-Id: Id7262f3031d2e0e833ef154510d033dcb62eb699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Philip Junker
2023-04-18 16:15:02 +00:00
committed by Automerger Merge Worker
15 changed files with 331 additions and 540 deletions

View File

@@ -195,7 +195,11 @@
android:key="turn_screen_on"
android:title="@string/turn_screen_on_title"
android:order="-200"
android:fragment="com.android.settings.applications.specialaccess.turnscreenon.TurnScreenOnSettings" />
android:fragment="com.android.settings.applications.manageapplications.ManageApplications">
<extra
android:name="classname"
android:value="com.android.settings.Settings$TurnScreenOnSettingsActivity" />
</Preference>
<Preference
android:key="special_access_more"

View File

@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2022 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.
-->
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="turn_screen_on_screen"
android:title="@string/turn_screen_on_title"
settings:searchable="false" />