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

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

Merge "Adding recyclerview and activity transition to UiBench"

parents f247ea6d d68e8cb5

tests/UiBench/Android.mk

+6 −3
Original line number Diff line number Diff line
@@ -11,17 +11,20 @@ LOCAL_SRC_FILES := $(call all-java-files-under,src) 
LOCAL_RESOURCE_DIR := \

    $(LOCAL_PATH)/res \

    frameworks/support/v7/appcompat/res \

    frameworks/support/v7/cardview/res

    frameworks/support/v7/cardview/res \

    frameworks/support/v7/recyclerview/res



LOCAL_AAPT_FLAGS := \

    --auto-add-overlay \

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

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

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

    --extra-packages android.support.v7.recyclerview



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-v4 \

    android-support-v7-appcompat \

    android-support-v7-cardview

    android-support-v7-cardview \

    android-support-v7-recyclerview



LOCAL_PACKAGE_NAME := UiBench

tests/UiBench/AndroidManifest.xml

+24 −0
Original line number Diff line number Diff line
@@ -83,6 +83,30 @@ 
                <category android:name="com.android.test.uibench.TEST" />

            </intent-filter>

        </activity>

        <activity

            android:name=".TrivialRecyclerViewActivity"

            android:label="General/Trivial Recycler ListView" >

            <intent-filter>

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

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

            </intent-filter>

        </activity>

        <activity

            android:name=".ActivityTransition"

            android:label="Transitions/Activity Transition" >

            <intent-filter>

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

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

            </intent-filter>

        </activity>

        <activity

            android:name=".ActivityTransitionDetails"

            android:label="Transitions/Activity Transition " >

            <intent-filter>

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

                <!-- Part of ActivityTransition test above, so not in TEST category -->

            </intent-filter>

        </activity>



        <!-- Rendering -->

        <activity

tests/UiBench/build.gradle

+4 −3
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ android { 


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'

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

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

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

    compile 'com.android.support:recyclerview-v7:23.0.1'

}

tests/UiBench/res/drawable-nodpi/ball.jpg

0 → 100644
+20 KiB
Loading image diff...

tests/UiBench/res/drawable-nodpi/block.jpg

0 → 100644
+20.1 KiB
Loading image diff...