Changeset 0997a39 in orbit for android

Timestamp:

12/19/13 23:33:55 (6 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo

Children:

34f56db

Parents:

90377aa

Message:

• 1.4.5 release

Location:

android

Files:

• res/layout/fragment_advanced.xml (modified) (1 diff)
• src/info/puzzlebox/orbit/FragmentTabAdvanced.java (modified) (5 diffs)

android/res/layout/fragment_advanced.xml

@@ -196 +196 @@
         </LinearLayout>
 
-<!--         <View
-            android:id="@+id/viewSpaceTiltSensorControl"
-            android:layout_width="5dp"
-            android:layout_height="0dp" >
-        </View>
- -->
-        <LinearLayout
-            android:id="@+id/layoutTiltSensorControl"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal" >
-
-            <View
-                android:layout_width="15dp"
-                android:layout_height="0dp" >
-            </View>
-
-            <CheckBox
-                android:id="@+id/checkBoxTiltSensorControl"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/checkbox_tilt_sensor_control" />
-        </LinearLayout>
-
         <View
             android:layout_width="10dp"
             android:layout_height="0dp" >
         </View>
-        
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/layoutTiltSensorControl"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal" >
+
+        <View
+            android:layout_width="25dp"
+            android:layout_height="0dp" >
+        </View>
+
+        <CheckBox
+            android:id="@+id/checkBoxTiltSensorControl"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/checkbox_tilt_sensor_control" />
     </LinearLayout>
 

android/src/info/puzzlebox/orbit/FragmentTabAdvanced.java

@@ -60 +60 @@
         int rightControlPitch = 31;
 
+        private float tiltX = 0;
+        private float tiltY = 0;
+        private float referenceTiltX = 0;
+        private float referenceTiltY = 0;
+
         /**
          * UI
@@ -84 +89 @@
         private SensorManager sensorManager;
         private Sensor orientationSensor = null;
-        private float tiltX = 0;
-        private float tiltY = 0;
 
 
@@ -465 +468 @@
 
                 } else {
-                        if (orientationSensor != null)
+                        if (orientationSensor != null) {
                                 sensorManager.unregisterListener(this);
+                                referenceTiltX = 0;
+                                referenceTiltY = 0;
+                        }
                 }
 
@@ -510 +516 @@
         public void onProgressChanged(SeekBar seekBar, int progress, boolean fromTouch) {
 
-                Log.v(TAG, "onProgressChanged");
+                //              Log.v(TAG, "onProgressChanged");
 
                 //                      updatePowerThresholds();
@@ -658 +664 @@
                 //              appendDebugConsole("X: " + tiltX + ", Y: " + tiltY + "\n");
 
-                seekBarYaw.setProgress(defaultControlYaw + (int) tiltY);
-                seekBarPitch.setProgress(defaultControlPitch + 10 + ((int) tiltX / 2));
-
+                if (referenceTiltX == 0) {
+                        referenceTiltX = tiltX;
+                        referenceTiltY = tiltY;
+                }
+
+                //              seekBarYaw.setProgress(defaultControlYaw + (int) tiltY);
+                //              seekBarPitch.setProgress(defaultControlPitch + 12 + ((int) tiltX / 2));
+                seekBarYaw.setProgress(defaultControlYaw + (int) (tiltY - referenceTiltY));
+                seekBarPitch.setProgress(defaultControlPitch + (int) ((tiltX / 2) - (referenceTiltX / 2)));