Merge "Update "Change keyboard" settings UI."

diff --combined core/res/res/values/strings.xml
index 258c5d9,01f4227..eebdd61
--- 1/core/res/res/values/strings.xml
--- 2/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@@ -493,18 -493,23 +493,18 @@@
          time from starting the bug report until it is ready to be sent; please be
          patient.</string>
      <!-- Title in the bugreport dialog for the interactive workflow. [CHAR LIMIT=20] -->
 -    <!-- DO NOT TRANSLATE YET: final phrasing still being discussed -->
      <string name="bugreport_option_interactive_title">Interactive report</string>
      <!-- Summary in the bugreport dialog for the interactive workflow. [CHAR LIMIT=NONE] -->
 -    <!-- DO NOT TRANSLATE YET: final phrasing still being discussed -->
      <string name="bugreport_option_interactive_summary">Use this under most circumstances.
          It allows you to track progress of the report and enter more details about the problem.
          It might omit some less-used sections that take a long time to report.</string>
      <!-- Title in the bugreport dialog for the full workflow. [CHAR LIMIT=20] -->
 -    <!-- DO NOT TRANSLATE YET: final phrasing still being discussed -->
      <string name="bugreport_option_full_title">Full report</string>
      <!-- Summary in the bugreport dialog for the full workflow. [CHAR LIMIT=20] -->
 -    <!-- DO NOT TRANSLATE YET: final phrasing still being discussed -->
      <string name="bugreport_option_full_summary">Use this option for minimal interference when
          your device is unresponsive or too slow, or when you need all sections.
          Does not take a screenshot or allow you to enter more details.</string>
      <!--  Toast message informing user in how many seconds a bugreport screenshot will be taken -->
 -    <!-- DO NOT TRANSLATE YET: final phrasing still being discussed -->
      <plurals name="bugreport_countdown">
          <item quantity="one">Taking screenshot for bug report in <xliff:g id="number">%d</xliff:g> second.</item>
          <item quantity="other">Taking screenshot for bug report in <xliff:g id="number">%d</xliff:g> seconds.</item>
@@@ -2919,10 -2924,10 +2919,10 @@@
      <!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] -->
      <string name="configure_input_methods">Choose keyboards</string>
      <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical
-          keyboard is connected[CHAR LIMIT=25] -->
-     <string name="show_ime">Show input method</string>
-     <!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=10] -->
-     <string name="hardware">Hardware</string>
+          keyboard is connected -->
+     <string name="show_ime">Keep it on screen while physical keyboard is active</string>
+     <!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=30] -->
+     <string name="hardware">Show virtual keyboard</string>
  
      <!-- Title of the notification to prompt the user to select a keyboard layout. -->
      <string name="select_keyboard_layout_notification_title">Select keyboard layout</string>
@@@ -4146,22 -4151,4 +4146,22 @@@
      <string name="user_creation_account_exists"><b><xliff:g id="app" example="Gmail">%1$s</xliff:g></b> is trying to add a new user, but the account <b><xliff:g id="account" example="foobar">%2$s</xliff:g></b> already exists on this device. Proceed anyway?</string>
      <!-- Message to user that app is trying to create user for a specified account. [CHAR LIMIT=none] -->
      <string name="user_creation_adding"><b><xliff:g id="app" example="Gmail">%1$s</xliff:g></b> is trying to add a new user for the account <b><xliff:g id="account" example="foobar">%2$s</xliff:g></b>. Proceed?</string>
 +
 +    <!-- Locale picker strings -->
 +
 +    <!-- Title for the language selection screen [CHAR LIMIT=25] -->
 +    <string name="language_selection_title">Language preference</string>
 +    <!-- Title for the region selection screen [CHAR LIMIT=25] -->
 +    <string name="country_selection_title">Region preference</string>
 +    <!-- Hint text in a search edit box (used to filter long language / country lists) [CHAR LIMIT=20] -->
 +    <string name="search_language_hint">Type language name</string>
 +
 +    <!-- List section subheader for the language picker, containing a list of suggested languages determined by the default region [CHAR LIMIT=30] -->
 +    <string name="language_picker_section_suggested">Suggested</string>
 +    <!-- List section subheader for the language picker, containing a list of all languages available [CHAR LIMIT=30] -->
 +    <string name="language_picker_section_all">All languages</string>
 +
 +    <!-- Menu item in the locale menu  [CHAR LIMIT=30] -->
 +    <string name="locale_search_menu">Search</string>
 +
  </resources>