X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=android%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fandroid%2Fmotor%2FMotorBrowserActivity.java;h=60bb7be1beae87cb9245f416b79c144df8bddfba;hb=4095cb0dd61a75b7b6b0bd811f8e803af5b27919;hp=2d3f77489aa89723509171fc8cae6f7f1a52b59d;hpb=ace80eeeeca723d4bd6f1cf6736f16b70055be8f;p=debian%2Fopenrocket

diff --git a/android/src/net/sf/openrocket/android/motor/MotorBrowserActivity.java b/android/src/net/sf/openrocket/android/motor/MotorBrowserActivity.java
index 2d3f7748..60bb7be1 100644
--- a/android/src/net/sf/openrocket/android/motor/MotorBrowserActivity.java
+++ b/android/src/net/sf/openrocket/android/motor/MotorBrowserActivity.java
@@ -3,18 +3,19 @@ package net.sf.openrocket.android.motor;
 import net.sf.openrocket.R;
 import net.sf.openrocket.android.ActivityHelpers;
 import net.sf.openrocket.android.PreferencesActivity;
-import net.sf.openrocket.android.actionbarcompat.ActionBarFragmentActivity;
 import net.sf.openrocket.android.util.AndroidLogWrapper;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 
-public class MotorBrowserActivity extends ActionBarFragmentActivity
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
+
+public class MotorBrowserActivity extends SherlockFragmentActivity
 implements MotorListFragment.OnMotorSelectedListener
 {
 
@@ -28,7 +29,8 @@ implements MotorListFragment.OnMotorSelectedListener
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.motorbrowser);
-		getActionBarHelper().setDisplayHomeAsUpEnabled(true);
+		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+		getSupportActionBar().setTitle(R.string.motorbrowsertitle);
 		// Only create the motorBrowser fragment if it doesn't already exist.
 		Fragment motorBrowser = getSupportFragmentManager().findFragmentByTag(MOTOR_LIST_FRAGMENT);
 		if ( motorBrowser == null ) {
@@ -41,7 +43,7 @@ implements MotorListFragment.OnMotorSelectedListener
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
-		MenuInflater inflater = getMenuInflater();
+		MenuInflater inflater = getSupportMenuInflater();
 		inflater.inflate(R.menu.motor_browser_option_menu, menu);
 		return true;
 	}
@@ -51,7 +53,9 @@ implements MotorListFragment.OnMotorSelectedListener
 		AndroidLogWrapper.d(MotorBrowserActivity.class,"onMenuItemSelected" + item.getItemId());
 		switch(item.getItemId()) {
 		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;
 		case R.id.download_from_thrustcurve_menu_option:
 			ActivityHelpers.downloadFromThrustcurve(this,DOWNLOAD_REQUEST_CODE);