Merge "Update notification subtext" into rvc-dev am: 141153e789 (385e9be3) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -8806,6 +8806,9 @@
		<!-- [CHAR LIMIT=NONE] App notification settings: link to app notification settings-->
		<string name="app_settings_link">Additional settings in the app</string>

		<!-- [CHAR LIMIT=NONE] Apps & notification settings: summary on the link to notification settings-->
		<string name="notification_screen_summary">Notification history, bubbles, recently sent</string>

		<!-- [CHAR LIMIT=45] App notification listing summary, blocked apps -->
		<string name="app_notification_listing_summary_zero">On for all apps</string>
		<!-- [CHAR LIMIT=45] App notification listing summary, blocked apps -->

res/xml/app_and_notification.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -57,9 +57,9 @@
		<Preference
		android:key="configure_notification_settings"
		android:title="@string/configure_notification_settings"
		android:summary="@string/notification_screen_summary"
		android:order="-440"
		android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
		settings:controller="com.android.settings.notification.ConfigureNotificationPreferenceController"/>
		android:fragment="com.android.settings.notification.ConfigureNotificationSettings"/>

		<!-- Notifications (appears before manage_perms), default apps (appears after) -->
		<PreferenceCategory

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

deleted100644 → 0

+0 −48

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 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
		*/

		package com.android.settings.notification;

		import android.content.Context;

		import com.android.settings.R;
		import com.android.settings.core.BasePreferenceController;

		public class ConfigureNotificationPreferenceController extends BasePreferenceController {

		private NotificationBackend mBackend;

		public ConfigureNotificationPreferenceController(Context context, String key) {
		super(context, key);
		mBackend = new NotificationBackend();
		}

		@Override
		public int getAvailabilityStatus() {
		return AVAILABLE;
		}

		@Override
		public CharSequence getSummary() {
		final int blockedAppCount = mBackend.getBlockedAppCount();
		if (blockedAppCount == 0) {
		return mContext.getText(R.string.app_notification_listing_summary_zero);
		}
		return mContext.getResources().getQuantityString(
		R.plurals.app_notification_listing_summary_others,
		blockedAppCount, blockedAppCount);
		}
		}
		No newline at end of file

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

deleted100644 → 0

+0 −59

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 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.
		*/

		package com.android.settings.notification;

		import static com.google.common.truth.Truth.assertThat;

		import android.content.Context;

		import com.android.settings.testutils.shadow.ShadowNotificationBackend;

		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.robolectric.RobolectricTestRunner;
		import org.robolectric.RuntimeEnvironment;
		import org.robolectric.annotation.Config;

		@RunWith(RobolectricTestRunner.class)
		@Config(shadows = ShadowNotificationBackend.class)
		public class ConfigureNotificationPreferenceControllerTest {

		private ConfigureNotificationPreferenceController mController;
		private Context mContext;

		@Before
		public void setUp() {
		mContext = RuntimeEnvironment.application;
		mController = new ConfigureNotificationPreferenceController(mContext, "key");
		}

		@Test
		public void getSummary_noBlockedApps() {
		ShadowNotificationBackend.setBlockedAppCount(0);

		assertThat(mController.getSummary().toString()).contains("On");
		}

		@Test
		public void getSummary_someBlockedApps() {
		ShadowNotificationBackend.setBlockedAppCount(5);

		assertThat(mController.getSummary().toString()).contains("Off");
		assertThat(mController.getSummary().toString()).contains("5");
		}
		}