Merge lp:~andreas-pokorny/mir/activate-pointer-acceleration into lp:mir

[Andreas Pokorny]

activate pointer acceleration and make it partially dependent on GU value ..

[lp:~andreas-pokorny/mir/activate-pointer-acceleration]

2332. By Andreas Pokorny on 2015-02-19

make sure that motion events are distant enough to be not subject of acceleration

Unmerged revisions

2332. By Andreas Pokorny on 2015-02-19

make sure that motion events are distant enough to be not subject of acceleration

2331. By Andreas Pokorny on 2015-02-19

fixing pointer accleration and making it GU dependent for now

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/VelocityControl.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/VelocityControl.cpp	2015-02-13 06:12:34 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/VelocityControl.cpp	2015-02-19 19:19:23 +0000
@@ -70,7 +70,7 @@
 
         float vx, vy;
         float scale = mParameters.scale;
-        if (mVelocityTracker.getVelocity(0, &vx, &vy)) {
+        if (mVelocityTracker.getVelocity(1, &vx, &vy)) {
             float speed = hypotf(vx, vy) * scale;
             if (speed >= mParameters.highThreshold) {
                 // Apply full acceleration above the high speed threshold.

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/VelocityTracker.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/VelocityTracker.cpp	2015-02-13 06:12:34 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/VelocityTracker.cpp	2015-02-19 19:19:23 +0000
@@ -65,36 +65,31 @@
 
 #if DEBUG_STRATEGY || DEBUG_VELOCITY
 static String8 vectorToString(const float* a, uint32_t m) {
-    String8 str;
-    str.append("[");
+    std::stringstream str;
+    str << '[';
     while (m--) {
-        str.appendFormat(" %f", *(a++));
-        if (m) {
-            str.append(",");
-        }
+        str << *a++;
+        if (m)
+            str << ',';
     }
-    str.append(" ]");
-    return str;
+    str << ']';
+    return str.str();
 }
 
 static String8 matrixToString(const float* a, uint32_t m, uint32_t n, bool rowMajor) {
-    String8 str;
-    str.append("[");
+    std::stringstream str;
+    str << '[';
     for (size_t i = 0; i < m; i++) {
-        if (i) {
-            str.append(",");
-        }
-        str.append(" [");
+        if (i) str << ',';
+        str << " [";
         for (size_t j = 0; j < n; j++) {
-            if (j) {
-                str.append(",");
-            }
-            str.appendFormat(" %f", a[rowMajor ? i * n + j : j * m + i]);
+            if (j) str << ',';
+            str << ' ' << a[rowMajor ? i * n + j : j * m + i];
         }
-        str.append(" ]");
+        str << " ]";
     }
-    str.append(" ]");
-    return str;
+    str << " ]";
+    return str.str();
 }
 #endif
 
@@ -249,11 +244,11 @@
                 "estimator (degree=%d, xCoeff=%s, yCoeff=%s, confidence=%f)",
                 id, positions[index].x, positions[index].y,
                 int(estimator.degree),
-                vectorToString(estimator.xCoeff, estimator.degree + 1).string(),
-                vectorToString(estimator.yCoeff, estimator.degree + 1).string(),
+                vectorToString(estimator.xCoeff, estimator.degree + 1).c_str(),
+                vectorToString(estimator.yCoeff, estimator.degree + 1).c_str(),
                 estimator.confidence);
         ++index;
-    }
+    });
 #endif
 }
 
@@ -436,8 +431,8 @@
         const float* w, uint32_t m, uint32_t n, float* outB, float* outDet) {
 #if DEBUG_STRATEGY
     ALOGD("solveLeastSquares: m=%d, n=%d, x=%s, y=%s, w=%s", int(m), int(n),
-            vectorToString(x, m).string(), vectorToString(y, m).string(),
-            vectorToString(w, m).string());
+            vectorToString(x, m).c_str(), vectorToString(y, m).c_str(),
+            vectorToString(w, m).c_str());
 #endif
 
     // Expand the X vector to a matrix A, pre-multiplied by the weights.
@@ -449,7 +444,7 @@
         }
     }
 #if DEBUG_STRATEGY
-    ALOGD("  - a=%s", matrixToString(&a[0][0], m, n, false /*rowMajor*/).string());
+    ALOGD("  - a=%s", matrixToString(&a[0][0], m, n, false /*rowMajor*/).c_str());
 #endif
 
     // Apply the Gram-Schmidt process to A to obtain its QR decomposition.
