summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2013-12-19 18:09:10 -0800
committerAlan Viverette <alanv@google.com>2013-12-19 18:09:10 -0800
commit949ddad1a2d23e3e9336891a551a19bd6b5dd0ed (patch)
tree4950c95a639428fba5ee7bdaf50aa8156743720d
parent7983206661f065342767bb4141d7a924323b2933 (diff)
Support long-click during lift-to-type accessibility mode
BUG: 8310727 Change-Id: Icf9e103d2d6f5b5e7acb8c7f16244f0cebe9ffaa
-rw-r--r--res/values/strings.xml6
-rw-r--r--src/com/android/dialer/dialpad/DialpadFragment.java10
-rw-r--r--src/com/android/dialer/dialpad/DialpadKeyButton.java100
3 files changed, 110 insertions, 6 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a0376a6e0..b28c8eadf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -265,6 +265,12 @@
-->
<string name="description_image_button_pound">pound</string>
+ <!-- String describing the image on ImageButton plus
+
+ Used by AccessibilityService to announce the purpose of the button.
+ -->
+ <string name="description_image_button_plus">plus</string>
+
<!-- String describing the Voicemail ImageButton
Used by AccessibilityService to announce the purpose of the button.
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index 9a23812be..0d2337819 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -662,10 +662,16 @@ public class DialpadFragment extends Fragment
}
// Long-pressing one button will initiate Voicemail.
- fragmentView.findViewById(R.id.one).setOnLongClickListener(this);
+ final DialpadKeyButton one = (DialpadKeyButton) fragmentView.findViewById(R.id.one);
+ one.setOnLongClickListener(this);
+ one.setLongHoverContentDescription(
+ resources.getText(R.string.description_voicemail_button));
// Long-pressing zero button will enter '+' instead.
- fragmentView.findViewById(R.id.zero).setOnLongClickListener(this);
+ final DialpadKeyButton zero = (DialpadKeyButton) fragmentView.findViewById(R.id.zero);
+ zero.setOnLongClickListener(this);
+ zero.setLongHoverContentDescription(
+ resources.getText(R.string.description_image_button_plus));
}
diff --git a/src/com/android/dialer/dialpad/DialpadKeyButton.java b/src/com/android/dialer/dialpad/DialpadKeyButton.java
index 9a20993d6..1d5104c06 100644
--- a/src/com/android/dialer/dialpad/DialpadKeyButton.java
+++ b/src/com/android/dialer/dialpad/DialpadKeyButton.java
@@ -22,6 +22,7 @@ import android.os.Bundle;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;
+import android.view.ViewConfiguration;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityManager;
import android.view.accessibility.AccessibilityNodeInfo;
@@ -30,16 +31,46 @@ import android.widget.FrameLayout;
/**
* Custom class for dialpad buttons.
* <p>
- * This class implements lift-to-type interaction when touch exploration is
- * enabled.
+ * When touch exploration mode is enabled for accessibility, this class
+ * implements the lift-to-type interaction model:
+ * <ul>
+ * <li>Hovering over the button will cause it to gain accessibility focus
+ * <li>Removing the hover pointer while inside the bounds of the button will
+ * perform a click action
+ * <li>If long-click is supported, hovering over the button for a longer period
+ * of time will switch to the long-click action
+ * <li>Moving the hover pointer outside of the bounds of the button will restore
+ * to the normal click action
+ * <ul>
*/
public class DialpadKeyButton extends FrameLayout {
+ /** Timeout before switching to long-click accessibility mode. */
+ private static final int LONG_HOVER_TIMEOUT = ViewConfiguration.getLongPressTimeout() * 2;
+
/** Accessibility manager instance used to check touch exploration state. */
private AccessibilityManager mAccessibilityManager;
/** Bounds used to filter HOVER_EXIT events. */
private Rect mHoverBounds = new Rect();
+ /** Whether this view is currently in the long-hover state. */
+ private boolean mLongHovered;
+
+ /** Alternate content description for long-hover state. */
+ private CharSequence mLongHoverContentDesc;
+
+ /** Backup of standard content description. Used for accessibility. */
+ private CharSequence mBackupContentDesc;
+
+ /** Backup of clickable property. Used for accessibility. */
+ private boolean mWasClickable;
+
+ /** Backup of long-clickable property. Used for accessibility. */
+ private boolean mWasLongClickable;
+
+ /** Runnable used to trigger long-click mode for accessibility. */
+ private Runnable mLongHoverRunnable;
+
public interface OnPressedListener {
public void onPressed(View view, boolean pressed);
}
@@ -65,6 +96,23 @@ public class DialpadKeyButton extends FrameLayout {
Context.ACCESSIBILITY_SERVICE);
}
+ public void setLongHoverContentDescription(CharSequence contentDescription) {
+ mLongHoverContentDesc = contentDescription;
+
+ if (mLongHovered) {
+ super.setContentDescription(mLongHoverContentDesc);
+ }
+ }
+
+ @Override
+ public void setContentDescription(CharSequence contentDescription) {
+ if (mLongHovered) {
+ mBackupContentDesc = contentDescription;
+ } else {
+ super.setContentDescription(contentDescription);
+ }
+ }
+
@Override
public void setPressed(boolean pressed) {
super.setPressed(pressed);
@@ -102,13 +150,36 @@ public class DialpadKeyButton extends FrameLayout {
switch (event.getActionMasked()) {
case MotionEvent.ACTION_HOVER_ENTER:
// Lift-to-type temporarily disables double-tap activation.
+ mWasClickable = isClickable();
+ mWasLongClickable = isLongClickable();
+ if (mWasLongClickable && mLongHoverContentDesc != null) {
+ if (mLongHoverRunnable == null) {
+ mLongHoverRunnable = new Runnable() {
+ @Override
+ public void run() {
+ setLongHovered(true);
+ announceForAccessibility(mLongHoverContentDesc);
+ }
+ };
+ }
+ postDelayed(mLongHoverRunnable, LONG_HOVER_TIMEOUT);
+ }
+
setClickable(false);
+ setLongClickable(false);
break;
case MotionEvent.ACTION_HOVER_EXIT:
if (mHoverBounds.contains((int) event.getX(), (int) event.getY())) {
- simulateClickForAccessibility();
+ if (mLongHovered) {
+ performLongClick();
+ } else {
+ simulateClickForAccessibility();
+ }
}
- setClickable(true);
+
+ cancelLongHover();
+ setClickable(mWasClickable);
+ setLongClickable(mWasLongClickable);
break;
}
}
@@ -134,4 +205,25 @@ public class DialpadKeyButton extends FrameLayout {
setPressed(false);
}
+
+ private void setLongHovered(boolean enabled) {
+ if (mLongHovered != enabled) {
+ mLongHovered = enabled;
+
+ // Switch between normal and alternate description, if available.
+ if (enabled) {
+ mBackupContentDesc = getContentDescription();
+ super.setContentDescription(mLongHoverContentDesc);
+ } else {
+ super.setContentDescription(mBackupContentDesc);
+ }
+ }
+ }
+
+ private void cancelLongHover() {
+ if (mLongHoverRunnable != null) {
+ removeCallbacks(mLongHoverRunnable);
+ }
+ setLongHovered(false);
+ }
}