From 929bc614de166b5922815fffa9f0ee7ee02ed131 Mon Sep 17 00:00:00 2001 From: Doris Ling Date: Mon, 22 May 2017 15:58:03 -0700 Subject: [PATCH] Add summary text to Apps & notifications -> Notifications Share the summary provider for Apps & notifications -> Notifications -> Notifications with Apps & notifications -> Notifications so that the upper level also shows the corresponding notification summary. Change-Id: Id6879d9a6b00237781320c18591703b3031c9627 Fix: 36376411 Test: make RunSettingsRoboTests --- .../applications/NotificationApps.java | 10 +- .../ConfigureNotificationSettings.java | 13 ++ .../applications/NotificationAppsTest.java | 114 ++++++++++++++++++ 3 files changed, 132 insertions(+), 5 deletions(-) create mode 100644 tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java diff --git a/src/com/android/settings/applications/NotificationApps.java b/src/com/android/settings/applications/NotificationApps.java index c54363aa735..f290d43b831 100644 --- a/src/com/android/settings/applications/NotificationApps.java +++ b/src/com/android/settings/applications/NotificationApps.java @@ -17,7 +17,6 @@ package com.android.settings.applications; import android.app.Activity; import android.content.Context; import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager; import com.android.settings.R; import com.android.settings.dashboard.SummaryLoader; @@ -29,23 +28,24 @@ import com.android.settings.notification.NotificationBackend; */ public class NotificationApps extends ManageApplications { - private static class SummaryProvider implements SummaryLoader.SummaryProvider { + public static class SummaryProvider implements SummaryLoader.SummaryProvider { private final Context mContext; private final SummaryLoader mLoader; private final NotificationBackend mNotificationBackend; + private final PackageManagerWrapper mPackageManager; - private SummaryProvider(Context context, SummaryLoader loader) { + public SummaryProvider(Context context, SummaryLoader loader) { mContext = context; mLoader = loader; mNotificationBackend = new NotificationBackend(); + mPackageManager = new PackageManagerWrapperImpl(mContext.getPackageManager()); } @Override public void setListening(boolean listening) { if (listening) { - new AppCounter(mContext, - new PackageManagerWrapperImpl(mContext.getPackageManager())) { + new AppCounter(mContext, mPackageManager) { @Override protected void onCountComplete(int num) { updateSummary(num); diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java index ad71e832218..3e363d7598b 100644 --- a/src/com/android/settings/notification/ConfigureNotificationSettings.java +++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java @@ -16,13 +16,17 @@ package com.android.settings.notification; +import android.app.Activity; import android.content.Context; import android.provider.SearchIndexableResource; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; +import com.android.settings.applications.NotificationApps; +import com.android.settings.applications.NotificationApps.SummaryProvider; import com.android.settings.core.PreferenceController; import com.android.settings.dashboard.DashboardFragment; +import com.android.settings.dashboard.SummaryLoader; import com.android.settings.gestures.SwipeToNotificationPreferenceController; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; @@ -78,6 +82,15 @@ public class ConfigureNotificationSettings extends DashboardFragment { return controllers; } + public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY + = new SummaryLoader.SummaryProviderFactory() { + @Override + public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity, + SummaryLoader summaryLoader) { + return new NotificationApps.SummaryProvider(activity, summaryLoader); + } + }; + /** * For Search. */ diff --git a/tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java b/tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java new file mode 100644 index 00000000000..f84e7a883a7 --- /dev/null +++ b/tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java @@ -0,0 +1,114 @@ +/* + * Copyright (C) 2017 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.applications; + +import android.content.Context; + +import android.content.pm.ApplicationInfo; +import android.content.pm.UserInfo; +import android.os.UserManager; + +import com.android.settings.R; +import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.TestConfig; +import com.android.settings.dashboard.SummaryLoader; +import com.android.settings.notification.NotificationBackend; + +import java.util.List; +import java.util.ArrayList; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.annotation.Config; +import org.robolectric.shadows.ShadowApplication; +import org.robolectric.util.ReflectionHelpers; + +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.anyString; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +@RunWith(SettingsRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public class NotificationAppsTest { + + @Mock + private PackageManagerWrapper mPackageManager; + @Mock + private UserManager mUserManager; + @Mock + private SummaryLoader mSummaryLoader; + @Mock + private NotificationBackend mBackend; + + private Context mContext; + private NotificationApps.SummaryProvider mSummaryProvider; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + ShadowApplication shadowApplication = ShadowApplication.getInstance(); + shadowApplication.setSystemService(Context.USER_SERVICE, mUserManager); + mContext = shadowApplication.getApplicationContext(); + mSummaryProvider = spy(new NotificationApps.SummaryProvider(mContext, mSummaryLoader)); + ReflectionHelpers.setField(mSummaryProvider, "mNotificationBackend", mBackend); + ReflectionHelpers.setField(mSummaryProvider, "mPackageManager", mPackageManager); + } + + @Test + public void setListening_shouldSetSummary() { + List userInfos = new ArrayList<>(); + userInfos.add(new UserInfo(1, "user1", 0)); + when(mUserManager.getProfiles(anyInt())).thenReturn(userInfos); + List appInfos = new ArrayList<>(); + ApplicationInfo info1 = new ApplicationInfo(); + info1.packageName = "package1"; + appInfos.add(info1); + ApplicationInfo info2 = new ApplicationInfo(); + info2.packageName = "package2"; + appInfos.add(info2); + when(mPackageManager.getInstalledApplicationsAsUser(anyInt(), anyInt())) + .thenReturn(appInfos); + + // no notification off + when(mBackend.getNotificationsBanned(anyString(), anyInt())).thenReturn(false); + mSummaryProvider.setListening(true); + ShadowApplication.runBackgroundTasks(); + verify(mSummaryLoader).setSummary(mSummaryProvider, + mContext.getString(R.string.notification_summary_none)); + + // some notification off + when(mBackend.getNotificationsBanned(eq("package1"), anyInt())).thenReturn(true); + mSummaryProvider.setListening(true); + ShadowApplication.runBackgroundTasks(); + verify(mSummaryLoader).setSummary(mSummaryProvider, + mContext.getResources().getQuantityString(R.plurals.notification_summary, 1, 1)); + + when(mBackend.getNotificationsBanned(eq("package2"), anyInt())).thenReturn(true); + mSummaryProvider.setListening(true); + ShadowApplication.runBackgroundTasks(); + verify(mSummaryLoader).setSummary(mSummaryProvider, + mContext.getResources().getQuantityString(R.plurals.notification_summary, 2, 2)); + } + +}