Talkback read heading content of dialpad page.
To add pane titles for emergency shortcut buttons page and emergency
dialpad page. The accessibility service would auto focus to the
heading.
Test: Manually
Change-Id: I274634eccf6b4ce11a1e419a2b7e49ac4346a4f0
Fixes: 111891667
diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index 7e5b1ce..7d20dc5 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -61,8 +61,10 @@
import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View;
+import android.view.View.AccessibilityDelegate;
import android.view.ViewGroup;
import android.view.WindowManager;
+import android.view.accessibility.AccessibilityEvent;
import android.widget.TextView;
import com.android.internal.colorextraction.ColorExtractor;
@@ -173,6 +175,30 @@
}
};
+ /**
+ * Customize accessibility methods in View.
+ */
+ private AccessibilityDelegate mAccessibilityDelegate = new AccessibilityDelegate() {
+
+ /**
+ * Stop AccessiblityService from reading the title of a hidden View.
+ *
+ * <p>The crossfade animation will set the visibility of fade out view to {@link View.GONE}
+ * in the animation end. The view with an accessibility pane title would call the
+ * {@link AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED} event, which would trigger the
+ * accessibility service to read the pane title of fade out view instead of pane title of
+ * fade in view. So it need to filter out the event called by vanished pane.
+ */
+ @Override
+ public void onPopulateAccessibilityEvent(View host, AccessibilityEvent event) {
+ if (event.getEventType() == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED
+ && host.getVisibility() == View.GONE) {
+ return;
+ }
+ super.onPopulateAccessibilityEvent(host, event);
+ }
+ };
+
private String mLastNumber; // last number we tried to dial. Used to restore error dialog.
// Background gradient
@@ -927,6 +953,9 @@
mEmergencyShortcutView = findViewById(R.id.emergency_dialer_shortcuts);
mDialpadView = findViewById(R.id.emergency_dialer);
+ mEmergencyShortcutView.setAccessibilityDelegate(mAccessibilityDelegate);
+ mDialpadView.setAccessibilityDelegate(mAccessibilityDelegate);
+
final View dialpadButton = findViewById(R.id.floating_action_button_dialpad);
dialpadButton.setOnClickListener(this);