Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / android / src / net / sf / openrocket / android / thrustcurve / TCQueryActivity.java

diff --git a/android/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java b/android/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java
index c27c7744a28eeec796330e70919adb169931a325..9bb4e2dcc70df7a7e511c5384d68c2a9f38cef46 100644 (file)
--- a/android/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java
+++ b/android/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java
@@ -4,19 +4,21 @@ import net.sf.openrocket.R;
 import net.sf.openrocket.android.util.AndroidLogWrapper;\r
 import net.sf.openrocket.android.util.ErrorDialogFragment;\r
 import android.os.Bundle;\r
-import android.support.v4.app.FragmentActivity;\r
 import android.view.View;\r
 import android.widget.Button;\r
 import android.widget.EditText;\r
 import android.widget.Spinner;\r
 \r
-public class TCQueryActivity extends FragmentActivity\r
+import com.actionbarsherlock.app.SherlockFragmentActivity;\r
+\r
+public class TCQueryActivity extends SherlockFragmentActivity\r
 implements TCQueryAction.OnTCQueryCompleteListener\r
 {\r
 \r
        @Override\r
        protected void onCreate(Bundle savedInstanceState) {\r
                super.onCreate(savedInstanceState);\r
+               setTitle(R.string.TCMotorSearchFormTitle);\r
                setContentView(R.layout.tcqueryform);\r
 \r
                final Spinner manufacturerField = (Spinner) findViewById(R.id.TCMotorSearchFormManufacturerField);\r