am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial

* commit '456b866c09f88d4fd15c9650d2ee882be9dca8ec':
  Fix bad string in EncryptionInterstitial

diff --combined res/values/strings.xml
index 6aab05a,037dd8f..e188645
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -3810,22 -3810,22 +3810,22 @@@
      <!-- Display time remaining until battery is charged [CHAR_LIMIT=60] -->
      <string name="power_charge_remaining"><xliff:g id="until_charged">%1$s</xliff:g> to charge</string>
      <!-- [CHAR_LIMIT=40] Label for battery level chart when discharging with duration -->
 -    <string name="power_discharging_duration"><xliff:g id="level">%1$d</xliff:g>%%
 +    <string name="power_discharging_duration"><xliff:g id="level">%1$s</xliff:g>
              - approx. <xliff:g id="time">%2$s</xliff:g> left</string>
      <!-- [CHAR_LIMIT=40] Label for battery level chart when charging -->
 -    <string name="power_charging"><xliff:g id="level">%1$d</xliff:g>%% -
 +    <string name="power_charging"><xliff:g id="level">%1$s</xliff:g> -
              <xliff:g id="state">%2$s</xliff:g></string>
      <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
 -    <string name="power_charging_duration"><xliff:g id="level">%1$d</xliff:g>%% -
 +    <string name="power_charging_duration"><xliff:g id="level">%1$s</xliff:g> -
              <xliff:g id="time">%2$s</xliff:g> until full</string>
      <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
 -    <string name="power_charging_duration_ac"><xliff:g id="level">%1$d</xliff:g>%% -
 +    <string name="power_charging_duration_ac"><xliff:g id="level">%1$s</xliff:g> -
              <xliff:g id="time">%2$s</xliff:g> until full on AC</string>
      <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
 -    <string name="power_charging_duration_usb"><xliff:g id="level">%1$d</xliff:g>%% -
 +    <string name="power_charging_duration_usb"><xliff:g id="level">%1$s</xliff:g> -
              <xliff:g id="time">%2$s</xliff:g> until full over USB</string>
      <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
 -    <string name="power_charging_duration_wireless"><xliff:g id="level">%1$d</xliff:g>%% -
 +    <string name="power_charging_duration_wireless"><xliff:g id="level">%1$s</xliff:g> -
              <xliff:g id="time">%2$s</xliff:g> until full from wireless</string>
      <!-- [CHAR_LIMIT=40] Label for list of apps using battery in power use UI -->
      <string name="power_usage_list_summary">Use since last full charge</string>
@@@ -3857,6 -3857,9 +3857,6 @@@
      <string name="wifi_on_time">Wi\u2011Fi on time</string>
      <!-- Bluetooth on time -->
      <string name="bluetooth_on_time">Wi\u2011Fi on time</string>
 -    <!-- Application name and battery usage percentage -->
 -    <string name="usage_name_percent"><xliff:g id="name">%1$s</xliff:g>" - "
 -            <xliff:g id="number" example="30">%2$s</xliff:g><xliff:g id="percent" example="%">%%</xliff:g></string>
  
      <!-- Activity title for battery usage history details -->
      <string name="history_details_title">History details</string>
@@@ -4024,7 -4027,7 +4024,7 @@@
      <string name="battery_saver_turn_on_automatically_never">Never</string>
  
      <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
 -    <string name="battery_saver_turn_on_automatically_pct">at %1$d%% battery</string>
 +    <string name="battery_saver_turn_on_automatically_pct">at %1$s battery</string>
  
      <!-- Process Stats strings -->
      <skip />
@@@ -5972,12 -5975,12 +5972,12 @@@
     <string name="encrypt_talkback_dialog_require_password">Require password?</string>
  
     <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
-    <string name="encrypt_talkback_dialog_message_pin">When you enter your PIN to start this device, accessibility services like Talkback won\'t yet be available.</string>
+    <string name="encrypt_talkback_dialog_message_pin">When you enter your PIN to start this device, accessibility services like <xliff:g id="service" example="TalkBack">%1$s</xliff:g> won\'t yet be available.</string>
  
     <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
-    <string name="encrypt_talkback_dialog_message_pattern">When you enter your pattern to start this device, accessibility services like Talkback won\'t yet be available.</string>
+    <string name="encrypt_talkback_dialog_message_pattern">When you enter your pattern to start this device, accessibility services like <xliff:g id="service" example="TalkBack">%1$s</xliff:g> won\'t yet be available.</string>
  
     <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
-    <string name="encrypt_talkback_dialog_message_password">When you enter your password to start this device, accessibility services like Talkback won\'t yet be available.</string>
+    <string name="encrypt_talkback_dialog_message_password">When you enter your password to start this device, accessibility services like <xliff:g id="service" example="TalkBack">%1$s</xliff:g> won\'t yet be available.</string>
  
  </resources>