Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 219 → Rev 218

/DUBwise/trunk/android/AndroidManifest.xml
48,17 → 48,7
</intent-filter>
</activity>
 
<activity android:name=".SettingsActivity"
android:label="@string/app_name"
>
<intent-filter>
 
<action android:name="android.intent.action.MAIN" />
 
</intent-filter>
</activity>
 
 
<activity android:name=".RCDataActivity"
android:label="@string/app_name"
>
/DUBwise/trunk/android/res/layout/settings.xml
File deleted
/DUBwise/trunk/android/src/org/ligi/android/SettingsActivity.java
File deleted
/DUBwise/trunk/android/src/org/ligi/android/SettingsActivity.xml
File deleted
/DUBwise/trunk/android/src/org/ligi/android/DUBwise.java
55,8 → 55,8
boolean do_sound;
boolean fullscreen;
MKCommunicator mk;
String[] menu_items = new String[]{"Settings","Connection", "Old Interface" , "View On Maps", "Flight Settings","RCData","Motor Test", "About","Quit"};
int[] menu_actions= new int[]{ACTIONID_SETTINGS,ACTIONID_CONN , ACTIONID_OLDINTERFACE , ACTIONID_MAPS ,ACTIONID_FLIGHTSETTINGS,ACTIONID_RCDATA,ACTIONID_MOTORTEST, ACTIONID_ABOUT , ACTIONID_QUIT };
String[] menu_items = new String[]{"Connection", "Old Interface" , "View On Maps", "Flight Settings","RCData","Motor Test", "About","Quit"};
int[] menu_actions= new int[]{ACTIONID_CONN , ACTIONID_OLDINTERFACE , ACTIONID_MAPS ,ACTIONID_FLIGHTSETTINGS,ACTIONID_RCDATA,ACTIONID_MOTORTEST, ACTIONID_ABOUT , ACTIONID_QUIT };
 
public final static int ACTIONID_CONN=0;
public final static int ACTIONID_MAPS=1;
65,7 → 65,6
public final static int ACTIONID_FLIGHTSETTINGS=4;
public final static int ACTIONID_MOTORTEST=5;
public final static int ACTIONID_RCDATA=6;
public final static int ACTIONID_SETTINGS=7;
public final static int ACTIONID_QUIT=100;
 
SharedPreferences settings;
113,12 → 112,6
switch(menu_actions[position])
{
 
case ACTIONID_SETTINGS:
// setContentView(new ConnectionView(this));
 
startActivity(new Intent(this, SettingsActivity.class));
break;
 
case ACTIONID_CONN:
// setContentView(new ConnectionView(this));
 
/DUBwise/trunk/android/src/org/ligi/android/R.java
20,7 → 20,6
public static final class id {
public static final int cancel_btn=0x7f060004;
public static final int check_autoconn=0x7f060002;
public static final int check_fullscreen=0x7f060015;
public static final int check_fullspeed=0x7f060005;
public static final int edit_host=0x7f060000;
public static final int edit_port=0x7f060001;
45,7 → 44,6
public static final int connection=0x7f030000;
public static final int motortest=0x7f030001;
public static final int rcdata=0x7f030002;
public static final int settings=0x7f030003;
}
public static final class raw {
public static final int voice_sample_01=0x7f040000;