Merge "Scale major axis when finger is oriented."

2011-02-16 15:30:54 -08:00
parent 8c5d38f85e c3451d4a44
commit b5fd7ae4ce
1 changed files with 5 additions and 3 deletions
--- a/services/input/InputReader.cpp
+++ b/services/input/InputReader.cpp
@@ -2641,9 +2641,11 @@ void TouchInputMapper::dispatchTouch(nsecs_t when, uint32_t policyFlags,
                int32_t c2 = signExtendNybble(in.orientation & 0x0f);
                if (c1 != 0 || c2 != 0) {
                    orientation = atan2f(c1, c2) * 0.5f;
-                    float minorAxisScale = (16.0f - pythag(c1, c2)) / 16.0f;
-                    toolMinor *= minorAxisScale;
-                    touchMinor *= minorAxisScale;
+                    float scale = 1.0f + pythag(c1, c2) / 16.0f;
+                    touchMajor *= scale;
+                    touchMinor /= scale;
+                    toolMajor *= scale;
+                    toolMinor /= scale;
                } else {
                    orientation = 0;
                }