Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf23e518 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove ComAndroidServerNotificationNotificationHideUnusedChannels flag" into main

parents b08fe920 bcfc40f0

res/xml/app_notification_settings.xml

+0 −5
Original line number Diff line number Diff line
@@ -133,11 +133,6 @@ 
            android:icon="@drawable/ic_settings_24dp"

            android:title="@string/app_settings_link"

            android:order="1003"/>



        <com.android.settingslib.widget.FooterPreference

            android:key="deleted"

            android:icon="@drawable/ic_trash_can"

            android:order="8000"/>

    </PreferenceCategory>



</PreferenceScreen>

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

+1 −5
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_CACHED; 
import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_DYNAMIC;

import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED_BY_ANY_LAUNCHER;



import static com.android.server.notification.Flags.notificationHideUnusedChannels;



import android.annotation.FlaggedApi;

import android.app.Flags;

import android.app.INotificationManager;
@@ -87,9 +85,7 @@ public class NotificationBackend { 


    public AppRow loadAppRow(Context context, PackageManager pm, ApplicationInfo app) {

        final AppRow row = new AppRow();

        if (notificationHideUnusedChannels()) {

        row.showAllChannels = false;

        }

        row.pkg = app.packageName;

        row.uid = app.uid;

        try {

src/com/android/settings/notification/app/AppNotificationSettings.java

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ public class AppNotificationSettings extends NotificationSettings { 
        mControllers.add(new InvalidConversationPreferenceController(context, mBackend));

        mControllers.add(new BubbleSummaryPreferenceController(context, mBackend));

        mControllers.add(new NotificationsOffPreferenceController(context));

        mControllers.add(new DeletedChannelsPreferenceController(context, mBackend));

        mControllers.add(new ShowMorePreferenceController(

                context, mDependentFieldListener, mBackend));

        mControllers.add(new BundleListPreferenceController(context, mBackend));

src/com/android/settings/notification/app/BundleListPreferenceController.java

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ import static android.app.NotificationManager.IMPORTANCE_LOW; 
import static android.app.NotificationManager.IMPORTANCE_NONE;

import static android.service.notification.Adjustment.KEY_TYPE;



import static com.android.server.notification.Flags.notificationHideUnusedChannels;



import android.app.NotificationChannel;

import android.app.NotificationChannelGroup;

import android.app.settings.SettingsEnums;

src/com/android/settings/notification/app/ChannelListPreferenceController.java

+5 −9
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.settings.notification.app; 


import static android.app.NotificationManager.IMPORTANCE_LOW;

import static android.app.NotificationManager.IMPORTANCE_NONE;

import static com.android.server.notification.Flags.notificationHideUnusedChannels;



import android.app.NotificationChannel;

import android.app.NotificationChannelGroup;
@@ -98,16 +97,13 @@ public class ChannelListPreferenceController extends NotificationPreferenceContr 
        new AsyncTask<Void, Void, Void>() {

            @Override

            protected Void doInBackground(Void... unused) {

                if (notificationHideUnusedChannels()) {

                if (mAppRow.showAllChannels) {

                    mChannelGroupList = mBackend.getGroups(mAppRow.pkg, mAppRow.uid).getList();

                } else {

                    mChannelGroupList = mBackend.getGroupsWithRecentBlockedFilter(mAppRow.pkg,

                            mAppRow.uid).getList();

                }

                } else {

                    mChannelGroupList = mBackend.getGroups(mAppRow.pkg, mAppRow.uid).getList();

                }



                mChannelCount = mBackend.getChannelCount(mAppRow.pkg, mAppRow.uid);

                Collections.sort(mChannelGroupList, CHANNEL_GROUP_COMPARATOR);

                return null;