diff options
| author | 2016-01-19 23:20:15 -0800 | |
|---|---|---|
| committer | 2016-02-02 14:50:39 -0800 | |
| commit | 0c35fbcf08085545fbcbbbf155bb998e981cae36 (patch) | |
| tree | bf5f2da68fa3c79865cd5625817c9eddb05a83d2 | |
| parent | 0cb57c399163aff7026afd9b808ad08819615113 (diff) | |
Add strings/setting for carrier app install dialog.
Bug: b/22863855
Change-Id: I34e2ff5997e14afe70a64edb055dc876e26d7946
| -rwxr-xr-x | core/java/android/provider/Settings.java | 9 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 8 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 5 |
3 files changed, 22 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 1561d46447a9..5535eaa0726d 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6895,6 +6895,15 @@ public final class Settings { public static final String TETHER_DUN_APN = "tether_dun_apn"; /** + * List of carrier apps which are whitelisted to prompt the user for install when + * a sim card with matching uicc carrier privilege rules is inserted. + * + * The value is "package1;package2;..." + * @hide + */ + public static final String CARRIER_APP_WHITELIST = "carrier_app_whitelist"; + + /** * USB Mass Storage Enabled */ public static final String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled"; diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index b2f5f8afd3e8..e5a6226fd937 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -2869,6 +2869,14 @@ <string name="sim_added_message">Restart your device to access the cellular network.</string> <!-- See SIM_ADDED_DIALOG. This is the button of that dialog. --> <string name="sim_restart_button">Restart</string> + <!-- See Carrier_App_Dialog. This is the message of that dialog. --> + <string name="carrier_app_dialog_message">To get your new SIM working properly, you\'ll need to install and open an app from your carrier.</string> + <!-- See Carrier_App_Dialog. This is the button of that dialog. --> + <string name="carrier_app_dialog_button">GET THE APP</string> + <string name="carrier_app_dialog_not_now">NOT NOW</string> + <!-- See carrier_app_notification. This is the headline. --> + <string name="carrier_app_notification_title">New SIM inserted</string> + <string name="carrier_app_notification_text">Tap to set it up</string> <!-- Date/Time picker dialogs strings --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index bc609c608e27..73cd175953bd 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2530,4 +2530,9 @@ <java-symbol type="array" name="resolver_target_actions_pin" /> <java-symbol type="array" name="resolver_target_actions_unpin" /> + <java-symbol type="string" name="carrier_app_dialog_message" /> + <java-symbol type="string" name="carrier_app_dialog_button" /> + <java-symbol type="string" name="carrier_app_dialog_not_now" /> + <java-symbol type="string" name="carrier_app_notification_title" /> + <java-symbol type="string" name="carrier_app_notification_text" /> </resources> |