Merge "Cleanup notification channel slice" into rvc-dev am: 1e0bb9f528

Change-Id: Ibf8bcf7400470b3807faadd56c5ce2b917b4cafd

src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProvider.java

@@ -19,8 +19,6 @@ package com.android.settings.homepage.contextualcards;
 import android.content.Context;
 import android.database.Cursor;
 
-import androidx.slice.Slice;
-
 /** Feature provider for the contextual card feature. */
 public interface ContextualCardFeatureProvider {
     /** Get contextual cards from the card provider */
@@ -35,7 +33,4 @@ public interface ContextualCardFeatureProvider {
      * @return The number of rows updated
      */
     int markCardAsDismissed(Context context, String cardName);
-
-    /** Log package when user clicks contextual notification channel card. */
-    void logNotificationPackage(Slice slice);
 }

src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProviderImpl.java

@@ -16,33 +16,20 @@
 
 package com.android.settings.homepage.contextualcards;
 
-import static android.content.Context.MODE_PRIVATE;
-
 import static com.android.settings.homepage.contextualcards.CardDatabaseHelper.CARD_TABLE;
 
 import android.content.ContentValues;
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Build;
 import android.text.format.DateUtils;
-import android.util.ArraySet;
 import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
-import androidx.slice.Slice;
-import androidx.slice.SliceMetadata;
-import androidx.slice.core.SliceAction;
 
-import com.android.settings.SettingsActivity;
-import com.android.settings.applications.AppInfoBase;
-import com.android.settings.homepage.contextualcards.slices.ContextualNotificationChannelSlice;
-import com.android.settings.slices.CustomSliceRegistry;
 import com.android.settingslib.utils.ThreadUtils;
 
-import java.util.Set;
-
 public class ContextualCardFeatureProviderImpl implements ContextualCardFeatureProvider {
     private static final String TAG = "ContextualCardFeatureProvider";
 
@@ -79,29 +66,6 @@ public class ContextualCardFeatureProviderImpl implements ContextualCardFeatureP
         return rowsUpdated;
     }
 
-    @Override
-    public void logNotificationPackage(Slice slice) {
-        if (slice == null || !slice.getUri().equals(
-                CustomSliceRegistry.CONTEXTUAL_NOTIFICATION_CHANNEL_SLICE_URI)) {
-            return;
-        }
-
-        final SliceAction primaryAction = SliceMetadata.from(mContext, slice).getPrimaryAction();
-        final String currentPackage = primaryAction.getAction().getIntent()
-                .getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
-                .getString(AppInfoBase.ARG_PACKAGE_NAME);
-
-        final SharedPreferences prefs = mContext.getSharedPreferences(
-                ContextualNotificationChannelSlice.PREFS, MODE_PRIVATE);
-        final Set<String> interactedPackages = prefs.getStringSet(
-                ContextualNotificationChannelSlice.PREF_KEY_INTERACTED_PACKAGES, new ArraySet<>());
-
-        final Set<String> newInteractedPackages = new ArraySet<>(interactedPackages);
-        newInteractedPackages.add(currentPackage);
-        prefs.edit().putStringSet(ContextualNotificationChannelSlice.PREF_KEY_INTERACTED_PACKAGES,
-                newInteractedPackages).apply();
-    }
-
     @VisibleForTesting
     int resetDismissedTime(long threshold) {
         final SQLiteDatabase database =

src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java

@@ -18,7 +18,6 @@ package com.android.settings.homepage.contextualcards;
 
 import static com.android.settings.intelligence.ContextualCardProto.ContextualCard.Category.STICKY_VALUE;
 import static com.android.settings.slices.CustomSliceRegistry.BLUETOOTH_DEVICES_SLICE_URI;
-import static com.android.settings.slices.CustomSliceRegistry.CONTEXTUAL_NOTIFICATION_CHANNEL_SLICE_URI;
 import static com.android.settings.slices.CustomSliceRegistry.CONTEXTUAL_WIFI_SLICE_URI;
 
 import android.app.settings.SettingsEnums;
@@ -201,7 +200,7 @@ public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard>
                     cards.add(card);
                 }
             } catch (ExecutionException | InterruptedException | TimeoutException e) {
-                Log.w(TAG, "Failed to get eligible state for card, likely timeout. Skipping", e);
+                Log.w(TAG, "Failed to get eligible state for card: " + e.toString());
             }
         }
         return cards;
