diff options
Diffstat (limited to 'tests')
33 files changed, 939 insertions, 11 deletions
diff --git a/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java b/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java index 5fbfe8ace7e1..ceb3993e1705 100644 --- a/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java +++ b/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java @@ -57,6 +57,7 @@ import android.content.pm.UserInfo; import android.content.res.Configuration; import android.util.Log; + public class ActivityTestMain extends Activity { static final String TAG = "ActivityTest"; @@ -315,7 +316,7 @@ public class ActivityTestMain extends Activity { Log.i(TAG, "Service disconnected " + name); } }; - if (bindServiceAsUser(intent, conn, Context.BIND_AUTO_CREATE, UserHandle.OWNER)) { + if (bindServiceAsUser(intent, conn, Context.BIND_AUTO_CREATE, UserHandle.SYSTEM)) { mConnections.add(conn); } else { Toast.makeText(ActivityTestMain.this, "Failed to bind", diff --git a/tests/CameraPrewarmTest/src/com/google/android/test/cameraprewarm/CameraActivity.java b/tests/CameraPrewarmTest/src/com/google/android/test/cameraprewarm/CameraActivity.java index 0b43666a5453..8085db72fba5 100644 --- a/tests/CameraPrewarmTest/src/com/google/android/test/cameraprewarm/CameraActivity.java +++ b/tests/CameraPrewarmTest/src/com/google/android/test/cameraprewarm/CameraActivity.java @@ -31,5 +31,7 @@ public class CameraActivity extends Activity { super.onCreate(savedInstanceState); setContentView(R.layout.camera_activity); Log.i(TAG, "Activity created"); + Log.i(TAG, "Source: " + + getIntent().getStringExtra("com.android.systemui.camera_launch_source")); } } diff --git a/tests/CameraPrewarmTest/src/com/google/android/test/cameraprewarm/SecureCameraActivity.java b/tests/CameraPrewarmTest/src/com/google/android/test/cameraprewarm/SecureCameraActivity.java index 530fe0063954..242d3b2c2a98 100644 --- a/tests/CameraPrewarmTest/src/com/google/android/test/cameraprewarm/SecureCameraActivity.java +++ b/tests/CameraPrewarmTest/src/com/google/android/test/cameraprewarm/SecureCameraActivity.java @@ -17,6 +17,7 @@ package com.google.android.test.cameraprewarm; import android.app.Activity; +import android.graphics.Camera; import android.os.Bundle; import android.util.Log; import android.view.WindowManager; @@ -31,5 +32,7 @@ public class SecureCameraActivity extends Activity { setContentView(R.layout.camera_activity); getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED); Log.i(CameraActivity.TAG, "Activity created"); + Log.i(CameraActivity.TAG, "Source: " + + getIntent().getStringExtra("com.android.systemui.camera_launch_source")); } } diff --git a/tests/HwAccelerationTest/AndroidManifest.xml b/tests/HwAccelerationTest/AndroidManifest.xml index 10cf5c1b2f8b..b028ce61f821 100644 --- a/tests/HwAccelerationTest/AndroidManifest.xml +++ b/tests/HwAccelerationTest/AndroidManifest.xml @@ -944,5 +944,14 @@ </intent-filter> </activity> + <activity + android:name="MultiProducerActivity" + android:label="Threads/Multiple Producers"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="com.android.test.hwui.TEST" /> + </intent-filter> + </activity> + </application> </manifest> diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/MultiProducerActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/MultiProducerActivity.java new file mode 100644 index 000000000000..b458d9b14096 --- /dev/null +++ b/tests/HwAccelerationTest/src/com/android/test/hwui/MultiProducerActivity.java @@ -0,0 +1,347 @@ +/* + * Copyright (C) 2014 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. + */ + +package com.android.test.hwui; + +import android.app.Activity; +import android.graphics.Canvas; +import android.graphics.ColorFilter; +import android.graphics.Paint; +import android.graphics.PixelFormat; +import android.graphics.Rect; +import android.graphics.drawable.Drawable; +import android.os.Bundle; +import android.view.DisplayListCanvas; +import android.view.HardwareRenderer; +import android.view.RenderNode; +import android.view.ThreadedRenderer; +import android.view.View; +import android.view.View.OnClickListener; +import android.widget.AbsoluteLayout; +import android.widget.AbsoluteLayout.LayoutParams; + +public class MultiProducerActivity extends Activity implements OnClickListener { + private static final int DURATION = 800; + private View mBackgroundTarget = null; + private View mFrameTarget = null; + private View mContent = null; + // The width & height of our "output drawing". + private final int WIDTH = 900; + private final int HEIGHT = 600; + // A border width around the drawing. + private static final int BORDER_WIDTH = 20; + // The Gap between the content and the frame which should get filled on the right and bottom + // side by the backdrop. + final int CONTENT_GAP = 100; + + // For debug purposes - disable drawing of frame / background. + private final boolean USE_FRAME = true; + private final boolean USE_BACK = true; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + // To make things simple - we do a quick and dirty absolute layout. + final AbsoluteLayout layout = new AbsoluteLayout(this); + + // Create the outer frame + if (USE_FRAME) { + mFrameTarget = new View(this); + LayoutParams frameLP = new LayoutParams(WIDTH, HEIGHT, 0, 0); + layout.addView(mFrameTarget, frameLP); + } + + // Create the background which fills the gap between content and frame. + if (USE_BACK) { + mBackgroundTarget = new View(this); + LayoutParams backgroundLP = new LayoutParams( + WIDTH - 2 * BORDER_WIDTH, HEIGHT - 2 * BORDER_WIDTH, + BORDER_WIDTH, BORDER_WIDTH); + layout.addView(mBackgroundTarget, backgroundLP); + } + + // Create the content + // Note: We reduce the size by CONTENT_GAP pixels on right and bottom, so that they get + // drawn by the backdrop. + mContent = new View(this); + mContent.setBackground(new ColorPulse(0xFFF44336, 0xFF9C27B0, null)); + mContent.setOnClickListener(this); + LayoutParams contentLP = new LayoutParams(WIDTH - 2 * BORDER_WIDTH - CONTENT_GAP, + HEIGHT - 2 * BORDER_WIDTH - CONTENT_GAP, BORDER_WIDTH, BORDER_WIDTH); + layout.addView(mContent, contentLP); + + setContentView(layout); + } + + @Override + protected void onStart() { + super.onStart(); + View view = mBackgroundTarget != null ? mBackgroundTarget : mFrameTarget; + if (view != null) { + view.post(mSetup); + } + } + + @Override + protected void onStop() { + super.onStop(); + View view = mBackgroundTarget != null ? mBackgroundTarget : mFrameTarget; + if (view != null) { + view.removeCallbacks(mSetup); + } + if (mBgRenderer != null) { + mBgRenderer.destroy(); + mBgRenderer = null; + } + } + + @Override + public void onClick(View view) { + sBlockThread.run(); + } + + private Runnable mSetup = new Runnable() { + @Override + public void run() { + View view = mBackgroundTarget != null ? mBackgroundTarget : mFrameTarget; + if (view == null) { + view.postDelayed(mSetup, 50); + } + HardwareRenderer renderer = view.getHardwareRenderer(); + if (renderer == null || view.getWidth() == 0) { + view.postDelayed(mSetup, 50); + } + ThreadedRenderer threaded = (ThreadedRenderer) renderer; + + mBgRenderer = new FakeFrame(threaded,mFrameTarget, mBackgroundTarget); + mBgRenderer.start(); + } + }; + + private FakeFrame mBgRenderer; + private class FakeFrame extends Thread { + ThreadedRenderer mRenderer; + volatile boolean mRunning = true; + View mTargetFrame; + View mTargetBack; + Drawable mFrameContent; + Drawable mBackContent; + // The Z value where to place this. + int mZFrame; + int mZBack; + String mRenderNodeName; + + FakeFrame(ThreadedRenderer renderer, View targetFrame, View targetBack) { + mRenderer = renderer; + mTargetFrame = targetFrame; + + mTargetBack = targetBack; + mFrameContent = new ColorPulse(0xFF101010, 0xFF707070, new Rect(0, 0, WIDTH, HEIGHT)); + mBackContent = new ColorPulse(0xFF909090, 0xFFe0e0e0, null); + } + + @Override + public void run() { + Rect currentFrameBounds = new Rect(); + Rect currentBackBounds = new Rect(); + Rect newBounds = new Rect(); + int[] surfaceOrigin = new int[2]; + RenderNode nodeFrame = null; + RenderNode nodeBack = null; + + // Since we are overriding the window painting logic we need to at least fill the + // surface with some window content (otherwise the world will go black). + try { + Thread.sleep(200); + } catch (InterruptedException e) { + } + + if (mTargetBack != null) { + nodeBack = RenderNode.create("FakeBackdrop", null); + nodeBack.setClipToBounds(true); + mRenderer.addRenderNode(nodeBack, true); + } + + if (mTargetFrame != null) { + nodeFrame = RenderNode.create("FakeFrame", null); + nodeFrame.setClipToBounds(true); + mRenderer.addRenderNode(nodeFrame, false); + } + + while (mRunning) { + // Get the surface position to draw to within our surface. + surfaceOrigin[0] = 0; + surfaceOrigin[1] = 0; + // This call should be done while the rendernode's displaylist is produced. + // For simplicity of this test we do this before we kick off the draw. + mContent.getLocationInSurface(surfaceOrigin); + mRenderer.setContentOverdrawProtectionBounds(surfaceOrigin[0], surfaceOrigin[1], + surfaceOrigin[0] + mContent.getWidth(), + surfaceOrigin[1] + mContent.getHeight()); + // Determine new position for frame. + if (nodeFrame != null) { + surfaceOrigin[0] = 0; + surfaceOrigin[1] = 0; + mTargetFrame.getLocationInSurface(surfaceOrigin); + newBounds.set(surfaceOrigin[0], surfaceOrigin[1], + surfaceOrigin[0] + mTargetFrame.getWidth(), + surfaceOrigin[1] + mTargetFrame.getHeight()); + if (!currentFrameBounds.equals(newBounds)) { + currentFrameBounds.set(newBounds); + nodeFrame.setLeftTopRightBottom(currentFrameBounds.left, + currentFrameBounds.top, + currentFrameBounds.right, currentFrameBounds.bottom); + } + + // Draw frame + DisplayListCanvas canvas = nodeFrame.start(currentFrameBounds.width(), + currentFrameBounds.height()); + mFrameContent.draw(canvas); + nodeFrame.end(canvas); + } + + // Determine new position for backdrop + if (nodeBack != null) { + surfaceOrigin[0] = 0; + surfaceOrigin[1] = 0; + mTargetBack.getLocationInSurface(surfaceOrigin); + newBounds.set(surfaceOrigin[0], surfaceOrigin[1], + surfaceOrigin[0] + mTargetBack.getWidth(), + surfaceOrigin[1] + mTargetBack.getHeight()); + if (!currentBackBounds.equals(newBounds)) { + currentBackBounds.set(newBounds); + nodeBack.setLeftTopRightBottom(currentBackBounds.left, + currentBackBounds.top, + currentBackBounds.right, currentBackBounds.bottom); + } + + // Draw Backdrop + DisplayListCanvas canvas = nodeBack.start(currentBackBounds.width(), + currentBackBounds.height()); + mBackContent.draw(canvas); + nodeBack.end(canvas); + } + + // we need to only render one guy - the rest will happen automatically (I think). + if (nodeFrame != null) { + mRenderer.drawRenderNode(nodeFrame); + } + if (nodeBack != null) { + mRenderer.drawRenderNode(nodeBack); + } + try { + Thread.sleep(5); + } catch (InterruptedException e) {} + } + if (nodeFrame != null) { + mRenderer.removeRenderNode(nodeFrame); + } + if (nodeBack != null) { + mRenderer.removeRenderNode(nodeBack); + } + } + + public void destroy() { + mRunning = false; + try { + join(); + } catch (InterruptedException e) {} + } + } + + private final static Runnable sBlockThread = new Runnable() { + @Override + public void run() { + try { + Thread.sleep(DURATION); + } catch (InterruptedException e) { + } + } + }; + + static class ColorPulse extends Drawable { + + private int mColorStart; + private int mColorEnd; + private int mStep; + private Rect mRect; + private Paint mPaint = new Paint(); + + public ColorPulse(int color1, int color2, Rect rect) { + mColorStart = color1; + mColorEnd = color2; + if (rect != null) { + mRect = new Rect(rect.left + BORDER_WIDTH / 2, rect.top + BORDER_WIDTH / 2, + rect.right - BORDER_WIDTH / 2, rect.bottom - BORDER_WIDTH / 2); + } + } + + static int evaluate(float fraction, int startInt, int endInt) { + int startA = (startInt >> 24) & 0xff; + int startR = (startInt >> 16) & 0xff; + int startG = (startInt >> 8) & 0xff; + int startB = startInt & 0xff; + + int endA = (endInt >> 24) & 0xff; + int endR = (endInt >> 16) & 0xff; + int endG = (endInt >> 8) & 0xff; + int endB = endInt & 0xff; + + return (int)((startA + (int)(fraction * (endA - startA))) << 24) | + (int)((startR + (int)(fraction * (endR - startR))) << 16) | + (int)((startG + (int)(fraction * (endG - startG))) << 8) | + (int)((startB + (int)(fraction * (endB - startB)))); + } + + @Override + public void draw(Canvas canvas) { + float frac = mStep / 50.0f; + int color = evaluate(frac, mColorStart, mColorEnd); + if (mRect != null && !mRect.isEmpty()) { + mPaint.setStyle(Paint.Style.STROKE); + mPaint.setStrokeWidth(BORDER_WIDTH); + mPaint.setColor(color); + canvas.drawRect(mRect, mPaint); + } else { + canvas.drawColor(color); + } + + mStep++; + if (mStep >= 50) { + mStep = 0; + int tmp = mColorStart; + mColorStart = mColorEnd; + mColorEnd = tmp; + } + invalidateSelf(); + } + + @Override + public void setAlpha(int alpha) { + } + + @Override + public void setColorFilter(ColorFilter colorFilter) { + } + + @Override + public int getOpacity() { + return mRect == null || mRect.isEmpty() ? PixelFormat.OPAQUE : PixelFormat.TRANSLUCENT; + } + + } +} + diff --git a/tests/UiBench/Android.mk b/tests/UiBench/Android.mk index 24df85b1841f..0e678cde9c70 100644 --- a/tests/UiBench/Android.mk +++ b/tests/UiBench/Android.mk @@ -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 diff --git a/tests/UiBench/AndroidManifest.xml b/tests/UiBench/AndroidManifest.xml index 9b3d18668aa9..7b4f01cad849 100644 --- a/tests/UiBench/AndroidManifest.xml +++ b/tests/UiBench/AndroidManifest.xml @@ -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 diff --git a/tests/UiBench/build.gradle b/tests/UiBench/build.gradle index deecbb6392d1..0756a8aac878 100644 --- a/tests/UiBench/build.gradle +++ b/tests/UiBench/build.gradle @@ -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' } diff --git a/tests/UiBench/res/drawable-nodpi/ball.jpg b/tests/UiBench/res/drawable-nodpi/ball.jpg Binary files differnew file mode 100644 index 000000000000..2960b7309f6e --- /dev/null +++ b/tests/UiBench/res/drawable-nodpi/ball.jpg diff --git a/tests/UiBench/res/drawable-nodpi/block.jpg b/tests/UiBench/res/drawable-nodpi/block.jpg Binary files differnew file mode 100644 index 000000000000..04c22a0cf5b4 --- /dev/null +++ b/tests/UiBench/res/drawable-nodpi/block.jpg diff --git a/tests/UiBench/res/drawable-nodpi/ducky.jpg b/tests/UiBench/res/drawable-nodpi/ducky.jpg Binary files differnew file mode 100644 index 000000000000..830bbe347e47 --- /dev/null +++ b/tests/UiBench/res/drawable-nodpi/ducky.jpg diff --git a/tests/UiBench/res/drawable-nodpi/frantic.jpg b/tests/UiBench/res/drawable-nodpi/frantic.jpg Binary files differnew file mode 100644 index 000000000000..4c623336e15b --- /dev/null +++ b/tests/UiBench/res/drawable-nodpi/frantic.jpg diff --git a/tests/UiBench/res/drawable-nodpi/jellies.jpg b/tests/UiBench/res/drawable-nodpi/jellies.jpg Binary files differnew file mode 100644 index 000000000000..ee2b5c68c43b --- /dev/null +++ b/tests/UiBench/res/drawable-nodpi/jellies.jpg diff --git a/tests/UiBench/res/drawable-nodpi/mug.jpg b/tests/UiBench/res/drawable-nodpi/mug.jpg Binary files differnew file mode 100644 index 000000000000..e149e198a9cd --- /dev/null +++ b/tests/UiBench/res/drawable-nodpi/mug.jpg diff --git a/tests/UiBench/res/drawable-nodpi/pencil.jpg b/tests/UiBench/res/drawable-nodpi/pencil.jpg Binary files differnew file mode 100644 index 000000000000..e348311bf4d0 --- /dev/null +++ b/tests/UiBench/res/drawable-nodpi/pencil.jpg diff --git a/tests/UiBench/res/drawable-nodpi/scissors.jpg b/tests/UiBench/res/drawable-nodpi/scissors.jpg Binary files differnew file mode 100644 index 000000000000..caf0ce8e2f4b --- /dev/null +++ b/tests/UiBench/res/drawable-nodpi/scissors.jpg diff --git a/tests/UiBench/res/drawable-nodpi/woot.jpg b/tests/UiBench/res/drawable-nodpi/woot.jpg Binary files differnew file mode 100644 index 000000000000..ccaef674b1a5 --- /dev/null +++ b/tests/UiBench/res/drawable-nodpi/woot.jpg diff --git a/tests/UiBench/res/layout/activity_transition.xml b/tests/UiBench/res/layout/activity_transition.xml new file mode 100644 index 000000000000..d4c661027a35 --- /dev/null +++ b/tests/UiBench/res/layout/activity_transition.xml @@ -0,0 +1,103 @@ +<?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 + --> +<GridLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:clipChildren="true" + android:columnCount="2" + android:rowCount="4"> + <ImageView + android:id="@+id/ducky" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:scaleType="centerCrop" + android:layout_column="0" + android:layout_row="0" + android:src="@drawable/ducky" + android:onClick="clicked" + android:transitionName="ducky"/> + <ImageView + android:id="@+id/woot" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:scaleType="centerCrop" + android:src="@drawable/woot" + android:layout_column="1" + android:layout_row="0" + android:onClick="clicked" + android:transitionName="woot"/> + <ImageView + android:id="@+id/ball" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:scaleType="centerCrop" + android:src="@drawable/ball" + android:layout_column="0" + android:layout_row="1" + android:onClick="clicked" + android:transitionName="ball"/> + <ImageView + android:id="@+id/block" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:scaleType="centerCrop" + android:src="@drawable/block" + android:layout_column="1" + android:layout_row="1" + android:onClick="clicked" + android:transitionName="block"/> + <ImageView + android:id="@+id/jellies" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:scaleType="centerCrop" + android:src="@drawable/jellies" + android:layout_column="0" + android:layout_row="2" + android:onClick="clicked" + android:transitionName="jellies"/> + <ImageView + android:id="@+id/mug" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:scaleType="centerCrop" + android:src="@drawable/mug" + android:layout_column="1" + android:layout_row="2" + android:onClick="clicked" + android:transitionName="mug"/> + <ImageView + android:id="@+id/pencil" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:scaleType="centerCrop" + android:src="@drawable/pencil" + android:layout_column="0" + android:layout_row="3" + android:onClick="clicked" + android:transitionName="pencil"/> + <ImageView + android:id="@+id/scissors" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:scaleType="centerCrop" + android:src="@drawable/scissors" + android:layout_column="1" + android:layout_row="3" + android:onClick="clicked" + android:transitionName="scissors"/> +</GridLayout>
\ No newline at end of file diff --git a/tests/UiBench/res/layout/activity_transition_details.xml b/tests/UiBench/res/layout/activity_transition_details.xml new file mode 100644 index 000000000000..1022d2fc2a40 --- /dev/null +++ b/tests/UiBench/res/layout/activity_transition_details.xml @@ -0,0 +1,39 @@ +<?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:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + <ImageView + android:id="@+id/titleImage" + android:layout_height="0px" + android:layout_weight="1" + android:layout_width="match_parent" + android:scaleType="centerCrop" + android:transitionName="hero" + android:onClick="clicked"/> + <View + android:layout_width="match_parent" + android:layout_height="2dp" + android:background="#808080"/> + <TextView + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:text="Sample Picture" + android:textSize="30sp" + android:textColor="#FFF"/> +</LinearLayout>
\ No newline at end of file diff --git a/tests/UiBench/res/layout/recycler_view.xml b/tests/UiBench/res/layout/recycler_view.xml new file mode 100644 index 000000000000..54c5b5845ae2 --- /dev/null +++ b/tests/UiBench/res/layout/recycler_view.xml @@ -0,0 +1,21 @@ +<?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 + --> +<android.support.v7.widget.RecyclerView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/recyclerView" + android:layout_width="match_parent" + android:layout_height="match_parent"/> diff --git a/tests/UiBench/src/com/android/test/uibench/ActivityTransition.java b/tests/UiBench/src/com/android/test/uibench/ActivityTransition.java new file mode 100644 index 000000000000..1106a13bfc2a --- /dev/null +++ b/tests/UiBench/src/com/android/test/uibench/ActivityTransition.java @@ -0,0 +1,118 @@ +/* + * 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. + */ +package com.android.test.uibench; + +import android.app.ActivityOptions; +import android.app.SharedElementCallback; +import android.content.Intent; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.view.View; +import android.widget.ImageView; + +import java.util.List; +import java.util.Map; + +public class ActivityTransition extends AppCompatActivity { + private static final String KEY_ID = "ViewTransitionValues:id"; + + private ImageView mHero; + + public static final int[] DRAWABLES = { + R.drawable.ball, + R.drawable.block, + R.drawable.ducky, + R.drawable.jellies, + R.drawable.mug, + R.drawable.pencil, + R.drawable.scissors, + R.drawable.woot, + }; + + public static final int[] IDS = { + R.id.ball, + R.id.block, + R.id.ducky, + R.id.jellies, + R.id.mug, + R.id.pencil, + R.id.scissors, + R.id.woot, + }; + + public static final String[] NAMES = { + "ball", + "block", + "ducky", + "jellies", + "mug", + "pencil", + "scissors", + "woot", + }; + + public static int getIdForKey(String id) { + return IDS[getIndexForKey(id)]; + } + + public static int getDrawableIdForKey(String id) { + return DRAWABLES[getIndexForKey(id)]; + } + + public static int getIndexForKey(String id) { + for (int i = 0; i < NAMES.length; i++) { + String name = NAMES[i]; + if (name.equals(id)) { + return i; + } + } + return 2; + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + getWindow().setBackgroundDrawable(new ColorDrawable(Color.BLACK)); + setContentView(R.layout.activity_transition); + setupHero(); + } + + private void setupHero() { + String name = getIntent().getStringExtra(KEY_ID); + mHero = null; + if (name != null) { + mHero = (ImageView) findViewById(getIdForKey(name)); + setEnterSharedElementCallback(new SharedElementCallback() { + @Override + public void onMapSharedElements(List<String> names, + Map<String, View> sharedElements) { + sharedElements.put("hero", mHero); + } + }); + } + } + + public void clicked(View v) { + mHero = (ImageView) v; + Intent intent = new Intent(this, ActivityTransitionDetails.class); + intent.putExtra(KEY_ID, v.getTransitionName()); + ActivityOptions activityOptions + = ActivityOptions.makeSceneTransitionAnimation(this, mHero, "hero"); + startActivity(intent, activityOptions.toBundle()); + } +} diff --git a/tests/UiBench/src/com/android/test/uibench/ActivityTransitionDetails.java b/tests/UiBench/src/com/android/test/uibench/ActivityTransitionDetails.java new file mode 100644 index 000000000000..a654c6107134 --- /dev/null +++ b/tests/UiBench/src/com/android/test/uibench/ActivityTransitionDetails.java @@ -0,0 +1,63 @@ +/* + * 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. + */ +package com.android.test.uibench; + +import android.app.ActivityOptions; +import android.content.Intent; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; +import android.graphics.drawable.Drawable; +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.view.View; +import android.widget.ImageView; + +import com.android.test.uibench.ActivityTransition; +import com.android.test.uibench.R; + + +public class ActivityTransitionDetails extends AppCompatActivity { + private static final String KEY_ID = "ViewTransitionValues:id"; + private int mImageResourceId = R.drawable.ducky; + private String mName = "ducky"; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + getWindow().setBackgroundDrawable(new ColorDrawable(Color.DKGRAY)); + setContentView(R.layout.activity_transition_details); + ImageView titleImage = (ImageView) findViewById(R.id.titleImage); + titleImage.setImageDrawable(getHeroDrawable()); + } + + private Drawable getHeroDrawable() { + String name = getIntent().getStringExtra(KEY_ID); + if (name != null) { + mName = name; + mImageResourceId = ActivityTransition.getDrawableIdForKey(name); + } + + return getResources().getDrawable(mImageResourceId); + } + + public void clicked(View v) { + Intent intent = new Intent(this, ActivityTransition.class); + intent.putExtra(KEY_ID, mName); + ActivityOptions activityOptions = ActivityOptions.makeSceneTransitionAnimation( + this, v, "hero"); + startActivity(intent, activityOptions.toBundle()); + } +} diff --git a/tests/UiBench/src/com/android/test/uibench/InflatingListActivity.java b/tests/UiBench/src/com/android/test/uibench/InflatingListActivity.java index 84383ec9d911..603244eb2a43 100644 --- a/tests/UiBench/src/com/android/test/uibench/InflatingListActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/InflatingListActivity.java @@ -20,6 +20,8 @@ import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.ListAdapter; +import com.android.test.uibench.listview.CompatListActivity; + public class InflatingListActivity extends CompatListActivity { @Override protected ListAdapter createListAdapter() { diff --git a/tests/UiBench/src/com/android/test/uibench/TextCacheHighHitrateActivity.java b/tests/UiBench/src/com/android/test/uibench/TextCacheHighHitrateActivity.java index 91d74ac580ca..fc5be35be4a3 100644 --- a/tests/UiBench/src/com/android/test/uibench/TextCacheHighHitrateActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/TextCacheHighHitrateActivity.java @@ -18,6 +18,8 @@ package com.android.test.uibench; import android.widget.ArrayAdapter; import android.widget.ListAdapter; +import com.android.test.uibench.listview.CompatListActivity; + public class TextCacheHighHitrateActivity extends CompatListActivity { @Override protected ListAdapter createListAdapter() { diff --git a/tests/UiBench/src/com/android/test/uibench/TextCacheLowHitrateActivity.java b/tests/UiBench/src/com/android/test/uibench/TextCacheLowHitrateActivity.java index b526cde9d3b2..14dc437d052b 100644 --- a/tests/UiBench/src/com/android/test/uibench/TextCacheLowHitrateActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/TextCacheLowHitrateActivity.java @@ -18,6 +18,8 @@ package com.android.test.uibench; import android.widget.ArrayAdapter; import android.widget.ListAdapter; +import com.android.test.uibench.listview.CompatListActivity; + public class TextCacheLowHitrateActivity extends CompatListActivity { @Override protected ListAdapter createListAdapter() { diff --git a/tests/UiBench/src/com/android/test/uibench/TrivialListActivity.java b/tests/UiBench/src/com/android/test/uibench/TrivialListActivity.java index 339ac80615ee..2625a99f3c82 100644 --- a/tests/UiBench/src/com/android/test/uibench/TrivialListActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/TrivialListActivity.java @@ -18,6 +18,8 @@ package com.android.test.uibench; import android.widget.ArrayAdapter; import android.widget.ListAdapter; +import com.android.test.uibench.listview.CompatListActivity; + public class TrivialListActivity extends CompatListActivity { @Override protected ListAdapter createListAdapter() { diff --git a/tests/UiBench/src/com/android/test/uibench/TrivialRecyclerViewActivity.java b/tests/UiBench/src/com/android/test/uibench/TrivialRecyclerViewActivity.java new file mode 100644 index 000000000000..4647ba774b2e --- /dev/null +++ b/tests/UiBench/src/com/android/test/uibench/TrivialRecyclerViewActivity.java @@ -0,0 +1,28 @@ +/* + * 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. + */ +package com.android.test.uibench; + +import android.support.v7.widget.RecyclerView; + +import com.android.test.uibench.recyclerview.RvArrayAdapter; +import com.android.test.uibench.recyclerview.RvCompatListActivity; + +public class TrivialRecyclerViewActivity extends RvCompatListActivity { + @Override + protected RecyclerView.Adapter createAdapter() { + return new RvArrayAdapter(TextUtils.buildSimpleStringList()); + } +} diff --git a/tests/UiBench/src/com/android/test/uibench/CompatListActivity.java b/tests/UiBench/src/com/android/test/uibench/listview/CompatListActivity.java index 40ec4530fbc4..214c07463fd7 100644 --- a/tests/UiBench/src/com/android/test/uibench/CompatListActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/listview/CompatListActivity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.test.uibench; +package com.android.test.uibench.listview; import android.os.Bundle; import android.support.v4.app.FragmentManager; diff --git a/tests/UiBench/src/com/android/test/uibench/recyclerview/RvArrayAdapter.java b/tests/UiBench/src/com/android/test/uibench/recyclerview/RvArrayAdapter.java new file mode 100644 index 000000000000..e5a3a49cf228 --- /dev/null +++ b/tests/UiBench/src/com/android/test/uibench/recyclerview/RvArrayAdapter.java @@ -0,0 +1,64 @@ +/* + * 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. + */ +package com.android.test.uibench.recyclerview; + +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +public class RvArrayAdapter extends RecyclerView.Adapter<RvArrayAdapter.ViewHolder> { + private String[] mDataSet; + private LayoutInflater mLayoutInflater; + + public static class ViewHolder extends RecyclerView.ViewHolder { + private final TextView mTextView; + + public ViewHolder(View v) { + super(v); + mTextView = (TextView) v.findViewById(android.R.id.text1); + } + + public TextView getTextView() { + return mTextView; + } + } + + public RvArrayAdapter(String[] dataSet) { + mDataSet = dataSet; + } + + @Override + public ViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) { + if (mLayoutInflater == null) { + mLayoutInflater = LayoutInflater.from(viewGroup.getContext()); + } + View v = mLayoutInflater.inflate(android.R.layout.simple_list_item_1, viewGroup, false); + + return new ViewHolder(v); + } + + @Override + public void onBindViewHolder(ViewHolder viewHolder, final int position) { + viewHolder.getTextView().setText(mDataSet[position]); + } + + @Override + public int getItemCount() { + return mDataSet.length; + } +} diff --git a/tests/UiBench/src/com/android/test/uibench/recyclerview/RvCompatListActivity.java b/tests/UiBench/src/com/android/test/uibench/recyclerview/RvCompatListActivity.java new file mode 100644 index 000000000000..e08dbc66e7f2 --- /dev/null +++ b/tests/UiBench/src/com/android/test/uibench/recyclerview/RvCompatListActivity.java @@ -0,0 +1,68 @@ +/* + * 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. + */ +package com.android.test.uibench.recyclerview; + +import android.content.Context; +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ArrayAdapter; + +import com.android.test.uibench.R; + +public abstract class RvCompatListActivity extends AppCompatActivity { + public static class RecyclerViewFragment extends Fragment { + RecyclerView.LayoutManager layoutManager; + RecyclerView.Adapter adapter; + + @Nullable + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + RecyclerView recyclerView = (RecyclerView) inflater.inflate( + R.layout.recycler_view, container, false); + recyclerView.setLayoutManager(layoutManager); + recyclerView.setAdapter(adapter); + return recyclerView; + } + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + FragmentManager fm = getSupportFragmentManager(); + if (fm.findFragmentById(android.R.id.content) == null) { + RecyclerViewFragment fragment = new RecyclerViewFragment(); + fragment.layoutManager = createLayoutManager(this); + fragment.adapter = createAdapter(); + fm.beginTransaction().add(android.R.id.content, fragment).commit(); + } + } + + protected RecyclerView.LayoutManager createLayoutManager(Context context) { + return new LinearLayoutManager(context); + } + + protected abstract RecyclerView.Adapter createAdapter(); +} diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml index 705cc34ff62b..2be99bed4bfb 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml @@ -21,10 +21,14 @@ <group> <path + android:name="box0" + android:pathData="m0,0l480,0l0,480l-480,0l0-480z" + android:fillColor="@android:color/white" /> + <path android:name="box1" android:pathData="m20,200l100,90l180-180l-35-35l-145,145l-60-60l-40,40z" - android:fillColor="?android:attr/colorControlActivated" - android:strokeColor="?android:attr/colorControlActivated" + android:fillColor="?android:attr/colorControlNormal" + android:strokeColor="?android:attr/colorControlNormal" android:strokeLineCap="round" android:strokeLineJoin="round" /> </group> diff --git a/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawable01.java b/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawable01.java index a23d81933749..85fc452add3e 100644 --- a/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawable01.java +++ b/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawable01.java @@ -18,7 +18,12 @@ import android.graphics.drawable.VectorDrawable; import android.os.Bundle; import android.util.Log; import android.view.View; +import android.view.View.OnClickListener; +import android.view.ViewGroup; import android.widget.Button; +import android.widget.CheckBox; +import android.widget.CompoundButton; +import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.GridLayout; @SuppressWarnings({"UnusedDeclaration"}) @@ -55,6 +60,23 @@ public class VectorDrawable01 extends Activity { container.setBackgroundColor(0xFF888888); final Button []bArray = new Button[icon.length]; + CheckBox toggle = new CheckBox(this); + toggle.setText("Toggle"); + toggle.setChecked(true); + toggle.setOnCheckedChangeListener(new OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + ViewGroup vg = (ViewGroup) buttonView.getParent(); + for (int i = 0, count = vg.getChildCount(); i < count; i++) { + View child = vg.getChildAt(i); + if (child != buttonView) { + child.setEnabled(isChecked); + } + } + } + }); + container.addView(toggle); + for (int i = 0; i < icon.length; i++) { Button button = new Button(this); bArray[i] = button; diff --git a/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java b/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java index 0f959ea0f921..a390b0cab321 100644 --- a/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java +++ b/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java @@ -94,7 +94,7 @@ public class WindowManagerPermissionTests extends TestCase { try { mWm.addAppToken(0, null, 0, 0, 0, false, false, 0, 0, false, false, null, - Configuration.EMPTY); + Configuration.EMPTY, false); fail("IWindowManager.addAppToken did not throw SecurityException as" + " expected"); } catch (SecurityException e) { |
