Snap for 4832339 from 29eec443e06abe949b522f114d2c0879baedac22 to pi-release (da294f14) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -7421,7 +7421,7 @@
		<!-- Do not disturb settings, messages, events and reminders title [CHAR LIMIT=100]-->
		<string name="zen_msg_event_reminder_title">Messages, events & reminders</string>
		<!-- Do not disturb settings, messages, events and reminders footer [CHAR LIMIT=NONE]-->
		<string name="zen_msg_event_reminder_footer">When Do Not Disturb is on, messages, reminders, and events will muted, except for the items you allow above. You can adjust messages settings to allow your friends, family, or other contacts to reach you.</string>
		<string name="zen_msg_event_reminder_footer">When Do Not Disturb is on, messages, reminders, and events will be muted, except for the items you allow above. You can adjust messages settings to allow your friends, family, or other contacts to reach you.</string>

		<!-- Do not disturb onboarding dialog, accept new settings [CHAR LIMIT=30]-->
		<string name="zen_onboarding_ok">Done</string>

+8 −0

Original line number	Diff line number	Diff line
		@@ -170,12 +170,20 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont

		@Override
		public void onStart() {
		if (mLocalBluetoothManager == null) {
		Log.e(TAG, "Bluetooth is not supported on this device");
		return;
		}
		mLocalBluetoothManager.setForegroundActivity(mContext);
		register();
		}

		@Override
		public void onStop() {
		if (mLocalBluetoothManager == null) {
		Log.e(TAG, "Bluetooth is not supported on this device");
		return;
		}
		mLocalBluetoothManager.setForegroundActivity(null);
		unregister();
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -186,6 +186,8 @@ public class AudioOutputSwitchPreferenceControllerTest {

		AudioSwitchPreferenceController controller = new AudioSwitchPreferenceControllerTestable(
		mContext, TEST_KEY);
		controller.onStart();
		controller.onStop();

		assertThat(mLocalBluetoothManager).isNull();
		}