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

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

Merge changes from topic 'onarevert' into oc-dev 

* changes:
  Create a NotificationChannel for ONA.
  Revert "Delete old WifiNotificationController strings."
parents 05aa65cf 11176569

core/java/com/android/internal/notification/SystemNotificationChannels.java

+6 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ public class SystemNotificationChannels { 
    public static String UPDATES = "UPDATES";

    public static String NETWORK_STATUS = "NETWORK_STATUS";

    public static String NETWORK_ALERTS = "NETWORK_ALERTS";

    public static String NETWORK_AVAILABLE = "NETWORK_AVAILABLE";

    public static String VPN = "VPN";

    public static String DEVICE_ADMIN = "DEVICE_ADMIN";

    public static String ALERTS = "ALERTS";
@@ -98,6 +99,11 @@ public class SystemNotificationChannels { 
                Notification.AUDIO_ATTRIBUTES_DEFAULT);

        channelsList.add(networkAlertsChannel);



        channelsList.add(new NotificationChannel(

                NETWORK_AVAILABLE,

                context.getString(R.string.notification_channel_network_available),

                NotificationManager.IMPORTANCE_LOW));



        channelsList.add(new NotificationChannel(

                VPN,

                context.getString(R.string.notification_channel_vpn),

core/res/res/values/strings.xml

+14 −0
Original line number Diff line number Diff line
@@ -629,6 +629,9 @@ 
    <!-- Text shown when viewing channel settings for notifications related to network alerts -->

    <string name="notification_channel_network_alerts">Network alerts</string>



    <!-- Text shown when viewing the channel settings for notification about open nearby wireless networks. -->

    <string name="notification_channel_network_available">Network available</string>



    <!-- Text shown when viewing channel settings for notifications related to vpn status -->

    <string name="notification_channel_vpn">VPN status</string>
@@ -2993,6 +2996,17 @@ 
    <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, t his is shown instead.  For example, if the ringtone was on a SD card and it had been removed, this woudl be shown for ringtones on that SD card. -->

    <string name="ringtone_unknown">Unknown</string>



    <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's title. -->

    <plurals name="wifi_available">

        <item quantity="one">Wi-Fi network available</item>

        <item quantity="other">Wi-Fi networks available</item>

    </plurals>

    <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's message. -->

    <plurals name="wifi_available_detailed">

        <item quantity="one">Open Wi-Fi network available</item>

        <item quantity="other">Open Wi-Fi networks available</item>

    </plurals>



    <!-- A notification is shown when a wifi captive portal network is detected.  This is the notification's title. -->

    <string name="wifi_available_sign_in">Sign in to Wi-Fi network</string>

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -1861,6 +1861,8 @@ 
  <java-symbol type="layout" name="safe_mode" />

  <java-symbol type="layout" name="simple_list_item_2_single_choice" />

  <java-symbol type="layout" name="app_error_dialog" />

  <java-symbol type="plurals" name="wifi_available" />

  <java-symbol type="plurals" name="wifi_available_detailed" />

  <java-symbol type="string" name="accessibility_binding_label" />

  <java-symbol type="string" name="adb_active_notification_message" />

  <java-symbol type="string" name="adb_active_notification_title" />
@@ -2970,6 +2972,7 @@ 
  <java-symbol type="string" name="notification_channel_updates" />

  <java-symbol type="string" name="notification_channel_network_status" />

  <java-symbol type="string" name="notification_channel_network_alerts" />

  <java-symbol type="string" name="notification_channel_network_available" />

  <java-symbol type="string" name="notification_channel_vpn" />

  <java-symbol type="string" name="notification_channel_device_admin" />

  <java-symbol type="string" name="notification_channel_alerts" />