Merge "Move from an alert dialog to a full screen dialog for SIM app install" (97685b49) · Commits · e / os / android_frameworks_base

api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -4164,6 +4164,8 @@ package android.provider {
		method public static void resetToDefaults(android.content.ContentResolver, java.lang.String);
		field public static final java.lang.String AUTOFILL_COMPAT_ALLOWED_PACKAGES = "autofill_compat_allowed_packages";
		field public static final java.lang.String DEFAULT_SM_DP_PLUS = "default_sm_dp_plus";
		field public static final java.lang.String INSTALL_CARRIER_APP_NOTIFICATION_PERSISTENT = "install_carrier_app_notification_persistent";
		field public static final java.lang.String INSTALL_CARRIER_APP_NOTIFICATION_SLEEP_MILLIS = "install_carrier_app_notification_sleep_millis";
		field public static final java.lang.String OTA_DISABLE_AUTOMATIC_UPDATE = "ota_disable_automatic_update";
		field public static final java.lang.String THEATER_MODE_ON = "theater_mode_on";
		field public static final java.lang.String WEBVIEW_MULTIPROCESS = "webview_multiprocess";

+22 −0

Original line number	Diff line number	Diff line
		@@ -12080,6 +12080,28 @@ public final class Settings {
		public static final String ENABLE_GNSS_RAW_MEAS_FULL_TRACKING =
		"enable_gnss_raw_meas_full_tracking";

		/**
		* Whether the notification should be ongoing (persistent) when a carrier app install is
		* required.
		*
		* The value is a boolean (1 or 0).
		* @hide
		*/
		@SystemApi
		public static final String INSTALL_CARRIER_APP_NOTIFICATION_PERSISTENT =
		"install_carrier_app_notification_persistent";

		/**
		* The amount of time (ms) to hide the install carrier app notification after the user has
		* ignored it. After this time passes, the notification will be shown again
		*
		* The value is a long
		* @hide
		*/
		@SystemApi
		public static final String INSTALL_CARRIER_APP_NOTIFICATION_SLEEP_MILLIS =
		"install_carrier_app_notification_sleep_millis";

		/**
		* Whether we've enabled zram on this device. Takes effect on
		* reboot. The value "1" enables zram; "0" disables it, and

+2 −0

Original line number	Diff line number	Diff line
		@@ -422,6 +422,8 @@ message GlobalSettingsProto {
		optional SettingProto enable_deletion_helper_no_threshold_toggle = 340 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto notification_snooze_options = 341 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto enable_gnss_raw_meas_full_tracking = 346 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto install_carrier_app_notification_persistent = 356 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto install_carrier_app_notification_sleep_millis = 357 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto zram_enabled = 347 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto smart_replies_in_notifications_flags = 348 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto show_first_crash_dialog = 349 [ (android.privacy).dest = DEST_AUTOMATIC ];

0 → 100644

+40 −0

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.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="20dp"
		android:height="21dp"
		android:viewportWidth="20"
		android:viewportHeight="21">

		<group
		android:translateX="-31.000000"
		android:translateY="-77.000000">
		<group
		android:translateX="24.000000"
		android:translateY="72.000000">
		<path
		android:fillType="evenOdd"
		android:strokeWidth="1"
		android:pathData="M 0 0 H 32 V 32 H 0 V 0 Z" />
		<path
		android:fillColor="#4285F4"
		android:strokeWidth="1"
		android:pathData="M23,5 L27,5 L27,26 L23,26 L23,5 Z M7,18.125 L11,18.125 L11,26 L7,26 L7,18.125 Z
		M15,11.5625 L19,11.5625 L19,26 L15,26 L15,11.5625 Z" />
		</group>
		</group>
		</vector>
		No newline at end of file

+4 −0

Original line number	Diff line number	Diff line
		@@ -2328,6 +2328,10 @@
		<string name="config_customVpnAlwaysOnDisconnectedDialogComponent" translatable="false"
		>com.android.vpndialogs/com.android.vpndialogs.AlwaysOnDisconnectedDialog</string>

		<!-- Name of the dialog that is used to install the carrier app when the SIM is inserted -->
		<string name="config_carrierAppInstallDialogComponent" translatable="false"
		>com.android.simappdialog/com.android.simappdialog.InstallCarrierAppActivity</string>

		<!-- Apps that are authorized to access shared accounts, overridden by product overlays -->
		<string name="config_appsAuthorizedForSharedAccounts" translatable="false">;com.android.settings;</string>