am 2391e326: am d796a728: am 25ffc7ad: Accessibility: Read the time correctly in quick settings.

* commit '2391e3262e7441269caaef64c8780dd798e3a952':
  Accessibility: Read the time correctly in quick settings.

core/java/android/widget/TextClock.java

@@ -120,12 +120,16 @@ public class TextClock extends TextView {
 
     private CharSequence mFormat12;
     private CharSequence mFormat24;
+    private CharSequence mDescFormat12;
+    private CharSequence mDescFormat24;
 
     @ExportedProperty
     private CharSequence mFormat;
     @ExportedProperty
     private boolean mHasSeconds;
 
+    private CharSequence mDescFormat;
+
     private boolean mAttached;
 
     private Calendar mTime;
@@ -300,6 +304,17 @@ public class TextClock extends TextView {
         onTimeChanged();
     }
 
+    /**
+     * Like setFormat12Hour, but for the content description.
+     * @hide
+     */
+    public void setContentDescriptionFormat12Hour(CharSequence format) {
+        mDescFormat12 = format;
+
+        chooseFormat();
+        onTimeChanged();
+    }
+
     /**
      * Returns the formatting pattern used to display the date and/or time
      * in 24-hour mode. The formatting pattern syntax is described in
@@ -347,6 +362,17 @@ public class TextClock extends TextView {
         onTimeChanged();
     }
 
+    /**
+     * Like setFormat24Hour, but for the content description.
+     * @hide
+     */
+    public void setContentDescriptionFormat24Hour(CharSequence format) {
+        mDescFormat24 = format;
+
+        chooseFormat();
+        onTimeChanged();
+    }
+
     /**
      * Sets whether this clock should always track the current user and not the user of the
      * current process. This is used for single instance processes like the systemUI who need
@@ -460,8 +486,10 @@ public class TextClock extends TextView {
 
         if (format24Requested) {
             mFormat = abc(mFormat24, mFormat12, ld.timeFormat_Hm);
+            mDescFormat = abc(mDescFormat24, mDescFormat12, mFormat);
         } else {
             mFormat = abc(mFormat12, mFormat24, ld.timeFormat_hm);
+            mDescFormat = abc(mDescFormat12, mDescFormat24, mFormat);
         }
 
         boolean hadSeconds = mHasSeconds;
@@ -547,6 +575,7 @@ public class TextClock extends TextView {
     private void onTimeChanged() {
         mTime.setTimeInMillis(System.currentTimeMillis());
         setText(DateFormat.format(mFormat, mTime));
+        setContentDescription(DateFormat.format(mDescFormat, mTime));
     }
 
     /** @hide */

packages/SystemUI/res/layout/split_clock_view.xml

@@ -35,6 +35,7 @@
         android:singleLine="true"
         android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Clock"
         android:textSize="@dimen/qs_time_collapsed_size"
+        android:importantForAccessibility="no"
         />
 
     <!-- Empty text view so we have the same height when expanded/collapsed-->
@@ -46,4 +47,4 @@
         android:singleLine="true"
         android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Clock"
         />
-</com.android.systemui.statusbar.policy.SplitClockView>
+</com.android.systemui.statusbar.policy.SplitClockView>

packages/SystemUI/src/com/android/systemui/statusbar/policy/SplitClockView.java

@@ -101,6 +101,8 @@ public class SplitClockView extends LinearLayout {
         }
         mTimeView.setFormat12Hour(timeString);
         mTimeView.setFormat24Hour(timeString);
+        mTimeView.setContentDescriptionFormat12Hour(formatString);
+        mTimeView.setContentDescriptionFormat24Hour(formatString);
         mAmPmView.setFormat12Hour(amPmString);
         mAmPmView.setFormat24Hour(amPmString);
     }