Snap for 8941678 from f92894768ff7c78f1514f652ccbe6f3be9d4baa1 to tm-qpr1-release (005922ff) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+14 −0

Original line number	Diff line number	Diff line
		@@ -4054,6 +4054,20 @@
		android:value="true"/>
		</service>

		<service
		android:name=".development.qstile.DevelopmentTiles$DesktopMode"
		android:label="@string/desktop_mode"
		android:icon="@drawable/tile_icon_desktop_mode"
		android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
		android:exported="true"
		android:enabled="false">
		<intent-filter>
		<action android:name="android.service.quicksettings.action.QS_TILE" />
		</intent-filter>
		<meta-data android:name="android.service.quicksettings.TOGGLEABLE_TILE"
		android:value="true"/>
		</service>

		<activity
		android:name=".HelpTrampoline"
		android:exported="true"

res/drawable/tile_icon_desktop_mode.xml

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		<!--
		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.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:tint="?android:attr/colorControlNormal"
		android:viewportHeight="24.0"
		android:viewportWidth="24.0">
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M18,15V20Q18,20.825 17.413,21.413Q16.825,22 16,22H4Q3.175,22 2.588,21.413Q2,20.825 2,20V11Q2,10.175 2.588,9.587Q3.175,9 4,9H6V4Q6,3.175 6.588,2.587Q7.175,2 8,2H20Q20.825,2 21.413,2.587Q22,3.175 22,4V13Q22,13.825 21.413,14.412Q20.825,15 20,15ZM4,13V20Q4,20 4,20Q4,20 4,20H16Q16,20 16,20Q16,20 16,20V13ZM18,13H20Q20,13 20,13Q20,13 20,13V6H8V9H16Q16.825,9 17.413,9.587Q18,10.175 18,11Z" />
		</vector>

res/values/config.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -624,4 +624,10 @@

		<!-- Whether to enable the advanced vpn feature. The default is not to. -->
		<bool name="config_advanced_vpn_enabled">false</bool>

		<!-- An array of uid name for which packages exempt from Wi-Fi permission check. -->
		<string-array name="config_exempt_wifi_permission_uid_name" translatable="false">
		<item>@string/config_settingsintelligence_package_name</item>
		<item>android.uid.system:1000</item>
		</string-array>
		</resources>

src/com/android/settings/applications/manageapplications/ManageApplications.java

+14 −1

Original line number	Diff line number	Diff line
		@@ -126,6 +126,8 @@ import com.android.settings.notification.app.AppNotificationSettings;
		import com.android.settings.widget.LoadingViewController;
		import com.android.settings.wifi.AppStateChangeWifiStateBridge;
		import com.android.settings.wifi.ChangeWifiStateDetails;
		import com.android.settingslib.RestrictedLockUtils;
		import com.android.settingslib.RestrictedLockUtilsInternal;
		import com.android.settingslib.applications.AppIconCacheManager;
		import com.android.settingslib.applications.AppUtils;
		import com.android.settingslib.applications.ApplicationsState;
		@@ -776,7 +778,18 @@ public class ManageApplications extends InstrumentedFragment
		mShowSystem = !mShowSystem;
		mApplications.rebuild();
		} else if (i == R.id.reset_app_preferences) {
		final boolean appsControlDisallowedBySystem =
		RestrictedLockUtilsInternal.hasBaseUserRestriction(getActivity(),
		UserManager.DISALLOW_APPS_CONTROL, UserHandle.myUserId());
		final RestrictedLockUtils.EnforcedAdmin appsControlDisallowedAdmin =
		RestrictedLockUtilsInternal.checkIfRestrictionEnforced(getActivity(),
		UserManager.DISALLOW_APPS_CONTROL, UserHandle.myUserId());
		if (appsControlDisallowedAdmin != null && !appsControlDisallowedBySystem) {
		RestrictedLockUtils.sendShowAdminSupportDetailsIntent(
		getActivity(), appsControlDisallowedAdmin);
		} else {
		mResetAppsHelper.buildResetDialog();
		}
		return true;
		} else if (i == R.id.advanced) {
		if (mListType == LIST_TYPE_NOTIFICATION) {

src/com/android/settings/bluetooth/BluetoothBroadcastDialog.java

+22 −7

Original line number	Diff line number	Diff line
		@@ -41,15 +41,18 @@ import com.android.settingslib.media.MediaOutputConstants;
		* nearby broadcast sources.
		*/
		public class BluetoothBroadcastDialog extends InstrumentedDialogFragment {

		public static final String KEY_APP_LABEL = "app_label";
		public static final String KEY_DEVICE_ADDRESS =
		BluetoothFindBroadcastsFragment.KEY_DEVICE_ADDRESS;
		public static final String KEY_MEDIA_STREAMING = "media_streaming";

		private static final String TAG = "BTBroadcastsDialog";
		private static final CharSequence UNKNOWN_APP_LABEL = "unknown";
		private Context mContext;
		private CharSequence mCurrentAppLabel = UNKNOWN_APP_LABEL;
		private String mDeviceAddress;
		private boolean mIsMediaStreaming;
		private LocalBluetoothManager mLocalBluetoothManager;
		private AlertDialog mAlertDialog;

		@@ -59,6 +62,7 @@ public class BluetoothBroadcastDialog extends InstrumentedDialogFragment {
		mContext = getActivity();
		mCurrentAppLabel = getActivity().getIntent().getCharSequenceExtra(KEY_APP_LABEL);
		mDeviceAddress = getActivity().getIntent().getStringExtra(KEY_DEVICE_ADDRESS);
		mIsMediaStreaming = getActivity().getIntent().getBooleanExtra(KEY_MEDIA_STREAMING, false);
		mLocalBluetoothManager = Utils.getLocalBtManager(mContext);
		setShowsDialog(true);
		}
		@@ -75,6 +79,8 @@ public class BluetoothBroadcastDialog extends InstrumentedDialogFragment {
		mContext.getString(R.string.bluetooth_broadcast_dialog_broadcast_message));

		Button broadcastBtn = layout.findViewById(com.android.settingslib.R.id.positive_btn);
		if (isBroadcastSupported() && mIsMediaStreaming) {
		broadcastBtn.setVisibility(View.VISIBLE);
		if (TextUtils.isEmpty(mCurrentAppLabel)) {
		broadcastBtn.setText(mContext.getString(R.string.bluetooth_broadcast_dialog_title));
		} else {
		@@ -85,6 +91,9 @@ public class BluetoothBroadcastDialog extends InstrumentedDialogFragment {
		broadcastBtn.setOnClickListener((view) -> {
		launchMediaOutputBroadcastDialog();
		});
		} else {
		broadcastBtn.setVisibility(View.GONE);
		}

		Button findBroadcastBtn = layout.findViewById(com.android.settingslib.R.id.negative_btn);
		findBroadcastBtn.setText(mContext.getString(R.string.bluetooth_find_broadcast));
		@@ -169,4 +178,10 @@ public class BluetoothBroadcastDialog extends InstrumentedDialogFragment {
		.setPackage(MediaOutputConstants.SETTINGS_PACKAGE_NAME)
		.setAction(MediaOutputConstants.ACTION_CLOSE_PANEL));
		}

		boolean isBroadcastSupported() {
		LocalBluetoothLeBroadcast broadcast =
		mLocalBluetoothManager.getProfileManager().getLeAudioBroadcastProfile();
		return broadcast != null;
		}
		}