Merge "Update string for bundles and summaries" into main (622e3ba3) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+9 −11

Original line number	Diff line number	Diff line
		@@ -9128,15 +9128,14 @@ Data usage charges may apply.</string>
		<string name="notification_badging_title">Notification dot on app icon</string>

		<!-- App Info > Notifications: Title for section where notifications bundles can be configured [CHAR LIMIT=80]-->
		<string name="notification_bundles">Notification bundles</string>
		<string name="notification_bundles">Notification organizer</string>

		<!-- App Info > Notifications: Title for section where notifications summaries can be configured [CHAR LIMIT=80]-->
		<string name="notification_summarization_title">Notification summaries</string>
		<string name="notification_summarization_on">On</string>
		<string name="notification_summarization_off">Off</string>
		<string name="notification_summarization_summary">Get quick recaps of longer messages</string>
		<string name="notification_summarization_main_control_title">Use notification summaries</string>
		<string name="notification_summarization_description">Automatically summarize conversation notifications from apps</string>
		<string name="notification_summarization_excluded_description">Conversation notifications from these apps will not be summarized</string>
		<string name="notification_summarization_description">Summarize long messages and group conversations to get quick recaps. Summaries are AI-powered and may contain errors.</string>
		<string name="notification_summarization_excluded_description">Notifications from these apps will not be summarized</string>
		<string name="notification_summarization_manage_excluded_apps">Manage apps</string>
		<string name="notification_summarization_manage_excluded_apps_title">Allow notification summaries for apps</string>
		<string name="notification_excluded_apps">App exceptions</string>
		@@ -9559,15 +9558,14 @@ Data usage charges may apply.</string>
		<string name="notification_polite_work_summary">Apply to work profile apps</string>

		<!-- Title for Bundled Notifications setting [CHAR LIMIT=45]-->
		<string name="notification_bundle_title">Bundled notifications</string>
		<string name="notification_bundle_on">On</string>
		<string name="notification_bundle_off">Off</string>
		<string name="notification_bundle_main_control_title">Use notification bundling</string>
		<string name="notification_bundle_description">Notifications with similar themes will be silenced and grouped together for a quieter experience. Bundling will override an app\'s own notification settings.</string>
		<string name="notification_bundle_title">Notification organizer</string>
		<string name="notification_bundle_summary">Bundle and silence lower priority notifications</string>
		<string name="notification_bundle_main_control_title">Use Notification organizer</string>
		<string name="notification_bundle_description">Choose notification types you want to silence and bundle together to minimize interruptions. Bundling is AI-powered and may contain errors.</string>

		<string name="notification_app_level_bundle_title">Bundle notifications</string>
		<string name="notification_app_level_bundle_subtext">Notifications with similar themes will be silenced and grouped together for a quieter experience</string>
		<string name="notification_bundle_excluded_description">Notifications from these apps will not be bundled</string>
		<string name="notification_bundle_excluded_description">Notifications from these apps won\’t be bundled</string>
		<string name="notification_bundle_manage_excluded_apps_title">Allow notification bundling for apps</string>

		<!-- Title for managing VR (virtual reality) helper services. [CHAR LIMIT=50] -->

src/com/android/settings/notification/BundlePreferenceController.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -42,8 +42,6 @@ public class BundlePreferenceController extends BasePreferenceController {

		@Override
		public CharSequence getSummary() {
		return mBackend.isNotificationBundlingEnabled(mContext)
		? mContext.getString(R.string.notification_bundle_on)
		: mContext.getString(R.string.notification_bundle_off);
		return mContext.getString(R.string.notification_bundle_summary);
		}
		}

src/com/android/settings/notification/SummarizationPreferenceController.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -43,8 +43,6 @@ public class SummarizationPreferenceController extends BasePreferenceController

		@Override
		public CharSequence getSummary() {
		return mBackend.isNotificationSummarizationEnabled(mContext)
		? mContext.getString(R.string.notification_summarization_on)
		: mContext.getString(R.string.notification_summarization_off);
		return mContext.getString(R.string.notification_summarization_summary);
		}
		}

tests/robotests/src/com/android/settings/notification/BundlePreferenceControllerTest.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -79,13 +79,4 @@ public class BundlePreferenceControllerTest {
		mSetFlagsRule.disableFlags(Flags.FLAG_NOTIFICATION_CLASSIFICATION_UI);
		assertThat(mController.isAvailable()).isFalse();
		}

		@Test
		public void getSummary() throws Exception {
		when(mInm.getAllowedAssistantAdjustments(any())).thenReturn(List.of(KEY_TYPE));
		assertThat(mController.getSummary()).isEqualTo("On");

		when(mInm.getAllowedAssistantAdjustments(any())).thenReturn(List.of(KEY_IMPORTANCE));
		assertThat(mController.getSummary()).isEqualTo("Off");
		}
		}

tests/robotests/src/com/android/settings/notification/SummarizationPreferenceControllerTest.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -78,13 +78,4 @@ public class SummarizationPreferenceControllerTest {
		mSetFlagsRule.disableFlags(Flags.FLAG_NM_SUMMARIZATION_UI);
		assertThat(mController.isAvailable()).isFalse();
		}

		@Test
		public void getSummary() throws Exception {
		when(mInm.getAllowedAssistantAdjustments(any())).thenReturn(List.of(KEY_SUMMARIZATION));
		assertThat(mController.getSummary()).isEqualTo("On");

		when(mInm.getAllowedAssistantAdjustments(any())).thenReturn(List.of(KEY_IMPORTANCE));
		assertThat(mController.getSummary()).isEqualTo("Off");
		}
		}