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

Change to inherit from Sherlock classes.

Browse Source
This commit is contained in:
Kevin Ruland 2012-06-05 13:47:15 +00:00
parent 4ca77ba513
commit ad265733bd
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
android/src/net/sf/openrocket/android/simulation/SimulationViewActivity.java
View File

@ -7,15 +7,16 @@ import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.document.Simulation; import net.sf.openrocket.document.Simulation;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentTransaction; import android.support.v4.app.FragmentTransaction;
import android.view.Menu;
import android.view.MenuItem; import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem;
/** /**
* An activity that encapsulates a graphical view of the chart. * An activity that encapsulates a graphical view of the chart.
*/ */
public class SimulationViewActivity extends FragmentActivity { public class SimulationViewActivity extends SherlockFragmentActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {

12
android/src/net/sf/openrocket/android/simulation/SimulationViewFragment.java
View File

@ -2,7 +2,6 @@
package net.sf.openrocket.android.simulation; package net.sf.openrocket.android.simulation;
import net.sf.openrocket.R; import net.sf.openrocket.R;
import net.sf.openrocket.android.Application;
import net.sf.openrocket.android.CurrentRocketHolder; import net.sf.openrocket.android.CurrentRocketHolder;
import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.OpenRocketDocument;
@ -10,18 +9,19 @@ import org.achartengine.GraphicalView;
import org.achartengine.chart.XYChart; import org.achartengine.chart.XYChart;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import com.actionbarsherlock.app.SherlockFragment;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuInflater;
import com.actionbarsherlock.view.MenuItem;
/** /**
* An activity that encapsulates a graphical view of the chart. * An activity that encapsulates a graphical view of the chart.
*/ */
public class SimulationViewFragment extends Fragment implements SimulationSeriesDialog.OnConfirmListener { public class SimulationViewFragment extends SherlockFragment implements SimulationSeriesDialog.OnConfirmListener {
SimulationChart chart; SimulationChart chart;