Changeset dcf6979 in orbit for android/src

Timestamp:

01/30/14 10:54:30 (9 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo

Children:

bdd316c

Parents:

a2742af

Message:

• Updated to version 1.4.9.1
• Fixed bug with "Tilt Sensor Control" becoming stuck

Location:

android/src/info/puzzlebox/orbit

Files:

• FragmentTabAdvanced.java (modified) (3 diffs)
• OrbitTabActivity.java (modified) (2 diffs)

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

@@ -550 +550 @@
                 // This is necessary for the onPause/onResume functions which don't receive a View
 
-                onCheckBoxTiltSensorControlClicked();
-
-                if (checkBoxTiltSensorControl.isChecked())
+                Log.v(TAG, "onCheckBoxTiltSensorControlClicked");
+
+                onCheckBoxTiltSensorControlClicked(); // call the full method (this version is the View method called by GUI)
+
+                if (checkBoxTiltSensorControl.isChecked()) {
                         checkBoxTiltSensorControlThrottle.setVisibility(View.VISIBLE);
-                else
+                        Log.v(TAG, "checkBoxTiltSensorControlThrottle.setVisibility(View.VISIBLE)");
+                } else {
                         checkBoxTiltSensorControlThrottle.setVisibility(View.GONE);
-
-        }
+                        Log.v(TAG, "checkBoxTiltSensorControlThrottle.setVisibility(View.GONE)");
+                }
+
+        } // onCheckBoxTiltSensorControlClicked(View view)
 
 
@@ -641 +646 @@
                 referenceTiltY = 0;
 
-                if ((checkBoxTiltSensorControlThrottle.isChecked()) &&
-                                (! checkBoxTiltSensorControl.isChecked())) {
-                        checkBoxTiltSensorControl.setChecked(true);
-                }
+                Log.v(TAG, "onCheckBoxTiltSensorControlThrottleClicked");
+
+                
+                // Disabled due to problems with "Tilt Sensor Control" becoming stuck checked
+                //              if ((checkBoxTiltSensorControlThrottle.isChecked()) &&
+                //                              (! checkBoxTiltSensorControl.isChecked())) {
+                //                      checkBoxTiltSensorControl.setChecked(true);
+                //              }
+
+
+                if (checkBoxTiltSensorControl.isChecked()) {
+                        checkBoxTiltSensorControlThrottle.setVisibility(View.VISIBLE);
+                        Log.v(TAG, "checkBoxTiltSensorControlThrottle.setVisibility(View.VISIBLE)");
+                } else {
+                        checkBoxTiltSensorControlThrottle.setVisibility(View.GONE);
+                        Log.v(TAG, "checkBoxTiltSensorControlThrottle.setVisibility(View.GONE)");
+                }
+
 
         } // checkBoxTiltSensorControlThrottleClicked
@@ -857 +876 @@
 
         public void registerControlledDescent() {
-                
+
                 Log.v(TAG, "registerControlledDescent()");
 

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

@@ -281 +281 @@
                  */
 
-                maximizeAudioVolume(); // Automatically set media volume to maximum
+                // TODO Testing DroidDNA
+//              maximizeAudioVolume(); // Automatically set media volume to maximum
 
                 /** Set the hardware buttons to control the audio output */
@@ -810 +811 @@
                                 //                              soundPool.setVolume(soundID, 1f, 1f);
                                 //                              soundPool.play(soundID, maxVolume, maxVolume, 1, 0, 1f); // Fixes Samsung Galaxy S4 [SGH-M919]
+
                                 soundPool.play(soundID, 1f, 1f, 1, 0, 1f); // Fixes Samsung Galaxy S4 [SGH-M919]
+
+                                // TODO No visible effects of changing these variables on digital oscilloscope
+                                //                              soundPool.play(soundID, 0.5f, 0.5f, 1, 0, 0.5f);
                                 if (DEBUG)
                                         Log.v(TAG, "Played sound");