Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "carrier_net_notifier"

Browse Source 
* changes:
  Adds SystemMessage for CarrierNetworkNotification
  Carrier Network Notification strings
  Carrier Network Available Notification setting
This commit is contained in:
TreeHugger Robot
2018-01-25 04:46:39 +00:00
committed by Android (Google) Code Review
parent d3450b6aa2 f5a44fafbe
commit b214599552
4 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/android/provider/Settings.java
View File

@@ -9154,6 +9154,22 @@ public final class Settings {
private static final Validator WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON_VALIDATOR =
BOOLEAN_VALIDATOR;
/**
* Whether to notify the user of carrier networks.
* <p>
* If not connected and the scan results have a carrier network, we will
* put this notification up. If we attempt to connect to a network or
* the carrier network(s) disappear, we remove the notification. When we
* show the notification, we will not show it again for
* {@link android.provider.Settings.Global#WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY} time.
* @hide
*/
public static final String WIFI_CARRIER_NETWORKS_AVAILABLE_NOTIFICATION_ON =
"wifi_carrier_networks_available_notification_on";
private static final Validator WIFI_CARRIER_NETWORKS_AVAILABLE_NOTIFICATION_ON_VALIDATOR =
BOOLEAN_VALIDATOR;
/**
* {@hide}
*/
@@ -11261,6 +11277,7 @@ public final class Settings {
NETWORK_RECOMMENDATIONS_ENABLED,
WIFI_WAKEUP_ENABLED,
WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,
WIFI_CARRIER_NETWORKS_AVAILABLE_NOTIFICATION_ON,
USE_OPEN_WIFI_PACKAGE,
WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED,
EMERGENCY_TONE,
@@ -11307,6 +11324,8 @@ public final class Settings {
VALIDATORS.put(PRIVATE_DNS_MODE, PRIVATE_DNS_MODE_VALIDATOR);
VALIDATORS.put(PRIVATE_DNS_SPECIFIER, PRIVATE_DNS_SPECIFIER_VALIDATOR);
VALIDATORS.put(SOFT_AP_TIMEOUT_ENABLED, SOFT_AP_TIMEOUT_ENABLED_VALIDATOR);
VALIDATORS.put(WIFI_CARRIER_NETWORKS_AVAILABLE_NOTIFICATION_ON,
WIFI_CARRIER_NETWORKS_AVAILABLE_NOTIFICATION_ON_VALIDATOR);
}
/**

2
core/res/res/values/strings.xml
View File

@@ -3038,6 +3038,8 @@
<!-- Notification title for a nearby open wireless network.-->
<string name="wifi_available_title">Connect to open Wi\u2011Fi network</string>
<!-- Notification title for a nearby carrier wireless network.-->
<string name="wifi_available_carrier_network_title">Connect to carrier Wi\u2011Fi network</string>
<!-- Notification title when the system is connecting to the specified open network. The network name is specified in the notification content. -->
<string name="wifi_available_title_connecting">Connecting to open Wi\u2011Fi network</string>
<!-- Notification title when the system has connected to the open network. The network name is specified in the notification content. -->

1
core/res/res/values/symbols.xml
View File

@@ -1912,6 +1912,7 @@
<java-symbol type="plurals" name="wifi_available" />
<java-symbol type="plurals" name="wifi_available_detailed" />
<java-symbol type="string" name="wifi_available_title" />
<java-symbol type="string" name="wifi_available_carrier_network_title" />
<java-symbol type="string" name="wifi_available_title_connecting" />
<java-symbol type="string" name="wifi_available_title_connected" />
<java-symbol type="string" name="wifi_available_title_failed_to_connect" />

4
proto/src/system_messages.proto
View File

@@ -196,6 +196,10 @@ message SystemMessage {
// Inform the user that unexpectedly rapid network usage is happening
NOTE_NET_RAPID = 45;
// Notify the user that carrier Wi-Fi networks are available.
// Package: android
NOTE_CARRIER_NETWORK_AVAILABLE = 46;
// ADD_NEW_IDS_ABOVE_THIS_LINE
// Legacy IDs with arbitrary values appear below
// Legacy IDs existed as stable non-conflicting constants prior to the O release