@@ -209,8 +208,7 @@ public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard>
 
     private boolean isLargeCard(ContextualCard card) {
         return card.getSliceUri().equals(CONTEXTUAL_WIFI_SLICE_URI)
-                || card.getSliceUri().equals(BLUETOOTH_DEVICES_SLICE_URI)
-                || card.getSliceUri().equals(CONTEXTUAL_NOTIFICATION_CHANNEL_SLICE_URI);
+                || card.getSliceUri().equals(BLUETOOTH_DEVICES_SLICE_URI);
     }
 
     public interface CardContentLoaderListener {

src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java

@@ -56,14 +56,6 @@ public class SettingsContextualCardProvider extends ContextualCardProvider {
                         .setCardName(CustomSliceRegistry.BATTERY_FIX_SLICE_URI.toString())
                         .setCardCategory(ContextualCard.Category.IMPORTANT)
                         .build();
-        final String contextualNotificationChannelSliceUri =
-                CustomSliceRegistry.CONTEXTUAL_NOTIFICATION_CHANNEL_SLICE_URI.toString();
-        final ContextualCard notificationChannelCard =
-                ContextualCard.newBuilder()
-                        .setSliceUri(contextualNotificationChannelSliceUri)
-                        .setCardName(contextualNotificationChannelSliceUri)
-                        .setCardCategory(ContextualCard.Category.POSSIBLE)
-                        .build();
         final String contextualAdaptiveSleepSliceUri =
                 CustomSliceRegistry.CONTEXTUAL_ADAPTIVE_SLEEP_URI.toString();
         final ContextualCard contextualAdaptiveSleepCard =
@@ -89,7 +81,6 @@ public class SettingsContextualCardProvider extends ContextualCardProvider {
                 .addCard(connectedDeviceCard)
                 .addCard(lowStorageCard)
                 .addCard(batteryFixCard)
-                .addCard(notificationChannelCard)
                 .addCard(contextualAdaptiveSleepCard)
                 .addCard(contextualFaceSettingsCard)
                 .addCard(darkThemeCard)

src/com/android/settings/homepage/contextualcards/slices/ContextualNotificationChannelSlice.java

@@ -1,63 +0,0 @@
-/*
- * 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.homepage.contextualcards.slices;
-
-import static android.content.Context.MODE_PRIVATE;
-
-import android.content.Context;
-import android.net.Uri;
-import android.util.ArraySet;
-
-import com.android.settings.R;
-import com.android.settings.slices.CustomSliceRegistry;
-import com.android.settings.slices.SliceBackgroundWorker;
-
-import java.util.Set;
-
-public class ContextualNotificationChannelSlice extends NotificationChannelSlice {
-
-    public static final String PREFS = "notification_channel_slice_prefs";
-    public static final String PREF_KEY_INTERACTED_PACKAGES = "interacted_packages";
-
-    public ContextualNotificationChannelSlice(Context context) {
-        super(context);
-    }
-
-    @Override
-    public Uri getUri() {
-        return CustomSliceRegistry.CONTEXTUAL_NOTIFICATION_CHANNEL_SLICE_URI;
-    }
-
-    @Override
-    protected CharSequence getSubTitle(String packageName, int uid) {
-        return mContext.getText(R.string.recently_installed_app);
-    }
-
-    @Override
-    protected boolean isUserInteracted(String packageName) {
-        // Check the package has been interacted on current slice or not.
-        final Set<String> interactedPackages =
-                mContext.getSharedPreferences(PREFS, MODE_PRIVATE)
-                        .getStringSet(PREF_KEY_INTERACTED_PACKAGES, new ArraySet<>());
-        return interactedPackages.contains(packageName);
-    }
-
-    @Override
-    public Class<? extends SliceBackgroundWorker> getBackgroundWorkerClass() {
-        return NotificationChannelWorker.class;
-    }
-}

src/com/android/settings/homepage/contextualcards/slices/NotificationChannelSlice.java

@@ -1,503 +0,0 @@
-/*
- * 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.homepage.contextualcards.slices;
-
-import static android.app.NotificationManager.IMPORTANCE_LOW;
-import static android.app.NotificationManager.IMPORTANCE_NONE;
-import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
-
-import android.app.Application;
-import android.app.NotificationChannel;
-import android.app.NotificationChannelGroup;
-import android.app.PendingIntent;
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.util.Log;
-
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.slice.Slice;
-import androidx.slice.builders.ListBuilder;
-import androidx.slice.builders.SliceAction;
-
-import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
-import com.android.settings.SubSettings;
-import com.android.settings.Utils;
-import com.android.settings.applications.AppAndNotificationDashboardFragment;
-import com.android.settings.applications.AppInfoBase;
-import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.notification.app.AppNotificationSettings;
-import com.android.settings.notification.app.ChannelNotificationSettings;
-import com.android.settings.notification.NotificationBackend;
-import com.android.settings.notification.NotificationBackend.NotificationsSentState;
-import com.android.settings.notification.app.ChannelListPreferenceController;
-import com.android.settings.slices.CustomSliceRegistry;
-import com.android.settings.slices.CustomSliceable;
-import com.android.settings.slices.SliceBroadcastReceiver;
-import com.android.settings.slices.SliceBuilderUtils;
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.RestrictedLockUtilsInternal;
-import com.android.settingslib.applications.ApplicationsState;
-import com.android.settingslib.utils.ThreadUtils;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.stream.Collectors;
-
-public class NotificationChannelSlice implements CustomSliceable {
-
-    /**
-     * Recently app condition:
-     * App was installed between 3 and 7 days ago.
-     */
-    @VisibleForTesting
-    static final long DURATION_START_DAYS = TimeUnit.DAYS.toMillis(7);
-    @VisibleForTesting
-    static final long DURATION_END_DAYS = TimeUnit.DAYS.toMillis(3);
-
-    /**
-     * Notification count condition:
-     * App has sent at least ~10 notifications.
-     */
-    @VisibleForTesting
-    static final int MIN_NOTIFICATION_SENT_COUNT = 10;
-
-    /**
-     * Limit rows when the number of notification channel is more than {@link
-     * #DEFAULT_EXPANDED_ROW_COUNT}.
-     */
-    @VisibleForTesting
-    static final int DEFAULT_EXPANDED_ROW_COUNT = 3;
-
-    private static final String TAG = "NotifChannelSlice";
-    private static final String PACKAGE_NAME = "package_name";
-    private static final String PACKAGE_UID = "package_uid";
-    private static final String CHANNEL_ID = "channel_id";
-    private static final long TASK_TIMEOUT_MS = 100;
-
-    /**
-     * Sort notification channel with weekly average sent count by descending.
-     *
-     * Note:
-     * When the sent count of notification channels is the same, follow the sorting mechanism from
-     * {@link ChannelListPreferenceController}.
-     * Since slice view only shows displayable notification channels, so those deleted ones are
-     * excluded from the comparison here.
-     */
-    private static final Comparator<NotificationChannelState> CHANNEL_STATE_COMPARATOR =
-            (left, right) -> {
-                final NotificationsSentState leftState = left.getNotificationsSentState();
-                final NotificationsSentState rightState = right.getNotificationsSentState();
-                if (rightState.avgSentWeekly != leftState.avgSentWeekly) {
-                    return rightState.avgSentWeekly - leftState.avgSentWeekly;
-                }
-
-                final NotificationChannel leftChannel = left.getNotificationChannel();
-                final NotificationChannel rightChannel = right.getNotificationChannel();
-                if (TextUtils.equals(leftChannel.getId(), NotificationChannel.DEFAULT_CHANNEL_ID)) {
-                    return 1;
-                } else if (TextUtils.equals(rightChannel.getId(),
-                        NotificationChannel.DEFAULT_CHANNEL_ID)) {
-                    return -1;
-                }
-
-                return leftChannel.getId().compareTo(rightChannel.getId());
-            };
-
-    protected final Context mContext;
-    @VisibleForTesting
-    NotificationBackend mNotificationBackend;
-    private NotificationBackend.AppRow mAppRow;
-    private String mPackageName;
-    private int mUid;
-
-    public NotificationChannelSlice(Context context) {
-        mContext = context;
-        mNotificationBackend = new NotificationBackend();
-    }
-
-    @Override
-    public Slice getSlice() {
-        final ListBuilder listBuilder =
-                new ListBuilder(mContext, getUri(), ListBuilder.INFINITY)
-                        .setAccentColor(COLOR_NOT_TINTED);
-        /**
-         * Get package which is satisfied with:
-         * 1. Recently installed.
-         * 2. Multiple channels.
-         * 3. Sent at least ~10 notifications.
-         */
-        mPackageName = getEligibleNotificationsPackage(getRecentlyInstalledPackages());
-        if (mPackageName == null) {
-            // Return a header with IsError flag, if package is not found.
-            return listBuilder.setHeader(getNoSuggestedAppHeader())
-                    .setIsError(true).build();
-        }
-        mUid = getApplicationUid(mPackageName);
-
-        // Add notification channel header.
-        final IconCompat icon = getApplicationIcon(mPackageName);
-        final CharSequence title = mContext.getString(R.string.manage_app_notification,
-                Utils.getApplicationLabel(mContext, mPackageName));
-        listBuilder.addRow(new ListBuilder.RowBuilder()
-                .setTitleItem(icon, ListBuilder.ICON_IMAGE)
-                .setTitle(title)
-                .setSubtitle(getSubTitle(mPackageName, mUid))
-                .setPrimaryAction(getPrimarySliceAction(icon, title, getIntent())));
-
-        // Add notification channel rows.
-        final List<ListBuilder.RowBuilder> rows = getNotificationChannelRows(icon);
-        for (ListBuilder.RowBuilder rowBuilder : rows) {
-            listBuilder.addRow(rowBuilder);
-        }
-
-        return listBuilder.build();
-    }
-
-    @Override
-    public Uri getUri() {
-        return CustomSliceRegistry.NOTIFICATION_CHANNEL_SLICE_URI;
-    }
-
-    @Override
-    public void onNotifyChange(Intent intent) {
-        final boolean newState = intent.getBooleanExtra(EXTRA_TOGGLE_STATE, false);
-        final String packageName = intent.getStringExtra(PACKAGE_NAME);
-        final int uid = intent.getIntExtra(PACKAGE_UID, -1);
-        final String channelId = intent.getStringExtra(CHANNEL_ID);
-        final NotificationChannel channel = mNotificationBackend.getChannel(packageName, uid,
-                channelId);
-        final int importance = newState ? IMPORTANCE_LOW : IMPORTANCE_NONE;
-        channel.setImportance(importance);
-        channel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE);
-        mNotificationBackend.updateChannel(packageName, uid, channel);
-    }
-
-    @Override
-    public Intent getIntent() {
-        final Bundle args = new Bundle();
-        args.putString(AppInfoBase.ARG_PACKAGE_NAME, mPackageName);
-        args.putInt(AppInfoBase.ARG_PACKAGE_UID, mUid);
-
-        return new SubSettingLauncher(mContext)
-                .setDestination(AppNotificationSettings.class.getName())
-                .setTitleRes(R.string.notifications_title)
-                .setArguments(args)
-                .setSourceMetricsCategory(SettingsEnums.SLICE)
-                .toIntent();
-    }
-
-    /**
-     * Check the package has been interacted by user or not.
-     * Will use to filter package in {@link #getRecentlyInstalledPackages()}.
-     *
-     * @param packageName The app package name.
-     * @return true if the package was interacted, false otherwise.
-     */
-    protected boolean isUserInteracted(String packageName) {
-        return false;
-    }
-
-    @VisibleForTesting
-    IconCompat getApplicationIcon(String packageName) {
-        final Drawable drawable;
-        try {
-            drawable = mContext.getPackageManager().getApplicationIcon(packageName);
-        } catch (PackageManager.NameNotFoundException e) {
-            Log.w(TAG, "No such package to get application icon.");
-            return null;
-        }
-
-        return Utils.createIconWithDrawable(drawable);
-    }
-
-    @VisibleForTesting
-    int getApplicationUid(String packageName) {
-        final ApplicationsState.AppEntry appEntry =
-                ApplicationsState.getInstance((Application) mContext.getApplicationContext())
-                        .getEntry(packageName, UserHandle.myUserId());
-
-        return appEntry.info.uid;
-    }
-
-    private SliceAction buildRowSliceAction(NotificationChannel channel, IconCompat icon) {
-        final Bundle channelArgs = new Bundle();
-        channelArgs.putInt(AppInfoBase.ARG_PACKAGE_UID, mUid);
-        channelArgs.putString(AppInfoBase.ARG_PACKAGE_NAME, mPackageName);
-        channelArgs.putString(Settings.EXTRA_CHANNEL_ID, channel.getId());
-
-        final Intent channelIntent = new SubSettingLauncher(mContext)
-                .setDestination(ChannelNotificationSettings.class.getName())
-                .setArguments(channelArgs)
-                .setTitleRes(R.string.notification_channel_title)
-                .setSourceMetricsCategory(SettingsEnums.SLICE)
-                .toIntent();
-
-        return SliceAction.createDeeplink(
-                PendingIntent.getActivity(mContext, channel.hashCode(), channelIntent, 0), icon,
-                ListBuilder.ICON_IMAGE, channel.getName());
-    }
-
-    private ListBuilder.HeaderBuilder getNoSuggestedAppHeader() {
-        final IconCompat icon = IconCompat.createWithResource(mContext,
-                R.drawable.ic_homepage_apps);
-        final CharSequence titleNoSuggestedApp = mContext.getString(R.string.no_suggested_app);
-        final SliceAction primarySliceActionForNoSuggestedApp = getPrimarySliceAction(icon,
-                titleNoSuggestedApp, getAppAndNotificationPageIntent());
-
-        return new ListBuilder.HeaderBuilder()
-                .setTitle(titleNoSuggestedApp)
-                .setPrimaryAction(primarySliceActionForNoSuggestedApp);
-    }
-
-    private List<ListBuilder.RowBuilder> getNotificationChannelRows(IconCompat icon) {
-        final List<ListBuilder.RowBuilder> notificationChannelRows = new ArrayList<>();
-        final List<NotificationChannel> displayableChannels = getDisplayableChannels(mAppRow);
-
-        for (NotificationChannel channel : displayableChannels) {
-            notificationChannelRows.add(new ListBuilder.RowBuilder()
-                    .setTitle(channel.getName())
-                    .setSubtitle(NotificationBackend.getSentSummary(
-                            mContext, mAppRow.sentByChannel.get(channel.getId()), false))
-                    .setPrimaryAction(buildRowSliceAction(channel, icon))
-                    .addEndItem(SliceAction.createToggle(getToggleIntent(channel.getId()),
-                            null /* actionTitle */, channel.getImportance() != IMPORTANCE_NONE)));
-        }
-
-        return notificationChannelRows;
-    }
-
-    private PendingIntent getToggleIntent(String channelId) {
-        // Send broadcast to enable/disable channel.
-        final Intent intent = new Intent(getUri().toString())
-                .setClass(mContext, SliceBroadcastReceiver.class)
-                .putExtra(PACKAGE_NAME, mPackageName)
-                .putExtra(PACKAGE_UID, mUid)
-                .putExtra(CHANNEL_ID, channelId);
-
-        return PendingIntent.getBroadcast(mContext, intent.hashCode(), intent, 0);
-    }
-
-    private List<PackageInfo> getRecentlyInstalledPackages() {
-        final long startTime = System.currentTimeMillis() - DURATION_START_DAYS;
-        final long endTime = System.currentTimeMillis() - DURATION_END_DAYS;
-
-        // Get recently installed packages between 3 and 7 days ago.
-        final List<PackageInfo> recentlyInstalledPackages = new ArrayList<>();
-        final List<PackageInfo> installedPackages =
-                mContext.getPackageManager().getInstalledPackages(0);
-        for (PackageInfo packageInfo : installedPackages) {
-            // Not include system app and interacted app.
-            if (packageInfo.applicationInfo.isSystemApp()
-                    || isUserInteracted(packageInfo.packageName)) {
-                continue;
-            }
-
-            if (packageInfo.firstInstallTime >= startTime
-                    && packageInfo.firstInstallTime <= endTime) {
-                recentlyInstalledPackages.add(packageInfo);
-            }
-        }
-
-        return recentlyInstalledPackages;
-    }
-
-    private SliceAction getPrimarySliceAction(IconCompat icon, CharSequence title, Intent intent) {
-        return SliceAction.createDeeplink(
-                PendingIntent.getActivity(mContext, intent.hashCode(), intent, 0),
-                icon,
-                ListBuilder.ICON_IMAGE,
-                title);
-    }
-
-    private List<NotificationChannel> getDisplayableChannels(NotificationBackend.AppRow appRow) {
-        final List<NotificationChannelGroup> channelGroupList =
-                mNotificationBackend.getGroups(appRow.pkg, appRow.uid).getList();
-        final List<NotificationChannel> channels = channelGroupList.stream()
-                .flatMap(group -> group.getChannels().stream().filter(
-                        channel -> isChannelEnabled(group, channel, appRow)))
-                .collect(Collectors.toList());
-
-        // Pack the notification channel with notification sent state for sorting.
-        final List<NotificationChannelState> channelStates = new ArrayList<>();
-        for (NotificationChannel channel : channels) {
-            NotificationsSentState sentState = appRow.sentByChannel.get(channel.getId());
-            if (sentState == null) {
-                sentState = new NotificationsSentState();
-            }
-            channelStates.add(new NotificationChannelState(sentState, channel));
-        }
-
-        // Sort the notification channels with notification sent count by descending.
-        return channelStates.stream()
-                .sorted(CHANNEL_STATE_COMPARATOR)
-                .map(state -> state.getNotificationChannel())
-                .limit(DEFAULT_EXPANDED_ROW_COUNT)
-                .collect(Collectors.toList());
-    }
-
-    private String getEligibleNotificationsPackage(List<PackageInfo> packageInfoList) {
-        if (packageInfoList.isEmpty()) {
-            return null;
-        }
-
-        // Create tasks to get notification data for multi-channel packages.
-        final List<Future<NotificationBackend.AppRow>> appRowTasks = new ArrayList<>();
-        for (PackageInfo packageInfo : packageInfoList) {
-            final NotificationMultiChannelAppRow appRow = new NotificationMultiChannelAppRow(
-                    mContext, mNotificationBackend, packageInfo);
-            appRowTasks.add(ThreadUtils.postOnBackgroundThread(appRow));
-        }
-
-        // Get the package which has sent at least ~10 notifications and not turn off channels.
-        int maxSentCount = 0;
-        String maxSentCountPackage = null;
-        for (Future<NotificationBackend.AppRow> appRowTask : appRowTasks) {
-            NotificationBackend.AppRow appRow = null;
-            try {
-                appRow = appRowTask.get(TASK_TIMEOUT_MS, TimeUnit.MILLISECONDS);
-            } catch (ExecutionException | InterruptedException | TimeoutException e) {
-                Log.w(TAG, "Failed to get notification data.", e);
-            }
-
-            // Ignore packages which are banned notifications or block all displayable channels.
-            if (appRow == null || appRow.banned || isAllChannelsBlocked(
-                    getDisplayableChannels(appRow))) {
-                continue;
-            }
-
-            // Get sent notification count from app.
-            final int sentCount = appRow.sentByApp.sentCount;
-            if (sentCount >= MIN_NOTIFICATION_SENT_COUNT && sentCount > maxSentCount) {
-                maxSentCount = sentCount;
-                maxSentCountPackage = appRow.pkg;
-                mAppRow = appRow;
-            }
-        }
-
-        return maxSentCountPackage;
-    }
-
-    private boolean isAllChannelsBlocked(List<NotificationChannel> channels) {
-        for (NotificationChannel channel : channels) {
-            if (channel.getImportance() != IMPORTANCE_NONE) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    protected CharSequence getSubTitle(String packageName, int uid) {
-        final int channelCount = mNotificationBackend.getChannelCount(packageName, uid);
-
-        if (channelCount > DEFAULT_EXPANDED_ROW_COUNT) {
-            return mContext.getString(
-                    R.string.notification_many_channel_count_summary, channelCount);
-        }
-
-        return mContext.getResources().getQuantityString(
-                R.plurals.notification_few_channel_count_summary, channelCount, channelCount);
-    }
-
-    private Intent getAppAndNotificationPageIntent() {
-        final String screenTitle = mContext.getText(R.string.app_and_notification_dashboard_title)
-                .toString();
-
-        return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
-                AppAndNotificationDashboardFragment.class.getName(), "" /* key */,
-                screenTitle,
-                SettingsEnums.SLICE)
-                .setClassName(mContext.getPackageName(), SubSettings.class.getName())
-                .setData(getUri());
-    }
-
-    private boolean isChannelEnabled(NotificationChannelGroup group, NotificationChannel channel,
-            NotificationBackend.AppRow appRow) {
-        final RestrictedLockUtils.EnforcedAdmin suspendedAppsAdmin =
-                RestrictedLockUtilsInternal.checkIfApplicationIsSuspended(mContext, mPackageName,
-                        mUid);
-
-        return suspendedAppsAdmin == null
-                && isChannelBlockable(channel, appRow)
-                && isChannelConfigurable(channel, appRow)
-                && !group.isBlocked();
-    }
-
-    private boolean isChannelConfigurable(NotificationChannel channel,
-            NotificationBackend.AppRow appRow) {
-        if (channel != null && appRow != null) {
-            return !channel.isImportanceLockedByOEM();
-        }
-
-        return false;
-    }
-
-    private boolean isChannelBlockable(NotificationChannel channel,
-            NotificationBackend.AppRow appRow) {
-        if (channel != null && appRow != null) {
-            if (!appRow.systemApp) {
-                return true;
-            }
-
-            return channel.isBlockable()
-                    || channel.getImportance() == IMPORTANCE_NONE;
-        }
-
-        return false;
-    }
-
-    /**
-     * This class is used to sort notification channels according to notification sent count and
-     * notification id in {@link NotificationChannelSlice#CHANNEL_STATE_COMPARATOR}.
-     *
-     * Include {@link NotificationsSentState#avgSentWeekly} and {@link NotificationChannel#getId()}
-     * to get the number of notifications being sent and notification id.
-     */
-    private static class NotificationChannelState {
-
-        final private NotificationsSentState mNotificationsSentState;
-        final private NotificationChannel mNotificationChannel;
-
-        public NotificationChannelState(NotificationsSentState notificationsSentState,
-                NotificationChannel notificationChannel) {
-            mNotificationsSentState = notificationsSentState;
-            mNotificationChannel = notificationChannel;
-        }
-
-        public NotificationChannel getNotificationChannel() {
-            return mNotificationChannel;
-        }
-
-        public NotificationsSentState getNotificationsSentState() {
-            return mNotificationsSentState;
-        }
-    }
-}

src/com/android/settings/homepage/contextualcards/slices/NotificationChannelWorker.java

@@ -1,77 +0,0 @@
-/*
- * 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.homepage.contextualcards.slices;
-
-import static android.content.Context.MODE_PRIVATE;
-
-import static com.android.settings.homepage.contextualcards.slices.ContextualNotificationChannelSlice.PREFS;
-import static com.android.settings.homepage.contextualcards.slices.ContextualNotificationChannelSlice.PREF_KEY_INTERACTED_PACKAGES;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.pm.PackageInfo;
-import android.net.Uri;
-import android.util.ArraySet;
-
-import com.android.settings.slices.SliceBackgroundWorker;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-public class NotificationChannelWorker extends SliceBackgroundWorker<Void> {
-
-    public NotificationChannelWorker(Context context, Uri uri) {
-        super(context, uri);
-    }
-
-    @Override
-    protected void onSlicePinned() {
-    }
-
-    @Override
-    protected void onSliceUnpinned() {
-        removeUninstalledPackages();
-    }
-
-    @Override
-    public void close() throws IOException {
-    }
-
-    private void removeUninstalledPackages() {
-        final SharedPreferences prefs = getContext().getSharedPreferences(PREFS, MODE_PRIVATE);
-        final Set<String> interactedPackages =
-                prefs.getStringSet(PREF_KEY_INTERACTED_PACKAGES, new ArraySet());
-        if (interactedPackages.isEmpty()) {
-            return;
-        }
-
-        final List<PackageInfo> installedPackageInfos =
-                getContext().getPackageManager().getInstalledPackages(0);
-        final List<String> installedPackages = installedPackageInfos.stream()
-                .map(packageInfo -> packageInfo.packageName)
-                .collect(Collectors.toList());
-        final Set<String> newInteractedPackages = new ArraySet<>();
-        for (String packageName : interactedPackages) {
-            if (installedPackages.contains(packageName)) {
-                newInteractedPackages.add(packageName);
-            }
-        }
-        prefs.edit().putStringSet(PREF_KEY_INTERACTED_PACKAGES, newInteractedPackages).apply();
-    }
-}

src/com/android/settings/homepage/contextualcards/slices/NotificationMultiChannelAppRow.java

@@ -1,54 +0,0 @@
-/*
- * 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.homepage.contextualcards.slices;
-
-import android.app.role.RoleManager;
-import android.content.Context;
-import android.content.pm.PackageInfo;
-
-import com.android.settings.notification.NotificationBackend;
-
-import java.util.concurrent.Callable;
-
-/**
- * This class is responsible for getting notification app row from package which has multiple
- * notification channels.{@link NotificationChannelSlice} uses it to improve latency.
- */
-class NotificationMultiChannelAppRow implements Callable<NotificationBackend.AppRow> {
-
-    private final Context mContext;
-    private final NotificationBackend mNotificationBackend;
-    private final PackageInfo mPackageInfo;
-
-    public NotificationMultiChannelAppRow(Context context, NotificationBackend notificationBackend,
-            PackageInfo packageInfo) {
-        mContext = context;
-        mNotificationBackend = notificationBackend;
-        mPackageInfo = packageInfo;
-    }
-
-    @Override
-    public NotificationBackend.AppRow call() throws Exception {
-        final int channelCount = mNotificationBackend.getChannelCount(
-                mPackageInfo.applicationInfo.packageName, mPackageInfo.applicationInfo.uid);
-        if (channelCount > 1) {
-            return mNotificationBackend.loadAppRow(mContext, mContext.getPackageManager(),
-                    mContext.getSystemService(RoleManager.class), mPackageInfo);
-        }
-        return null;
-    }
-}

src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java

@@ -26,7 +26,6 @@ import androidx.slice.widget.SliceView;
 
 import com.android.settings.R;
 import com.android.settings.homepage.contextualcards.ContextualCard;
-import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider;
 import com.android.settings.homepage.contextualcards.logging.ContextualCardLogUtils;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -50,27 +49,19 @@ class SliceFullCardRendererHelper {
         final SliceViewHolder cardHolder = (SliceViewHolder) holder;
         cardHolder.sliceView.setScrollable(false);
         cardHolder.sliceView.setTag(card.getSliceUri());
-        //TODO(b/114009676): We will soon have a field to decide what slice mode we should set.
         cardHolder.sliceView.setMode(SliceView.MODE_LARGE);
         cardHolder.sliceView.setSlice(slice);
         // Set this listener so we can log the interaction users make on the slice
-        cardHolder.sliceView.setOnSliceActionListener(
-                (eventInfo, sliceItem) -> {
-                    final String log = ContextualCardLogUtils.buildCardClickLog(card, eventInfo.rowIndex,
-                            eventInfo.actionType, cardHolder.getAdapterPosition());
+        cardHolder.sliceView.setOnSliceActionListener((eventInfo, sliceItem) -> {
+            final String log = ContextualCardLogUtils.buildCardClickLog(card, eventInfo.rowIndex,
+                    eventInfo.actionType, cardHolder.getAdapterPosition());
 
-                    final MetricsFeatureProvider metricsFeatureProvider =
-                            FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
+            final MetricsFeatureProvider metricsFeatureProvider =
+                    FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
 
-                    metricsFeatureProvider.action(mContext,
-                            SettingsEnums.ACTION_CONTEXTUAL_CARD_CLICK, log);
-
-                    final ContextualCardFeatureProvider contextualCardFeatureProvider =
-                            FeatureFactory.getFactory(mContext).getContextualCardFeatureProvider(
-                                    mContext);
-
-                    contextualCardFeatureProvider.logNotificationPackage(slice);
-                });
+            metricsFeatureProvider.action(mContext,
+                    SettingsEnums.ACTION_CONTEXTUAL_CARD_CLICK, log);
+        });
 
         // Customize slice view for Settings
         cardHolder.sliceView.setShowTitleItems(true);

src/com/android/settings/slices/CustomSliceRegistry.java

@@ -33,11 +33,9 @@ import com.android.settings.homepage.contextualcards.deviceinfo.StorageSlice;
 import com.android.settings.homepage.contextualcards.slices.BatteryFixSlice;
 import com.android.settings.homepage.contextualcards.slices.BluetoothDevicesSlice;
 import com.android.settings.homepage.contextualcards.slices.ContextualAdaptiveSleepSlice;
-import com.android.settings.homepage.contextualcards.slices.ContextualNotificationChannelSlice;
 import com.android.settings.homepage.contextualcards.slices.DarkThemeSlice;
 import com.android.settings.homepage.contextualcards.slices.FaceSetupSlice;
 import com.android.settings.homepage.contextualcards.slices.LowStorageSlice;
-import com.android.settings.homepage.contextualcards.slices.NotificationChannelSlice;
 import com.android.settings.location.LocationSlice;
 import com.android.settings.media.MediaOutputGroupSlice;
 import com.android.settings.media.MediaOutputIndicatorSlice;
@@ -97,16 +95,6 @@ public class CustomSliceRegistry {
             .appendPath("bluetooth_devices")
             .build();
 
-    /**
-     * Backing Uri for Contextual Notification channel Slice.
-     */
-    public static final Uri CONTEXTUAL_NOTIFICATION_CHANNEL_SLICE_URI = new Uri.Builder()
-            .scheme(ContentResolver.SCHEME_CONTENT)
-            .authority(SettingsSliceProvider.SLICE_AUTHORITY)
-            .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
-            .appendPath("contextual_notification_channel")
-            .build();
-
     /**
      * Backing Uri for the Wifi Slice.
      */
@@ -180,15 +168,6 @@ public class CustomSliceRegistry {
             .appendEncodedPath(SettingsSlicesContract.PATH_SETTING_ACTION)
             .appendPath("mobile_data")
             .build();
-    /**
-     * Backing Uri for Notification channel Slice.
-     */
-    public static final Uri NOTIFICATION_CHANNEL_SLICE_URI = new Uri.Builder()
-            .scheme(ContentResolver.SCHEME_CONTENT)
-            .authority(SettingsSliceProvider.SLICE_AUTHORITY)
-            .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
-            .appendPath("notification_channel")
-            .build();
     /**
      * Backing Uri for the storage slice.
      */
@@ -333,8 +312,6 @@ public class CustomSliceRegistry {
         sUriToSlice.put(BATTERY_FIX_SLICE_URI, BatteryFixSlice.class);
         sUriToSlice.put(BLUETOOTH_DEVICES_SLICE_URI, BluetoothDevicesSlice.class);
         sUriToSlice.put(CONTEXTUAL_ADAPTIVE_SLEEP_URI, ContextualAdaptiveSleepSlice.class);
-        sUriToSlice.put(CONTEXTUAL_NOTIFICATION_CHANNEL_SLICE_URI,
-                ContextualNotificationChannelSlice.class);
         sUriToSlice.put(CONTEXTUAL_WIFI_SLICE_URI, ContextualWifiSlice.class);
         sUriToSlice.put(FACE_ENROLL_SLICE_URI, FaceSetupSlice.class);
         sUriToSlice.put(FLASHLIGHT_SLICE_URI, FlashlightSlice.class);
@@ -343,7 +320,6 @@ public class CustomSliceRegistry {
         sUriToSlice.put(MEDIA_OUTPUT_INDICATOR_SLICE_URI, MediaOutputIndicatorSlice.class);
         sUriToSlice.put(MEDIA_OUTPUT_SLICE_URI, MediaOutputSlice.class);
         sUriToSlice.put(MOBILE_DATA_SLICE_URI, MobileDataSlice.class);
-        sUriToSlice.put(NOTIFICATION_CHANNEL_SLICE_URI, NotificationChannelSlice.class);
         sUriToSlice.put(STORAGE_SLICE_URI, StorageSlice.class);
         sUriToSlice.put(WIFI_SLICE_URI, WifiSlice.class);
         sUriToSlice.put(DARK_THEME_SLICE_URI, DarkThemeSlice.class);