From 8e154d094fa1541ddad197523f4f973d3b70bb3d Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Tue, 15 Dec 2020 12:15:05 -0800
Subject: [PATCH] a11y fix: read emergency numbers as digits, not numbers.

Instead of reading as one hundred and ten, it should read as one-one-o.

Also make the number override dialog text input box a little bigger

Fix: 175517632
Fix: 175514672
Test: robotests
Change-Id: I7e3e823792f885004868ede790fc414a3fa66f01
---
 .../emergency_gesture_number_override_dialog.xml  |  3 ++-
 ...GestureNumberOverridePreferenceController.java | 15 +++++++++++++--
 ...ureNumberOverridePreferenceControllerTest.java |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/res/layout/emergency_gesture_number_override_dialog.xml b/res/layout/emergency_gesture_number_override_dialog.xml
index 6ac8ad0433f..429cff80fdd 100644
--- a/res/layout/emergency_gesture_number_override_dialog.xml
+++ b/res/layout/emergency_gesture_number_override_dialog.xml
@@ -32,7 +32,8 @@
             android:imeOptions="actionDone"
             android:inputType="numberSigned"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:minHeight="@dimen/min_tap_target_size"/>
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceController.java b/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceController.java
index 3dba3f0ac00..28e4154300d 100644
--- a/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceController.java
+++ b/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceController.java
@@ -21,6 +21,8 @@ import android.database.ContentObserver;
 import android.os.Handler;
 import android.os.Looper;
 import android.provider.Settings;
+import android.telephony.PhoneNumberUtils;
+import android.text.Spannable;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
@@ -69,8 +71,17 @@ public class EmergencyGestureNumberOverridePreferenceController extends BasePref
 
     @Override
     public CharSequence getSummary() {
-        return mContext.getString(R.string.emergency_gesture_call_for_help_summary,
-                mEmergencyNumberUtils.getPoliceNumber());
+        String number = mEmergencyNumberUtils.getPoliceNumber();
+        String summary = mContext.getString(R.string.emergency_gesture_call_for_help_summary,
+                number);
+        int numberStartIndex = summary.indexOf(number);
+        if (numberStartIndex < 0) {
+            return summary;
+        }
+        Spannable summarySpan = Spannable.Factory.getInstance().newSpannable(summary);
+        PhoneNumberUtils.addTtsSpan(summarySpan, numberStartIndex,
+                numberStartIndex + number.length());
+        return summarySpan;
     }
 
     @Override
diff --git a/tests/robotests/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceControllerTest.java
index 498c17b798e..80c10d0edc9 100644
--- a/tests/robotests/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceControllerTest.java
@@ -90,7 +90,7 @@ public class EmergencyGestureNumberOverridePreferenceControllerTest {
 
         mController.updateState(preference);
 
-        assertThat(preference.getSummary()).isEqualTo(
+        assertThat(preference.getSummary().toString()).isEqualTo(
                 mContext.getString(R.string.emergency_gesture_call_for_help_summary, "123"));
     }