Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94b064e1 authored by Alex Sakhartchouk's avatar Alex Sakhartchouk Committed by Android (Google) Code Review
Browse files

Merge "adding benchmark single test"

parents aba3d10f 37333001

tests/RenderScriptTests/PerfTest/res/menu/loader_menu.xml

+5 −2
Original line number Diff line number Diff line
@@ -18,8 +18,11 @@ 
-->



<menu xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:id="@+id/benchmark_mode"

          android:title="@string/benchmark_mode" />

    <item android:id="@+id/benchmark_all"

          android:title="@string/benchmark_all" />

    <item android:id="@+id/benchmark_one"

          android:title="@string/benchmark_one" />

    <item android:id="@+id/debug_mode"

          android:title="@string/debug_mode" />

</menu>

tests/RenderScriptTests/PerfTest/res/values/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 


<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <skip />

    <string name="benchmark_mode">Benchmark Mode</string>

    <string name="benchmark_all">Benchmark All</string>

    <string name="benchmark_one">Benchmark One</string>

    <string name="debug_mode">Debug Mode</string>

</resources>

tests/RenderScriptTests/PerfTest/src/com/android/perftest/RsBench.java

+18 −4
Original line number Diff line number Diff line
@@ -93,14 +93,28 @@ public class RsBench extends Activity { 
    public boolean onOptionsItemSelected(MenuItem item) {

        // Handle item selection

        switch (item.getItemId()) {

            case R.id.benchmark_mode:

                mView.setBenchmarkMode();

            case R.id.benchmark_all:

                mView.setBenchmarkMode(-1);

                return true;

            case R.id.debug_mode:

            case R.id.benchmark_one:

                AlertDialog.Builder builder = new AlertDialog.Builder(this);

                builder.setTitle("Pick a Test");

                builder.setItems(mView.getTestNames(),

                                 new DialogInterface.OnClickListener() {

                    public void onClick(DialogInterface dialog, int item) {

                        Toast.makeText(getApplicationContext(),

                                       "Starting to benchmark: " + mView.getTestNames()[item],

                                       Toast.LENGTH_SHORT).show();

                        mView.setBenchmarkMode(item);

                    }

                });

                builder.show();

                return true;

            case R.id.debug_mode:

                AlertDialog.Builder debugBuilder = new AlertDialog.Builder(this);

                debugBuilder.setTitle("Pick a Test");

                debugBuilder.setItems(mView.getTestNames(),

                                 new DialogInterface.OnClickListener() {

                    public void onClick(DialogInterface dialog, int item) {

                        Toast.makeText(getApplicationContext(),

                                       "Switching to: " + mView.getTestNames()[item],
@@ -108,7 +122,7 @@ public class RsBench extends Activity { 
                        mView.setDebugMode(item);

                    }

                });

                builder.show();

                debugBuilder.show();

                return true;

            default:

                return super.onOptionsItemSelected(item);

tests/RenderScriptTests/PerfTest/src/com/android/perftest/RsBenchRS.java

+2 −2
Original line number Diff line number Diff line
@@ -248,8 +248,8 @@ public class RsBenchRS { 
        mScript.invoke_setDebugMode(num);

    }



    public void setBenchmarkMode() {

        mScript.invoke_setBenchmarkMode();

    public void setBenchmarkMode(int benchNum) {

        mScript.invoke_setBenchmarkMode(benchNum);

    }



    private void initRS() {

tests/RenderScriptTests/PerfTest/src/com/android/perftest/RsBenchView.java

+2 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ public class RsBenchView extends RSSurfaceView { 
        return mRender.testIsFinished();

    }



    void setBenchmarkMode() {

        mRender.setBenchmarkMode();

    void setBenchmarkMode(int benchNum) {

        mRender.setBenchmarkMode(benchNum);

    }



    void setDebugMode(int num) {