Merge "Add controls in dev options to quarantine apps." into main (08710ee5) · Commits · e / os / android_packages_apps_Settings

Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -112,6 +112,7 @@ android_library {
		"androidx.room_room-runtime",
		"SystemUIUnfoldLib",
		"aconfig_settings_flags_lib",
		"android.content.pm.flags-aconfig-java",
		],

		plugins: [

+3 −0

Original line number	Diff line number	Diff line
		@@ -12470,4 +12470,7 @@
		<string name="grammatical_gender_title">Grammatical gender</string>
		<!-- Developer settings: select Grammatical gender dialog title [CHAR LIMIT=50]-->
		<string name="grammatical_gender_dialog_title">Select Grammatical gender</string>

		<!-- Developer settings: Title for the screen allowing user to control Quarantined apps [CHAR LIMIT=50] -->
		<string name="quarantined_apps_title">Quarantined Apps</string>
		</resources>

+6 −0

Original line number	Diff line number	Diff line
		@@ -736,6 +736,12 @@
		android:title="@string/enable_notes_role_title"
		android:summary="@string/enable_notes_role_summary" />

		<Preference
		android:key="quarantined_apps"
		android:title="@string/quarantined_apps_title"
		settings:controller="com.android.settings.development.quarantine.QuarantinedAppsPreferenceController"
		android:fragment="com.android.settings.development.quarantine.QuarantinedAppsFragment" />

		</PreferenceCategory>

		<PreferenceCategory

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2023 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="quarantined_apps_screen"
		android:title="@string/quarantined_apps_title"
		settings:controller="com.android.settings.development.quarantine.QuarantinedAppsScreenController"
		settings:searchable="true">
		</PreferenceScreen>
		No newline at end of file

0 → 100644

+4 −0