am 0b6b0992: am 71352415: am ce6d9066: Merge "New window cling for immersive mode...

* commit '0b6b09929996f7b76210bedab281b93581af96ba':
  New window cling for immersive mode.

diff --cc core/res/res/values/strings.xml
index 6d91833,92a6e52..ca9436e
--- 1/core/res/res/values/strings.xml
--- 2/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@@ -4491,58 -4486,7 +4491,58 @@@
      <!-- PIN entry dialog tells the user to not enter a PIN for a while. [CHAR LIMIT=none] -->
      <string name="restr_pin_try_later">Try again later</string>
  
-     <!-- Toast bar message when hiding the transient navigation bar [CHAR LIMIT=45] -->
-     <string name="transient_navigation_confirmation">Swipe down from the top to exit full screen</string>
+     <!-- Cling help message when hiding the transient navigation bar [CHAR LIMIT=none] -->
+     <string name="transient_navigation_confirmation">Swipe down from the top to exit full screen.</string>
  
 +    <!-- Label for button to confirm chosen date or time [CHAR LIMIT=30] -->
 +    <string name="done_label">Done</string>
 +    <!--
 +         Content description for the hour selector in the time picker, which displays
 +         selectable hours of the day along the inside edge of a circle, as in an analog clock.
 +         [CHAR LIMIT=50]
 +    -->
 +    <string name="hour_picker_description">Hours circular slider</string>
 +    <!--
 +         Content description for the minute selector in the time picker, which displays
 +         selectable five-minute intervals along the inside edge of a circle, as in an analog clock.
 +         [CHAR LIMIT=50]
 +    -->
 +    <string name="minute_picker_description">Minutes circular slider</string>
 +    <!-- Accessibility announcement for hour circular picker [CHAR LIMIT=NONE] -->
 +    <string name="select_hours">Select hours</string>
 +    <!-- Accessibility announcement for minute circular picker [CHAR LIMIT=NONE] -->
 +    <string name="select_minutes">Select minutes</string>
 +
 +    <!--
 +        Content description for the month and day selector in the date picker, which displays
 +        a selectable grid of days laid out by month.
 +        [CHAR LIMIT=50]
 +     -->
 +    <string name="day_picker_description">Month grid of days</string>
 +    <!--
 +        Content description for the year selector in the date picker, which displays
 +        a scrolling, vertical list of years.
 +        [CHAR LIMIT=50]
 +     -->
 +    <string name="year_picker_description">Year list</string>
 +    <!-- Accessibility announcement for the day picker [CHAR LIMIT=NONE] -->
 +    <string name="select_day">Select month and day</string>
 +    <!-- Accessibility announcement for the year picker [CHAR LIMIT=NONE] -->
 +    <string name="select_year">Select year</string>
 +    <!-- Accessibility description for the item that is currently selected. -->
 +    <string name="item_is_selected"><xliff:g id="item" example="2013">%1$s</xliff:g> selected</string>
 +    <!-- Accessibility announcement when a number that had been typed in is deleted [CHAR_LIMIT=NONE] -->
 +    <string name="deleted_key"><xliff:g id="key" example="4">%1$s</xliff:g> deleted</string>
 +
 +    <!-- DO NOT TRANSLATE -->
 +    <string name="time_placeholder">--</string>
 +
 +    <!-- DO NOT TRANSLATE -->
 +    <string name="radial_numbers_typeface">sans-serif</string>
 +    <!-- DO NOT TRANSLATE -->
 +    <string name="sans_serif">sans-serif</string>
 +
 +    <!-- DO NOT TRANSLATE -->
 +    <string name="day_of_week_label_typeface">sans-serif</string>
 +
  </resources>

diff --cc core/res/res/values/symbols.xml
Simple merge