diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/dialer/dialpad/DialpadFragment.java | 10 | ||||
| -rw-r--r-- | src/com/android/dialer/dialpad/DialpadKeyButton.java | 100 |
2 files changed, 104 insertions, 6 deletions
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); + } } |