@@ -484,8 +479,8 @@
         }
     }
 #if DEBUG_STRATEGY
-    ALOGD("  - q=%s", matrixToString(&q[0][0], m, n, false /*rowMajor*/).string());
-    ALOGD("  - r=%s", matrixToString(&r[0][0], n, n, true /*rowMajor*/).string());
+    ALOGD("  - q=%s", matrixToString(&q[0][0], m, n, false /*rowMajor*/).c_str());
+    ALOGD("  - r=%s", matrixToString(&r[0][0], n, n, true /*rowMajor*/).c_str());
 
     // calculate QR, if we factored A correctly then QR should equal A
     float qr[n][m];
@@ -497,7 +492,7 @@
             }
         }
     }
-    ALOGD("  - qr=%s", matrixToString(&qr[0][0], m, n, false /*rowMajor*/).string());
+    ALOGD("  - qr=%s", matrixToString(&qr[0][0], m, n, false /*rowMajor*/).c_str());
 #endif
 
     // Solve R B = Qt W Y to find B.  This is easy because R is upper triangular.
@@ -514,7 +509,7 @@
         outB[i] /= r[i][i];
     }
 #if DEBUG_STRATEGY
-    ALOGD("  - b=%s", vectorToString(outB, n).string());
+    ALOGD("  - b=%s", vectorToString(outB, n).c_str());
 #endif
 
     // Calculate the coefficient of determination as 1 - (SSerr / SStot) where
@@ -598,10 +593,10 @@
             outEstimator->degree = degree;
             outEstimator->confidence = xdet * ydet;
 #if DEBUG_STRATEGY
-            ALOGD("estimate: degree=%d, xCoeff=%s, yCoeff=%s, confidence=%f",
+            ALOGD("estimate : degree=%d, xCoeff=%s, yCoeff=%s, confidence=%f",
                     int(outEstimator->degree),
-                    vectorToString(outEstimator->xCoeff, n).string(),
-                    vectorToString(outEstimator->yCoeff, n).string(),
+                    vectorToString(outEstimator->xCoeff, n).c_str(),
+                    vectorToString(outEstimator->yCoeff, n).c_str(),
                     outEstimator->confidence);
 #endif
             return true;

=== modified file 'src/server/input/android/android_input_reader_policy.cpp'
--- src/server/input/android/android_input_reader_policy.cpp	2015-01-21 07:34:50 +0000
+++ src/server/input/android/android_input_reader_policy.cpp	2015-02-19 19:19:23 +0000
@@ -22,6 +22,8 @@
 #include "mir/input/input_region.h"
 #include "mir/geometry/rectangle.h"
 
+#include <sstream>
+
 namespace mi = mir::input;
 namespace mia = mir::input::android;
 
@@ -50,8 +52,20 @@
         height,
         default_display_orientation);
 
-    out_config->pointerVelocityControlParameters.acceleration = 1.0;
-    
+    auto gu_scale = 16.0f;
+    auto gu_env = getenv("GRID_UNIT_PX");
+
+    if (gu_env)
+    {
+        std::istringstream in(gu_env);
+        in >> gu_scale;
+    }
+
+    out_config->pointerVelocityControlParameters.lowThreshold = 150.0f;
+    out_config->pointerVelocityControlParameters.highThreshold = 500.0f;
+    out_config->pointerVelocityControlParameters.acceleration = 3.0f + gu_scale/16.0f;
+    out_config->wheelVelocityControlParameters.acceleration = 4.0f + gu_scale/16.0f;
+
     // This only enables passing through the touch coordinates from the InputReader to the TouchVisualizer
     // the touch visualizer still decides whether or not to render anything.
     out_config->showTouches = true;

=== modified file 'tests/mir_test_doubles/fake_event_hub.cpp'
--- tests/mir_test_doubles/fake_event_hub.cpp	2015-02-13 06:12:34 +0000
+++ tests/mir_test_doubles/fake_event_hub.cpp	2015-02-19 19:19:23 +0000
@@ -531,7 +531,9 @@
 void FakeEventHub::synthesize_event(const mis::MotionParameters &parameters)
 {
     RawEvent event;
-    event.when = std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch());
+    static auto time = std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::system_clock::now().time_since_epoch());
+    time += std::chrono::seconds(1);
+    event.when = time;
     event.type = EV_REL;
     if (parameters.device_id)
         event.deviceId = parameters.device_id;