Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / android / src / net / sf / openrocket / android / motor / MotorBrowserActivity.java

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