From: Jordan Liu <jminjie@google.com>
Date: Fri, 23 Mar 2018 05:10:35 +0000 (+0000)
Subject: Merge "Add multisim notifications for SST" am: 1a6228e595
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d2fa6075a035422785980cff398e87ce61d53600;p=android-x86%2Fframeworks-base.git

Merge "Add multisim notifications for SST" am: 1a6228e595
am: 3a647cd833

Change-Id: I11e378d2633851ab4658074a9cfb42da346749ea
---

d2fa6075a035422785980cff398e87ce61d53600
diff --cc core/res/res/values/strings.xml
index 74a2c75b64bd,7b6dbdd9f480..7038887a6994
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@@ -4833,79 -4684,12 +4836,85 @@@
      <string name="mmcc_illegal_ms">SIM not allowed for voice</string>
      <string name="mmcc_illegal_me">Phone not allowed for voice</string>
  
+     <!-- Title of notification when UE fails to register network with MM reject cause code when multiple SIMs are active. -->
+     <string name="mmcc_authentication_reject_msim_template">SIM <xliff:g id="simNumber" example="1">%d</xliff:g> not allowed</string>
+     <string name="mmcc_imsi_unknown_in_hlr_msim_template">SIM <xliff:g id="simNumber" example="1">%d</xliff:g> not provisioned</string>
+     <string name="mmcc_illegal_ms_msim_template">SIM <xliff:g id="simNumber" example="1">%d</xliff:g> not allowed</string>
+     <string name="mmcc_illegal_me_msim_template">SIM <xliff:g id="simNumber" example="1">%d</xliff:g> not allowed</string>
+ 
      <!-- Popup window default title to be read by a screen reader-->
      <string name="popup_window_default_title">Popup Window</string>
 +
 +    <!-- Format string for indicating there is more content in a slice view -->
 +    <string name="slice_more_content">+ <xliff:g id="number" example="5">%1$d</xliff:g></string>
 +
 +    <!--
 +    A toast message shown when an app shortcut that was restored from a previous device is clicked,
 +    but it cannot be started because the shortcut was created by a newer version of the app.
 +    -->
 +    <string name="shortcut_restored_on_lower_version">App version downgraded, or isn\u2019t compatible with this shortcut</string>
 +
 +    <!--
 +    A toast message shown when an app shortcut that was restored from a previous device is clicked,
 +    but it cannot be started because the shortcut was created by an app that doesn't support backup
 +    and restore.
 +    -->
 +    <string name="shortcut_restore_not_supported">Couldn\u2019t restore shortcut because app doesn\u2019t support backup and restore</string>
 +
 +    <!--
 +    A toast message shown when an app shortcut that was restored from a previous device is clicked,
 +    but it cannot be started because the shortcut was created by an app with a different signature.
 +    -->
 +    <string name="shortcut_restore_signature_mismatch">Couldn\u2019t restore shortcut because of app signature mismatch</string>
 +
 +    <!--
 +    A toast message shown when an app shortcut that wasn't restored due to an unknown issue is clicked,
 +    -->
 +    <string name="shortcut_restore_unknown_issue">Couldn\u2019t restore shortcut</string>
 +
 +    <!--
 +    A toast message shown when an app shortcut is disabled for an unknown rason.
 +    -->
 +    <string name="shortcut_disabled_reason_unknown">Shortcut is disabled</string>
 +
 +    <!--Battery saver warning. STOPSHIP: Remove it eventually. -->
 +    <string name="battery_saver_warning" translatable="false">\"Extreme\" battery saver activated.\n\nSee the details at: go/extreme-battery-saver\n\nEBS aggressively throttles background apps and changes screen-off behavior.\n</string>
 +
 +    <!--Battery saver warning. STOPSHIP: Remove it eventually. -->
 +    <string name="battery_saver_warning_title" translatable="false">Extreme battery saver</string>
 +
 +    <!-- Label for the uninstall button on the harmful app warning dialog. [CHAR LIMIT=20] -->
 +    <string name="harmful_app_warning_uninstall">UNINSTALL</string>
 +    <!-- Label for the open anyway button on the harmful app warning dialog. [CHAR LIMIT=20] -->
 +    <string name="harmful_app_warning_open_anyway">OPEN ANYWAY</string>
 +    <!-- Title for the harmful app warning dialog. [CHAR LIMIT=40] -->
 +    <string name="harmful_app_warning_title">Harmful app detected</string>
 +
 +    <!-- Text describing a permission request for one app to show another app's
 +         slices [CHAR LIMIT=NONE] -->
 +    <string name="slices_permission_request"><xliff:g id="app" example="Example App">%1$s</xliff:g> wants to show <xliff:g id="app_2" example="Other Example App">%2$s</xliff:g> slices</string>
 +
 +    <!-- Notification action for editing a screenshot (drawing on it, cropping it, etc) -->
 +    <string name="screenshot_edit">Edit</string>
 +
 +    <string name="volume_dialog_ringer_guidance_vibrate">Calls and notifications will vibrate</string>
 +    <string name="volume_dialog_ringer_guidance_silent">Calls and notifications will be muted</string>
 +
 +    <!-- Title for the notification channel notifying user of settings system changes. [CHAR LIMIT=NONE] -->
 +    <string name="notification_channel_system_changes">System changes</string>
 +    <!-- Title for the notification channel notifying user of do not disturb system changes (i.e. Do Not Disturb has changed). [CHAR LIMIT=NONE] -->
 +    <string name="notification_channel_do_not_disturb">Do Not Disturb</string>
 +    <!-- Title of notification indicating do not disturb visual interruption settings have changed when upgrading to P -->
 +    <string name="zen_upgrade_notification_visd_title">Do Not Disturb is hiding notifications to help you focus</string>
 +    <!-- Content of notification indicating users can tap on the notification to go to dnd behavior settings -->
 +    <string name="zen_upgrade_notification_visd_content">This is new behavior. Tap to change.</string>
 +    <!-- Title of notification indicating do not disturb settings have changed when upgrading to P -->
 +    <string name="zen_upgrade_notification_title">Do Not Disturb has changed</string>
 +    <!-- Content of notification indicating users can tap on the notification to go to dnd behavior settings -->
 +    <string name="zen_upgrade_notification_content">Tap to check what\'s blocked.</string>
 +
 +    <!-- Application name displayed in notifications [CHAR LIMIT=60] -->
 +    <string name="notification_app_name_system">System</string>
 +    <!-- Application name displayed in notifications [CHAR LIMIT=60] -->
 +    <string name="notification_app_name_settings">Settings</string>
  </resources>