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

Merge "Fixing off by one error in the ScreenMagnifier." into jb-mr1-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2012-09-07 17:34:01 -07:00
committed by Android (Google) Code Review
parent 72018294cc 2cee686498
commit 0458a69d4d
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/java/com/android/server/accessibility/ScreenMagnifier.java
View File

@@ -286,7 +286,11 @@ public final class ScreenMagnifier implements EventStreamTransformation {
private PointerCoords[] getTempPointerCoordsWithMinSize(int size) { private PointerCoords[] getTempPointerCoordsWithMinSize(int size) {
final int oldSize = (mTempPointerCoords != null) ? mTempPointerCoords.length : 0; final int oldSize = (mTempPointerCoords != null) ? mTempPointerCoords.length : 0;
if (oldSize < size) { if (oldSize < size) {
PointerCoords[] oldTempPointerCoords = mTempPointerCoords;
mTempPointerCoords = new PointerCoords[size]; mTempPointerCoords = new PointerCoords[size];
if (oldTempPointerCoords != null) {
System.arraycopy(oldTempPointerCoords, 0, mTempPointerCoords, 0, oldSize);
}
} }
for (int i = oldSize; i < size; i++) { for (int i = oldSize; i < size; i++) {
mTempPointerCoords[i] = new PointerCoords(); mTempPointerCoords[i] = new PointerCoords();
@@ -297,7 +301,11 @@ public final class ScreenMagnifier implements EventStreamTransformation {
private PointerProperties[] getTempPointerPropertiesWithMinSize(int size) { private PointerProperties[] getTempPointerPropertiesWithMinSize(int size) {
final int oldSize = (mTempPointerProperties != null) ? mTempPointerProperties.length : 0; final int oldSize = (mTempPointerProperties != null) ? mTempPointerProperties.length : 0;
if (oldSize < size) { if (oldSize < size) {
PointerProperties[] oldTempPointerProperties = mTempPointerProperties;
mTempPointerProperties = new PointerProperties[size]; mTempPointerProperties = new PointerProperties[size];
if (oldTempPointerProperties != null) {
System.arraycopy(oldTempPointerProperties, 0, mTempPointerProperties, 0, oldSize);
}
} }
for (int i = oldSize; i < size; i++) { for (int i = oldSize; i < size; i++) {
mTempPointerProperties[i] = new PointerProperties(); mTempPointerProperties[i] = new PointerProperties();
@@ -324,7 +332,7 @@ public final class ScreenMagnifier implements EventStreamTransformation {
Slog.i(LOG_TAG, "mCurrentState: STATE_PANNING"); Slog.i(LOG_TAG, "mCurrentState: STATE_PANNING");
} break; } break;
case STATE_DECIDE_PAN_OR_SCALE: { case STATE_DECIDE_PAN_OR_SCALE: {
Slog.i(LOG_TAG, "mCurrentState: STATE_DETECTING_PAN_OR_SCALE"); Slog.i(LOG_TAG, "mCurrentState: STATE_DECIDE_PAN_OR_SCALE");
} break; } break;
default: { default: {
throw new IllegalArgumentException("Unknown state: " + state); throw new IllegalArgumentException("Unknown state: " + state);
@@ -397,6 +405,7 @@ public final class ScreenMagnifier implements EventStreamTransformation {
} }
if (scaleDelta > DETECT_SCALING_THRESHOLD) { if (scaleDelta > DETECT_SCALING_THRESHOLD) {
performScale(detector, true); performScale(detector, true);
clear();
transitionToState(STATE_SCALING); transitionToState(STATE_SCALING);
return false; return false;
} }
@@ -409,8 +418,9 @@ public final class ScreenMagnifier implements EventStreamTransformation {
Slog.i(LOG_TAG, "panDelta: " + panDelta); Slog.i(LOG_TAG, "panDelta: " + panDelta);
} }
if (panDelta > mScaledDetectPanningThreshold) { if (panDelta > mScaledDetectPanningThreshold) {
transitionToState(STATE_PANNING);
performPan(detector, true); performPan(detector, true);
clear();
transitionToState(STATE_PANNING);
return false; return false;
} }
} break; } break;