Snap for 11976889 from 9bd19f46047f535fdc55c3141008d00b6cc73340 to 24Q3-release (da92e506) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+10 −0

Original line number	Diff line number	Diff line
		@@ -9214,6 +9214,16 @@
		<string name="zen_mode_apps_none_apps">None</string>
		<!-- [CHAR LIMIT=60] Zen mode settings: all apps will be able to bypass dnd -->
		<string name="zen_mode_apps_all_apps">All</string>
		<!-- [CHAR LIMIT=NONE] Zen mode settings: Lists apps that can bypass DND. For example, "Nest, Messages, and 2 more can interrupt". -->
		<string name="zen_mode_apps_subtext">
		{count, plural, offset:2
		=0 {No apps can interrupt}
		=1 {{app_1} can interrupt}
		=2 {{app_1} and {app_2} can interrupt}
		=3 {{app_1}, {app_2}, and {app_3} can interrupt}
		other {{app_1}, {app_2}, and # more can interrupt}
		}
		</string>

		<!-- [CHAR LIMIT=100] Zen mode settings: Allow apps to bypass DND -->
		<string name="zen_mode_bypassing_apps">Allow apps to override</string>

src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioPreferenceController.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ public class AudioSharingCallAudioPreferenceController extends AudioSharingBaseP
		private static final String PREF_KEY = "calls_and_alarms";

		@VisibleForTesting
		protected enum ChangeCallAudioType {
		enum ChangeCallAudioType {
		UNKNOWN,
		CONNECTED_EARLIER,
		CONNECTED_LATER
		@@ -90,7 +90,9 @@ public class AudioSharingCallAudioPreferenceController extends AudioSharingBaseP
		Map<Integer, List<CachedBluetoothDevice>> mGroupedConnectedDevices = new HashMap<>();
		private List<AudioSharingDeviceItem> mDeviceItemsInSharingSession = new ArrayList<>();
		private final AtomicBoolean mCallbacksRegistered = new AtomicBoolean(false);
		private final BluetoothLeBroadcastAssistant.Callback mBroadcastAssistantCallback =

		@VisibleForTesting
		final BluetoothLeBroadcastAssistant.Callback mBroadcastAssistantCallback =
		new BluetoothLeBroadcastAssistant.Callback() {
		@Override
		public void onSearchStarted(int reason) {}
		@@ -276,7 +278,7 @@ public class AudioSharingCallAudioPreferenceController extends AudioSharingBaseP

		/** Test only: set callback registration status in tests. */
		@VisibleForTesting
		public void setCallbacksRegistered(boolean registered) {
		void setCallbacksRegistered(boolean registered) {
		mCallbacksRegistered.set(registered);
		}

		@@ -385,7 +387,7 @@ public class AudioSharingCallAudioPreferenceController extends AudioSharingBaseP
		}

		@VisibleForTesting
		protected void logCallAudioDeviceChange(int currentGroupId, CachedBluetoothDevice target) {
		void logCallAudioDeviceChange(int currentGroupId, CachedBluetoothDevice target) {
		var unused =
		ThreadUtils.postOnBackgroundThread(
		() -> {

src/com/android/settings/connecteddevice/audiosharing/AudioSharingCompatibilityPreferenceController.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ public class AudioSharingCompatibilityPreferenceController extends TogglePrefere
		private final AtomicBoolean mCallbacksRegistered = new AtomicBoolean(false);

		@VisibleForTesting
		protected final BluetoothLeBroadcast.Callback mBroadcastCallback =
		final BluetoothLeBroadcast.Callback mBroadcastCallback =
		new BluetoothLeBroadcast.Callback() {
		@Override
		public void onBroadcastStarted(int reason, int broadcastId) {
		@@ -219,7 +219,7 @@ public class AudioSharingCompatibilityPreferenceController extends TogglePrefere

		/** Test only: set callbacks registration state for test setup. */
		@VisibleForTesting
		public void setCallbacksRegistered(boolean registered) {
		void setCallbacksRegistered(boolean registered) {
		mCallbacksRegistered.set(registered);
		}

src/com/android/settings/connecteddevice/audiosharing/AudioSharingDashboardFragment.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,7 @@ public class AudioSharingDashboardFragment extends DashboardFragment

		/** Test only: set mock controllers for the {@link AudioSharingDashboardFragment} */
		@VisibleForTesting
		protected void setControllers(
		void setControllers(
		AudioSharingDeviceVolumeGroupController volumeGroupController,
		AudioSharingCallAudioPreferenceController callAudioController,
		AudioSharingPlaySoundPreferenceController playSoundController,

src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceController.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -87,7 +87,8 @@ public class AudioSharingDevicePreferenceController extends BasePreferenceContro
		@Nullable private AudioSharingDialogHandler mDialogHandler;
		private AtomicBoolean mIntentHandled = new AtomicBoolean(false);

		private BluetoothLeBroadcastAssistant.Callback mBroadcastAssistantCallback =
		@VisibleForTesting
		BluetoothLeBroadcastAssistant.Callback mBroadcastAssistantCallback =
		new BluetoothLeBroadcastAssistant.Callback() {
		@Override
		public void onSearchStarted(int reason) {}
		@@ -368,23 +369,23 @@ public class AudioSharingDevicePreferenceController extends BasePreferenceContro
		}

		@VisibleForTesting
		public void setBluetoothDeviceUpdater(@Nullable BluetoothDeviceUpdater bluetoothDeviceUpdater) {
		void setBluetoothDeviceUpdater(@Nullable BluetoothDeviceUpdater bluetoothDeviceUpdater) {
		mBluetoothDeviceUpdater = bluetoothDeviceUpdater;
		}

		@VisibleForTesting
		public void setDialogHandler(@Nullable AudioSharingDialogHandler dialogHandler) {
		void setDialogHandler(@Nullable AudioSharingDialogHandler dialogHandler) {
		mDialogHandler = dialogHandler;
		}

		@VisibleForTesting
		public void setHostFragment(@Nullable DashboardFragment fragment) {
		void setHostFragment(@Nullable DashboardFragment fragment) {
		mFragment = fragment;
		}

		/** Test only: set intent handle state for test. */
		@VisibleForTesting
		public void setIntentHandled(boolean handled) {
		void setIntentHandled(boolean handled) {
		mIntentHandled.set(handled);
		}