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

Commit f0a17d6b authored by Joel Fernandes's avatar Joel Fernandes Committed by android-build-merger
Browse files

Merge "JankBench: Add Bitmap Upload to list of runnable tests" am: 9c4b6532 am: 1f90d943 

am: 0ed2ad08

Change-Id: Iaef1c7ffb34cd3b9a76a6eb10bc0db633c3f4e78
parents 01eee379 0ed2ad08

tests/JankBench/app/src/main/java/com/android/benchmark/app/RunLocalBenchmarksActivity.java

+5 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ public class RunLocalBenchmarksActivity extends AppCompatActivity { 
            R.id.benchmark_text_low_hitrate,

            R.id.benchmark_edit_text_input,

            R.id.benchmark_overdraw,

            R.id.benchmark_bitmap_upload,

    };



    public static class LocalBenchmarksList extends ListFragment {
@@ -204,6 +205,7 @@ public class RunLocalBenchmarksActivity extends AppCompatActivity { 
            case R.id.benchmark_text_low_hitrate:

            case R.id.benchmark_edit_text_input:

            case R.id.benchmark_overdraw:

            case R.id.benchmark_bitmap_upload:

            case R.id.benchmark_memory_bandwidth:

            case R.id.benchmark_memory_latency:

            case R.id.benchmark_power_management:
@@ -325,6 +327,9 @@ public class RunLocalBenchmarksActivity extends AppCompatActivity { 
            case R.id.benchmark_overdraw:

                intent = new Intent(getApplicationContext(), FullScreenOverdrawActivity.class);

                break;

            case R.id.benchmark_bitmap_upload:

                intent = new Intent(getApplicationContext(), BitmapUploadActivity.class);

                break;

            case R.id.benchmark_memory_bandwidth:

                syntheticTestId = 0;

                intent = new Intent(getApplicationContext(), MemoryActivity.class);

tests/JankBench/app/src/main/java/com/android/benchmark/registry/BenchmarkRegistry.java

+2 −0
Original line number Diff line number Diff line
@@ -229,6 +229,8 @@ public class BenchmarkRegistry { 
                return context.getString(R.string.cpu_gflops_name);

            case R.id.benchmark_overdraw:

                return context.getString(R.string.overdraw_name);

            case R.id.benchmark_bitmap_upload:

                return context.getString(R.string.bitmap_upload_name);

            default:

                return "Some Benchmark";

        }

tests/JankBench/app/src/main/java/com/android/benchmark/ui/BitmapUploadActivity.java

+4 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.view.MotionEvent; 
import android.view.View;



import com.android.benchmark.R;

import com.android.benchmark.registry.BenchmarkRegistry;

import com.android.benchmark.ui.automation.Automator;

import com.android.benchmark.ui.automation.Interaction;
@@ -124,7 +125,9 @@ public class BitmapUploadActivity extends AppCompatActivity { 
        final int runId = getIntent().getIntExtra("com.android.benchmark.RUN_ID", 0);

        final int iteration = getIntent().getIntExtra("com.android.benchmark.ITERATION", -1);



        mAutomator = new Automator("BMUpload", runId, iteration, getWindow(),

        String name = BenchmarkRegistry.getBenchmarkName(this, R.id.benchmark_bitmap_upload);



        mAutomator = new Automator(name, runId, iteration, getWindow(),

                new Automator.AutomateCallback() {

                    @Override

                    public void onPostAutomate() {

tests/JankBench/app/src/main/res/values/ids.xml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
    <item name="benchmark_text_low_hitrate" type="id" />

    <item name="benchmark_edit_text_input" type="id" />

    <item name="benchmark_overdraw" type="id" />

    <item name="benchmark_bitmap_upload" type="id" />

    <item name="benchmark_memory_bandwidth" type="id" />

    <item name="benchmark_memory_latency" type="id" />

    <item name="benchmark_power_management" type="id" />

tests/JankBench/app/src/main/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 
    <string name="edit_text_input_description">Tests edit text input</string>

    <string name="overdraw_name">Overdraw Test</string>

    <string name="overdraw_description">Tests how the device handles overdraw</string>

    <string name="bitmap_upload_name">Bitmap Upload Test</string>

    <string name="bitmap_upload_description">Tests bitmap upload</string>

    <string name="memory_bandwidth_name">Memory Bandwidth</string>

    <string name="memory_bandwidth_description">Test device\'s memory bandwidth</string>

    <string name="memory_latency_name">Memory Latency</string>