Changeset 34ba659 in orbit for android/src


Ignore:
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:
1 moved

Legend:

Unmodified
Added
Removed
  • android/src/info/puzzlebox/orbit/OrbitActivity.java

    rcb6dab1 r34ba659  
    5858 
    5959 
    60 public class MainActivity extends Activity implements SeekBar.OnSeekBarChangeListener { 
     60public class OrbitActivity extends Activity implements SeekBar.OnSeekBarChangeListener { 
    6161 
    6262        /** 
     
    7979        //      boolean DEBUG = true; 
    8080        boolean DEBUG = false; 
    81         String TAG = "MainActivity"; 
     81        String TAG = "OrbitActivity"; 
    8282 
    8383 
     
    8989         */ 
    9090        int audioFile = R.raw.throttle_hover_android_common; 
    91 //      int audioFile = R.raw.throttle_50_android_common; 
     91        //      int audioFile = R.raw.throttle_50_android_common; 
    9292        //      int audioFile = R.raw.throttle_hover_android_htc_one_x; 
    93 //      String audioFilePath = "file:///sdcard/Music/Throttle/throttle_30_android_common.wav"; 
     93        //      String audioFilePath = "file:///sdcard/Music/Throttle/throttle_30_android_common.wav"; 
    9494 
    9595        private SoundPool soundPool; 
     
    210210                progressBarSignal.setProgress(tgSignal); 
    211211 
    212                 progressBarPower = (ProgressBar)findViewById(R.id.progressBarPower); 
    213                 ShapeDrawable progressBarPowerDrawable = new ShapeDrawable(new RoundRectShape(roundedCorners, null,null)); 
    214                 String progressBarPowerColor = "#FFFF00"; 
    215                 progressBarPowerDrawable.getPaint().setColor(Color.parseColor(progressBarPowerColor)); 
    216                 ClipDrawable progressPower = new ClipDrawable(progressBarPowerDrawable, Gravity.LEFT, ClipDrawable.HORIZONTAL); 
    217                 progressBarPower.setProgressDrawable(progressPower);    
    218                 progressBarPower.setBackgroundDrawable(getResources().getDrawable(android.R.drawable.progress_horizontal)); 
     212                //              progressBarPower = (ProgressBar)findViewById(R.id.progressBarPower); 
     213                //              ShapeDrawable progressBarPowerDrawable = new ShapeDrawable(new RoundRectShape(roundedCorners, null,null)); 
     214                //              String progressBarPowerColor = "#FFFF00"; 
     215                //              progressBarPowerDrawable.getPaint().setColor(Color.parseColor(progressBarPowerColor)); 
     216                //              ClipDrawable progressPower = new ClipDrawable(progressBarPowerDrawable, Gravity.LEFT, ClipDrawable.HORIZONTAL); 
     217                //              progressBarPower.setProgressDrawable(progressPower);    
     218                //              progressBarPower.setBackgroundDrawable(getResources().getDrawable(android.R.drawable.progress_horizontal)); 
    219219 
    220220                seekBarAttention = (SeekBar)findViewById(R.id.seekBarAttention); 
     
    250250                }); 
    251251                soundID = soundPool.load(this, audioFile, 1); 
    252                  
    253 //              soundPool.load(audioFilePath, 1); 
     252 
     253                //              soundPool.load(audioFilePath, 1); 
    254254 
    255255                //              genTone(); 
     
    750750                int new_speed = calculateSpeed(); 
    751751                String command = ""; 
    752                 progressBarPower.setProgress(new_speed); 
     752                //              progressBarPower.setProgress(new_speed); 
    753753 
    754754                if (new_speed > 0) { 
Note: See TracChangeset for help on using the changeset viewer.