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

Commit 7e1b9a5b authored by Beverly's avatar Beverly Committed by android-build-merger
Browse files

Merge "System notif channels updated on locale change" into pi-dev am: e3ba4964 

am: f488941f

Change-Id: I4b6af08d6d892413f5d1cc6dd84dec141aeed940
parents 6e5799d9 f488941f

packages/SystemUI/src/com/android/systemui/SystemUIApplication.java

+15 −15
Original line number Original line Diff line number Diff line
@@ -29,30 +29,16 @@ import android.os.SystemProperties; 
import android.os.Trace;

import android.os.Trace;

import android.os.UserHandle;

import android.os.UserHandle;

import android.util.ArraySet;

import android.util.ArraySet;

import android.util.TimingsTraceLog;

import android.util.Log;

import android.util.Log;

import android.util.TimingsTraceLog;





import com.android.systemui.globalactions.GlobalActionsComponent;

import com.android.systemui.keyboard.KeyboardUI;

import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.media.RingtonePlayer;

import com.android.systemui.pip.PipUI;

import com.android.systemui.plugins.OverlayPlugin;

import com.android.systemui.plugins.OverlayPlugin;

import com.android.systemui.plugins.PluginListener;

import com.android.systemui.plugins.PluginListener;

import com.android.systemui.plugins.PluginManager;

import com.android.systemui.plugins.PluginManager;

import com.android.systemui.power.PowerUI;

import com.android.systemui.recents.Recents;

import com.android.systemui.shortcut.ShortcutKeyDispatcher;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.phone.StatusBar;

import com.android.systemui.statusbar.phone.StatusBar;

import com.android.systemui.statusbar.phone.StatusBarWindowManager;

import com.android.systemui.statusbar.phone.StatusBarWindowManager;

import com.android.systemui.usb.StorageNotification;

import com.android.systemui.util.NotificationChannels;

import com.android.systemui.util.NotificationChannels;

import com.android.systemui.util.leak.GarbageMonitor;

import com.android.systemui.volume.VolumeUI;





import java.util.ArrayList;

import java.util.HashMap;

import java.util.HashMap;

import java.util.Map;

import java.util.Map;
@@ -99,6 +85,10 @@ public class SystemUIApplication extends Application implements SysUiServiceProv 
                            mServices[i].onBootCompleted();

                            mServices[i].onBootCompleted();

                        }

                        }

                    }

                    }



                    IntentFilter localeChangedFilter = new IntentFilter(

                            Intent.ACTION_LOCALE_CHANGED);

                    registerReceiver(mLocaleChangeReceiver, localeChangedFilter);

                }

                }

            }, filter);

            }, filter);

        } else {

        } else {
@@ -249,4 +239,14 @@ public class SystemUIApplication extends Application implements SysUiServiceProv 
    public SystemUI[] getServices() {

    public SystemUI[] getServices() {

        return mServices;

        return mServices;

    }

    }



    private final BroadcastReceiver mLocaleChangeReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            if (Intent.ACTION_LOCALE_CHANGED.equals(intent.getAction())) {

                // Update names of SystemUi notification channels

                NotificationChannels.createAll(context);

            }

        }

    };

}
 
}

packages/SystemUI/src/com/android/systemui/util/NotificationChannels.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -39,8 +39,7 @@ public class NotificationChannels extends SystemUI { 
    public static String BATTERY     = "BAT";

    public static String BATTERY     = "BAT";

    public static String HINTS       = "HNT";

    public static String HINTS       = "HNT";





    @VisibleForTesting

    public static void createAll(Context context) {

    static void createAll(Context context) {

        final NotificationManager nm = context.getSystemService(NotificationManager.class);

        final NotificationManager nm = context.getSystemService(NotificationManager.class);

        final NotificationChannel batteryChannel = new NotificationChannel(BATTERY,

        final NotificationChannel batteryChannel = new NotificationChannel(BATTERY,

                context.getString(R.string.notification_channel_battery),

                context.getString(R.string.notification_channel_battery),

services/core/java/com/android/server/notification/NotificationManagerService.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -182,6 +182,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto;

import com.android.internal.logging.nano.MetricsProto;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.notification.SystemNotificationChannels;

import com.android.internal.os.BackgroundThread;

import com.android.internal.os.BackgroundThread;

import com.android.internal.statusbar.NotificationVisibility;

import com.android.internal.statusbar.NotificationVisibility;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.ArrayUtils;
@@ -898,6 +899,8 @@ public class NotificationManagerService extends SystemService { 
        @Override

        @Override

        public void onReceive(Context context, Intent intent) {

        public void onReceive(Context context, Intent intent) {

            if (Intent.ACTION_LOCALE_CHANGED.equals(intent.getAction())) {

            if (Intent.ACTION_LOCALE_CHANGED.equals(intent.getAction())) {

                // update system notification channels

                SystemNotificationChannels.createAll(context);

                mZenModeHelper.updateDefaultZenRules();

                mZenModeHelper.updateDefaultZenRules();

                mRankingHelper.onLocaleChanged(context, ActivityManager.getCurrentUser());

                mRankingHelper.onLocaleChanged(context, ActivityManager.getCurrentUser());

            }

            }