Changeset 34ba659 in orbit for android/src

Timestamp:

03/04/13 11:52:33 (9 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, RawEEG, Raw_EEG_Plot, Servo, Tab_Interface, pyramid

Children:

8e8266b

Parents:

a763394

Message:

• updated interface for 1.2 release
• status images added

File:

• android/src/info/puzzlebox/orbit/OrbitActivity.java (moved) (moved from android/src/info/puzzlebox/orbit/MainActivity.java) (6 diffs)

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

@@ -58 +58 @@
 
 
-public class MainActivity extends Activity implements SeekBar.OnSeekBarChangeListener {
+public class OrbitActivity extends Activity implements SeekBar.OnSeekBarChangeListener {
 
         /**
@@ -79 +79 @@
         //      boolean DEBUG = true;
         boolean DEBUG = false;
-        String TAG = "MainActivity";
+        String TAG = "OrbitActivity";
 
 
@@ -89 +89 @@
          */
         int audioFile = R.raw.throttle_hover_android_common;
-//      int audioFile = R.raw.throttle_50_android_common;
+        //      int audioFile = R.raw.throttle_50_android_common;
         //      int audioFile = R.raw.throttle_hover_android_htc_one_x;
-//      String audioFilePath = "file:///sdcard/Music/Throttle/throttle_30_android_common.wav";
+        //      String audioFilePath = "file:///sdcard/Music/Throttle/throttle_30_android_common.wav";
 
         private SoundPool soundPool;
@@ -210 +210 @@
                 progressBarSignal.setProgress(tgSignal);
 
-                progressBarPower = (ProgressBar)findViewById(R.id.progressBarPower);
-                ShapeDrawable progressBarPowerDrawable = new ShapeDrawable(new RoundRectShape(roundedCorners, null,null));
-                String progressBarPowerColor = "#FFFF00";
-                progressBarPowerDrawable.getPaint().setColor(Color.parseColor(progressBarPowerColor));
-                ClipDrawable progressPower = new ClipDrawable(progressBarPowerDrawable, Gravity.LEFT, ClipDrawable.HORIZONTAL);
-                progressBarPower.setProgressDrawable(progressPower);   
-                progressBarPower.setBackgroundDrawable(getResources().getDrawable(android.R.drawable.progress_horizontal));
+                //              progressBarPower = (ProgressBar)findViewById(R.id.progressBarPower);
+                //              ShapeDrawable progressBarPowerDrawable = new ShapeDrawable(new RoundRectShape(roundedCorners, null,null));
+                //              String progressBarPowerColor = "#FFFF00";
+                //              progressBarPowerDrawable.getPaint().setColor(Color.parseColor(progressBarPowerColor));
+                //              ClipDrawable progressPower = new ClipDrawable(progressBarPowerDrawable, Gravity.LEFT, ClipDrawable.HORIZONTAL);
+                //              progressBarPower.setProgressDrawable(progressPower);   
+                //              progressBarPower.setBackgroundDrawable(getResources().getDrawable(android.R.drawable.progress_horizontal));
 
                 seekBarAttention = (SeekBar)findViewById(R.id.seekBarAttention);
@@ -250 +250 @@
                 });
                 soundID = soundPool.load(this, audioFile, 1);
-                
-//              soundPool.load(audioFilePath, 1);
+
+                //              soundPool.load(audioFilePath, 1);
 
                 //              genTone();
@@ -750 +750 @@
                 int new_speed = calculateSpeed();
                 String command = "";
-                progressBarPower.setProgress(new_speed);
+                //              progressBarPower.setProgress(new_speed);
 
                 if (new_speed > 0) {