Implement QAccelerometer accelerationModev5.3.0-beta1

The Qt API does not expose Linear Accel and Gravity as separate sensor types,
they are different versions of QAccelerometer, accessed by modifying the
accelerationMode property. The possible values are Combined, User, and Gravity, which
correspond to Acceleration, Linear Acceleration, and Gravity respectively. When
constructing the accelerometer backend, the accelerationMode must be queried. The
backend must also connect to the accelerationModeChanged signal from the QAccelerometer.

I think that the existing implementation of QSensors on Android assumes that there is a
one-to-one correspondence between QSensors and AndroidSensorTypes. To fix this assumption,
I promoted the m_type attribute of androidcommonsensor.h from private to protected so
that a sensor backend can update the Android sensor being used.

Task-number: QTBUG-30531
Change-Id: I842d2485109542f74731d179e2720ea55fa248cc
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/src/plugins/sensors/android/src/androidaccelerometer.h b/src/plugins/sensors/android/src/androidaccelerometer.h
index 31363014..4eb7471e 100644
--- a/src/plugins/sensors/android/src/androidaccelerometer.h
+++ b/src/plugins/sensors/android/src/androidaccelerometer.h
@@ -47,13 +47,18 @@
 
 class AndroidAccelerometer : public AndroidCommonSensor<QAccelerometerReading>
 {
+    Q_OBJECT
+
 public:
     AndroidAccelerometer(AndroidSensors::AndroidSensorType type, QSensor *sensor);
-
+    static AndroidSensors::AndroidSensorType modeToSensor(QAccelerometer::AccelerationMode mode);
 private:
     void onAccuracyChanged(jint accuracy) Q_DECL_OVERRIDE;
     void onSensorChanged(jlong timestamp, const jfloat *values, uint size) Q_DECL_OVERRIDE;
 
+private Q_SLOTS:
+    void applyAccelerationMode();
+
 };
 
 #endif // ANDROIDACCELEROMETER_H