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

Commit 40a02fda authored by Chen Xu's avatar Chen Xu Committed by Android (Google) Code Review
Browse files

Merge "rename notification channel" into oc-mr1-dev

parents e3131665 e96ce31e

src/java/com/android/internal/telephony/util/NotificationChannelController.java

+4 −4
Original line number Diff line number Diff line
@@ -38,12 +38,12 @@ public class NotificationChannelController { 
     */

    public static final String CHANNEL_ID_ALERT = "alert";

    public static final String CHANNEL_ID_CALL_FORWARD = "callForward";

    public static final String CHANNEL_ID_MOBILE_DATA_ALERT = "mobileDataAlertNew";

    public static final String CHANNEL_ID_MOBILE_DATA_STATUS = "mobileDataAlertNew";

    public static final String CHANNEL_ID_SMS = "sms";

    public static final String CHANNEL_ID_VOICE_MAIL = "voiceMail";

    public static final String CHANNEL_ID_WFC = "wfc";



    /** deprecated channel, replaced with @see #CHANNEL_ID_MOBILE_DATA_ALERT */

    /** deprecated channel, replaced with @see #CHANNEL_ID_MOBILE_DATA_STATUS */

    private static final String CHANNEL_ID_MOBILE_DATA_ALERT_DEPRECATED = "mobileDataAlert";



    /**
@@ -63,8 +63,8 @@ public class NotificationChannelController { 
                new NotificationChannel(CHANNEL_ID_CALL_FORWARD,

                        context.getText(R.string.notification_channel_call_forward),

                        NotificationManager.IMPORTANCE_LOW),

                new NotificationChannel(CHANNEL_ID_MOBILE_DATA_ALERT,

                        context.getText(R.string.notification_channel_mobile_data_alert),

                new NotificationChannel(CHANNEL_ID_MOBILE_DATA_STATUS,

                        context.getText(R.string.notification_channel_mobile_data_status),

                        NotificationManager.IMPORTANCE_LOW),

                new NotificationChannel(CHANNEL_ID_SMS,

                        context.getText(R.string.notification_channel_sms),