hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change around the handling for navigation from the action bar.

Browse Source
This commit is contained in:
Kevin Ruland 2012-06-18 01:48:17 +00:00
parent cfac7dcc81
commit bdb8298979
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
android/src/net/sf/openrocket/android/ActivityHelpers.java
View File

@ -11,7 +11,8 @@ public abstract class ActivityHelpers {
public static void goHome( Activity parent ) { public static void goHome( Activity parent ) {
Intent i = new Intent(parent, Main.class); Intent i = new Intent(parent, Main.class);
i.addFlags( Intent.FLAG_ACTIVITY_CLEAR_TOP); i.putExtra(Main.restartFlag, true);
i.addFlags( Intent.FLAG_ACTIVITY_CLEAR_TOP + Intent.FLAG_ACTIVITY_NEW_TASK );
parent.startActivity(i); parent.startActivity(i);
} }

8
android/src/net/sf/openrocket/android/Main.java
View File

@ -2,6 +2,7 @@ package net.sf.openrocket.android;
import net.sf.openrocket.R; import net.sf.openrocket.R;
import net.sf.openrocket.android.rocket.OpenRocketLoaderActivity; import net.sf.openrocket.android.rocket.OpenRocketLoaderActivity;
import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
@ -12,15 +13,16 @@ import com.actionbarsherlock.view.MenuItem;
public class Main extends OpenRocketLoaderActivity { public class Main extends OpenRocketLoaderActivity {
public final static String restartFlag = "restart";
/** Called when the activity is first created. */ /** Called when the activity is first created. */
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
// Rocket already loaded. go to viewer. Intent i = getIntent();
if ( CurrentRocketHolder.getCurrentRocket().getRocketDocument() != null ) { // Rocket already loaded. go to viewer unless we want to restart.
if ( ( i.getBooleanExtra(restartFlag, false) == false) && CurrentRocketHolder.getCurrentRocket().getRocketDocument() != null ) {
moveOnToViewer(); moveOnToViewer();
return;
} }
setContentView(R.layout.main); setContentView(R.layout.main);
((Button) findViewById(R.id.main_open)).setOnClickListener( ((Button) findViewById(R.id.main_open)).setOnClickListener(

4
android/src/net/sf/openrocket/android/motor/MotorBrowserActivity.java
View File

@ -53,7 +53,9 @@ implements MotorListFragment.OnMotorSelectedListener
AndroidLogWrapper.d(MotorBrowserActivity.class,"onMenuItemSelected" + item.getItemId()); AndroidLogWrapper.d(MotorBrowserActivity.class,"onMenuItemSelected" + item.getItemId());
switch(item.getItemId()) { switch(item.getItemId()) {
case android.R.id.home: case android.R.id.home:
ActivityHelpers.goHome(this); // we implement home in the motor browser as "back" since then it will return to
// either main or the viewer.
finish();
return true; return true;
case R.id.download_from_thrustcurve_menu_option: case R.id.download_from_thrustcurve_menu_option:
ActivityHelpers.downloadFromThrustcurve(this,DOWNLOAD_REQUEST_CODE); ActivityHelpers.downloadFromThrustcurve(this,DOWNLOAD_REQUEST_CODE);

2
android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
View File

@ -42,7 +42,7 @@ implements Simulations.OnSimulationSelectedListener
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setTitle(CurrentRocketHolder.getCurrentRocket().getRocketDocument().getRocket().getName()); setTitle(CurrentRocketHolder.getCurrentRocket().getRocketDocument().getRocket().getName());
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setHomeButtonEnabled(true);
setContentView(R.layout.openrocketviewer); setContentView(R.layout.openrocketviewer);
ViewPager viewPager = (ViewPager)findViewById(R.id.pager); ViewPager viewPager = (ViewPager)findViewById(R.id.pager);