Add certain control options for being started by am

0xbench can be launched with certain bench categories checked and antorun
enabled by command as below example:
$ adb shell am start -n org.zeroxlab.benchmark/org.zeroxlab.benchmark.Benchmark
 --ez math true --ez vm true --ez autorun true

Also after finishing the bench, the benchmark result will be uploaded
automatically if autoupload is set true as "--ez autoupload true"

3 files changed, 61 insertions, 1 deletions

diff --git a/src/org/zeroxlab/benchmark/Benchmark.java b/src/org/zeroxlab/benchmark/Benchmark.java
index ff22e76..712a009 100644
--- a/src/org/zeroxlab/benchmark/Benchmark.java
+++ b/src/org/zeroxlab/benchmark/Benchmark.java
@@ -109,6 +109,14 @@ public class Benchmark extends TabActivity implements View.OnClickListener {
 
     private final String trackerUrl = "http://0xbenchmark.appspot.com/static/MobileTracker.html";
 
+    boolean mAutoRun = false;
+    boolean mCheckMath = false;
+    boolean mCheck2D = false;
+    boolean mCheck3D = false;
+    boolean mCheckVM = false;
+    boolean mCheckNative = false;
+    boolean mAutoUpload = false;
+
     @Override
     protected void onDestroy() {
         super.onPause();
@@ -197,6 +205,36 @@ public class Benchmark extends TabActivity implements View.OnClickListener {
         initViews();
 
         Intent intent = getIntent();
+        Bundle bundle = intent.getExtras();
+        if (bundle != null) {
+            mAutoRun = bundle.getBoolean("autorun");
+            mCheckMath = bundle.getBoolean("math");
+            mCheck2D = bundle.getBoolean("2d");
+            mCheck3D = bundle.getBoolean("3d");
+            mCheckVM = bundle.getBoolean("vm");
+            mCheckNative = bundle.getBoolean("native");
+            mAutoUpload = bundle.getBoolean("autoupload");
+        }
+
+        if (mCheckMath && !mathCheckBox.isChecked()) {
+            mathCheckBox.performClick();
+        }
+
+        if (mCheck2D && !d2CheckBox.isChecked()) {
+            d2CheckBox.performClick();
+        }
+
+        if (mCheck3D && !d3CheckBox.isChecked()) {
+            d3CheckBox.performClick();
+        }
+
+        if (mCheckVM && !vmCheckBox.isChecked()) {
+            vmCheckBox.performClick();
+        }
+
+        if (mCheckNative && !nativeCheckBox.isChecked()) {
+            nativeCheckBox.performClick();
+        }
         /*
         if (intent.getBooleanExtra("AUTO", false)) {
             ImageView head = (ImageView)findViewById(R.id.banner_img);
@@ -205,6 +243,9 @@ public class Benchmark extends TabActivity implements View.OnClickListener {
             initAuto();
         }
         */
+        if (mAutoRun) {
+            onClick(mRun);
+        }
     }
 
     @Override
@@ -455,6 +496,10 @@ public class Benchmark extends TabActivity implements View.OnClickListener {
             Intent intent = new Intent();
             intent.putExtra(Report.REPORT, result);
             intent.putExtra(Report.XML, mXMLResult);
+            if (mAutoUpload) {
+                intent.putExtra(Report.AUTOUPLOAD, true);
+                mAutoUpload = false;
+            }
             intent.setClassName(Report.packageName(), Report.fullClassName());
             startActivity(intent);
         } else if (v==d2CheckBox || v==d3CheckBox || v==mathCheckBox || v==vmCheckBox || v==nativeCheckBox) {
diff --git a/src/org/zeroxlab/benchmark/Report.java b/src/org/zeroxlab/benchmark/Report.java
index ada7a6d..a88fbae 100644
--- a/src/org/zeroxlab/benchmark/Report.java
+++ b/src/org/zeroxlab/benchmark/Report.java
@@ -34,11 +34,13 @@ public class Report extends Activity implements View.OnClickListener {
     public final static String TAG = "Repord";
     public final static String REPORT = "REPORT";
     public final static String XML = "XML";
+    public final static String AUTOUPLOAD = "AUTOUPLOAD";
     private TextView mTextView;
 
     private Button mUpload;
     private Button mBack;
     private String mXMLResult;
+    boolean mAutoUpload = false;
 
     @Override
     protected void onCreate(Bundle bundle) {
@@ -56,6 +58,7 @@ public class Report extends Activity implements View.OnClickListener {
         Intent intent = getIntent();
         String report = intent.getStringExtra(REPORT);
         mXMLResult = intent.getStringExtra(XML);
+        mAutoUpload = intent.getBooleanExtra(AUTOUPLOAD, false);
 
         if (report == null || report.equals("")) {
             mTextView.setText("oooops...report not found");
@@ -66,6 +69,10 @@ public class Report extends Activity implements View.OnClickListener {
         if (mXMLResult == null) {
             mUpload.setEnabled(false);
         }
+
+        if (mAutoUpload) {
+            onClick(mUpload);
+        }
     }
 
     public void onClick(View v) {
@@ -74,6 +81,9 @@ public class Report extends Activity implements View.OnClickListener {
         } else if (v == mUpload) {
             Intent intent = new Intent();
             intent.putExtra(Upload.XML, mXMLResult);
+            if (mAutoUpload) {
+                intent.putExtra(Upload.AUTOUPLOAD, true);
+            }
             intent.setClassName(Upload.packageName(), Upload.fullClassName());
             
             startActivity(intent);
diff --git a/src/org/zeroxlab/benchmark/Upload.java b/src/org/zeroxlab/benchmark/Upload.java
index eb67376..ee7a2bf 100644
--- a/src/org/zeroxlab/benchmark/Upload.java
+++ b/src/org/zeroxlab/benchmark/Upload.java
@@ -60,6 +60,7 @@ public class Upload extends Activity implements View.OnClickListener {
 
     public final static String TAG = "Upload";
     public final static String XML = "XML";
+    public final static String AUTOUPLOAD = "AUTOUPLOAD";
 
     public final static String mMobileLoginUrl = "http://0xbenchmark.appspot.com/mobileLogin";
 
@@ -83,6 +84,7 @@ public class Upload extends Activity implements View.OnClickListener {
     Handler mLoginHandler;
 
     boolean mLogedin = false;
+    boolean mAutoUpload = false;
 
     @Override
     protected void onCreate(Bundle bundle) {
@@ -114,6 +116,7 @@ public class Upload extends Activity implements View.OnClickListener {
 
         Intent intent = getIntent();
         mXML = intent.getStringExtra(XML);
+        mAutoUpload = intent.getBooleanExtra(AUTOUPLOAD, false);
 
         mUploadHandler = new Handler() {
             public void handleMessage(Message msg) {
@@ -144,7 +147,9 @@ public class Upload extends Activity implements View.OnClickListener {
             }
         };
 
-
+        if (mAutoUpload) {
+            onClick(mSend);
+        }
     }
 
     private String trimTail(String text) {