Changeset 34f56db in orbit for android/src

Timestamp:

12/20/13 22:13:47 (8 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo

Children:

6b13b7f

Parents:

0997a39

Message:

• Production release 1.4.5
• layout tweaks to center tilt steering checkbox

Location:

android/src/info/puzzlebox/orbit

Files:

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

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

@@ -82 +82 @@
         RadioButton radioButtonChannelB;
         RadioButton radioButtonChannelC;
+        View viewSpaceRadioGroupChannel;
 
         TextView tv;
@@ -177 +178 @@
                 radioGroupChannel.check(0);
 
-                radioGroupChannel.setVisibility(View.GONE); // TODO Hide for now as is currently not working
-
-
                 viewSpaceGenerateAudio = (View) v.findViewById(R.id.viewSpaceGenerateAudio);
 
@@ -191 +189 @@
                 checkBoxTiltSensorControl.setOnClickListener(this);
 
+
+                // TODO Hide and adjust layout for now as Channel selection currently not working
+                radioGroupChannel.setVisibility(View.GONE);
+                viewSpaceRadioGroupChannel = (View) v.findViewById(R.id.viewSpaceRadioGroupChannel);
+                //              viewSpaceRadioGroupChannel.setVisibility(View.GONE);
+                android.view.ViewGroup.LayoutParams layoutParams = viewSpaceRadioGroupChannel.getLayoutParams();
+                layoutParams.width = 5;
+                viewSpaceRadioGroupChannel.setLayoutParams(layoutParams);
 
 
@@ -349 +355 @@
         public void updateScreenLayoutSmall() {
 
-                radioGroupChannel.setVisibility(View.GONE);
-                //              checkBoxAdvancedOptions.setText("Advanced");
-
-                //              checkBoxGenerateAudio.setText("Generate Signal");
-                //              checkBoxInvertControlSignal.setText("Invert Signal");
+                //              radioGroupChannel.setVisibility(View.GONE);
+                //              //              checkBoxAdvancedOptions.setText("Advanced");
+                //
+                //              //              checkBoxGenerateAudio.setText("Generate Signal");
+                //              //              checkBoxInvertControlSignal.setText("Invert Signal");
 
                 String generateSignalLabel = getResources().getString(R.string.checkbox_generate_audio_small);
@@ -403 +409 @@
                 ((OrbitTabActivity)getActivity()).generateAudio = checkBoxGenerateAudio.isChecked();
 
-                if ( ((OrbitTabActivity)getActivity()).generateAudio )
+                if ( ((OrbitTabActivity)getActivity()).generateAudio ) {
                         checkBoxInvertControlSignal.setVisibility(View.VISIBLE);
-                else
+                        checkBoxTiltSensorControl.setVisibility(View.VISIBLE);
+                } else {
                         checkBoxInvertControlSignal.setVisibility(View.GONE);
+                        checkBoxTiltSensorControl.setVisibility(View.GONE);
+                }
 
 
@@ -428 +437 @@
         // ################################################################
 
+        @SuppressWarnings("deprecation")
         public void onCheckBoxTiltSensorControlClicked(View view) {
 
@@ -505 +515 @@
                 ////                    viewSpaceGenerateAudio.setLayoutParams(layoutParams);
                 //
-                //              }
+                //              }               
 
                 tv.setVisibility(View.VISIBLE);

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

@@ -94 +94 @@
         Configuration config;
 
-        int viewSpaceGenerateAudioWidth = 120;
+//      int viewSpaceGenerateAudioWidth = 120;
 
         String saveToAdvanced = null;
@@ -650 +650 @@
         public void updateScreenLayoutSmall() {
 
-                @SuppressWarnings("deprecation")
-                int width = getWindowManager().getDefaultDisplay().getWidth();
+//              @SuppressWarnings("deprecation")
+//              int width = getWindowManager().getDefaultDisplay().getWidth();
                 //              int height = getWindowManager().getDefaultDisplay().getHeight();
 
-                viewSpaceGenerateAudioWidth = width / 4; // approximate center of screen
+//              viewSpaceGenerateAudioWidth = width / 4; // approximate center of screen
 
                 if (eegDevice == "ThinkGear") {