Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Increasing the tap radius for the handle in MultiWaveView to improve accessibility"

Browse Source
This commit is contained in:
Svetoslav Ganov
2011-09-06 14:08:48 -07:00
committed by Android (Google) Code Review
parent 1694dd095b 66b191dad0
commit 2f8dbf5722
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java
View File

@@ -79,6 +79,7 @@ public class MultiWaveView extends View {
private static final int HIDE_ANIMATION_DURATION = RETURN_TO_HOME_DELAY; private static final int HIDE_ANIMATION_DURATION = RETURN_TO_HOME_DELAY;
private static final int SHOW_ANIMATION_DURATION = 0; private static final int SHOW_ANIMATION_DURATION = 0;
private static final int SHOW_ANIMATION_DELAY = 0; private static final int SHOW_ANIMATION_DELAY = 0;
private static final float TAP_RADIUS_SCALE_ACCESSIBILITY_ENABLED = 1.3f;
private TimeInterpolator mChevronAnimationInterpolator = Ease.Quad.easeOut; private TimeInterpolator mChevronAnimationInterpolator = Ease.Quad.easeOut;
private ArrayList<TargetDrawable> mTargetDrawables = new ArrayList<TargetDrawable>(); private ArrayList<TargetDrawable> mTargetDrawables = new ArrayList<TargetDrawable>();
@@ -663,7 +664,7 @@ public class MultiWaveView extends View {
final float y = event.getY(); final float y = event.getY();
final float dx = x - mWaveCenterX; final float dx = x - mWaveCenterX;
final float dy = y - mWaveCenterY; final float dy = y - mWaveCenterY;
if (dist2(dx,dy) <= square(mTapRadius)) { if (dist2(dx,dy) <= getScaledTapRadiusSquared()) {
if (DEBUG) Log.v(TAG, "** Handle HIT"); if (DEBUG) Log.v(TAG, "** Handle HIT");
switchToState(STATE_FIRST_TOUCH, x, y); switchToState(STATE_FIRST_TOUCH, x, y);
moveHandleTo(x, y, false); moveHandleTo(x, y, false);
@@ -684,7 +685,7 @@ public class MultiWaveView extends View {
case MotionEvent.ACTION_HOVER_MOVE: case MotionEvent.ACTION_HOVER_MOVE:
final float dx = event.getX() - mWaveCenterX; final float dx = event.getX() - mWaveCenterX;
final float dy = event.getY() - mWaveCenterY; final float dy = event.getY() - mWaveCenterY;
if (dist2(dx,dy) <= square(mTapRadius)) { if (dist2(dx,dy) <= getScaledTapRadiusSquared()) {
if (!mWaveHovered) { if (!mWaveHovered) {
mWaveHovered = true; mWaveHovered = true;
final long timeSinceLastHoverExitMillis = final long timeSinceLastHoverExitMillis =
@@ -894,6 +895,16 @@ public class MultiWaveView extends View {
return dx*dx + dy*dy; return dx*dx + dy*dy;
} }
private float getScaledTapRadiusSquared() {
final float scaledTapRadius;
if (AccessibilityManager.getInstance(mContext).isEnabled()) {
scaledTapRadius = TAP_RADIUS_SCALE_ACCESSIBILITY_ENABLED * mTapRadius;
} else {
scaledTapRadius = mTapRadius;
}
return square(scaledTapRadius);
}
private void announceTargets() { private void announceTargets() {
StringBuilder utterance = new StringBuilder(); StringBuilder utterance = new StringBuilder();
final int targetCount = mTargetDrawables.size(); final int targetCount = mTargetDrawables.size();