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

Commit b1ecc00d authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "Add initial GPU/text/invalidate UiBench workloads"

parents dd743667 baf41299

tests/UiBench/Android.mk

+7 −3
Original line number Diff line number Diff line
@@ -10,14 +10,18 @@ LOCAL_SRC_FILES := $(call all-java-files-under,src) 
# regressions are reflected in test data

LOCAL_RESOURCE_DIR := \

    $(LOCAL_PATH)/res \

    frameworks/support/v7/appcompat/res

    frameworks/support/v7/appcompat/res \

    frameworks/support/v7/cardview/res



LOCAL_AAPT_FLAGS := \

    --extra-packages android.support.v7.appcompat

    --auto-add-overlay \

    --extra-packages android.support.v7.appcompat \

    --extra-packages android.support.v7.cardview



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-v4 \

    android-support-v7-appcompat

    android-support-v7-appcompat \

    android-support-v7-cardview



LOCAL_PACKAGE_NAME := UiBench

tests/UiBench/AndroidManifest.xml

+33 −5
Original line number Diff line number Diff line
@@ -32,10 +32,10 @@ 
            </intent-filter>

        </activity>



        <!-- Tests -->

        <!-- General -->

        <activity

            android:name=".GlTextureViewActivity"

            android:label="Microbenchmarks/GL TextureView" >

            android:label="General/GL TextureView" >

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.test.uibench.TEST" />
@@ -43,7 +43,15 @@ 
        </activity>

        <activity

            android:name=".FullscreenOverdrawActivity"

            android:label="Microbenchmarks/Fullscreen Overdraw" >

            android:label="General/Fullscreen Overdraw" >

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.test.uibench.TEST" />

            </intent-filter>

        </activity>

        <activity

            android:name=".InvalidateActivity"

            android:label="General/Invalidate" >

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.test.uibench.TEST" />
@@ -51,7 +59,7 @@ 
        </activity>

        <activity

            android:name=".TrivialAnimationActivity"

            android:label="Microbenchmarks/Trivial Animation" >

            android:label="General/Trivial Animation" >

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.test.uibench.TEST" />
@@ -59,7 +67,27 @@ 
        </activity>

        <activity

            android:name=".TrivialListActivity"

            android:label="Microbenchmarks/Trivial ListView" >

            android:label="General/Trivial ListView" >

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.test.uibench.TEST" />

            </intent-filter>

        </activity>



        <!-- GPU -->

        <activity

            android:name=".BitmapUploadActivity"

            android:label="GPU/Bitmap Upload" >

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.test.uibench.TEST" />

            </intent-filter>

        </activity>



        <!-- Text -->

        <activity

            android:name=".EditTextTypeActivity"

            android:label="Text/EditText Typing" >

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.test.uibench.TEST" />

tests/UiBench/build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -34,4 +34,5 @@ dependencies { 
    // Dependencies enumerated specifically for platform-independent / reproducible builds.

    compile 'com.android.support:support-v4:23.0.0'

    compile 'com.android.support:appcompat-v7:23.0.0'

    compile 'com.android.support:cardview-v7:23.0.0'

}

tests/UiBench/res/layout/activity_bitmap_upload.xml

0 → 100644
+52 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2015 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<LinearLayout

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

    android:id="@+id/upload_root"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:padding="10dp"

    android:clipToPadding="false">

    <android.support.v7.widget.CardView

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1">

        <view class="com.android.test.uibench.BitmapUploadActivity$UploadView"

            android:id="@+id/upload_view"

            android:layout_width="match_parent"

            android:layout_height="match_parent"/>

    </android.support.v7.widget.CardView>



    <android.support.v4.widget.Space

        android:layout_height="10dp"

        android:layout_width="match_parent" />



    <android.support.v7.widget.CardView

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1" />



    <android.support.v4.widget.Space

        android:layout_height="10dp"

        android:layout_width="match_parent" />



    <android.support.v7.widget.CardView

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1" />

</LinearLayout>
 
 No newline at end of file

tests/UiBench/res/layout/activity_invalidate.xml

0 → 100644
+39 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2015 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

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

    android:id="@+id/invalidate_root"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    <include layout="@layout/invalidate_row"/>

    <include layout="@layout/invalidate_row"/>

    <include layout="@layout/invalidate_row"/>

    <include layout="@layout/invalidate_row"/>

    <include layout="@layout/invalidate_row"/>



    <include layout="@layout/invalidate_row"/>

    <include layout="@layout/invalidate_row"/>

    <include layout="@layout/invalidate_row"/>

    <include layout="@layout/invalidate_row"/>

    <include layout="@layout/invalidate_row"/>



    <include layout="@layout/invalidate_row"/>

    <include layout="@layout/invalidate_row"/>

    <include layout="@layout/invalidate_row"/>

    <include layout="@layout/invalidate_row"/>

    <include layout="@layout/invalidate_row"/>

</LinearLayout>
 
 No newline at end of file