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
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
\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
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