Merge "UiBench adapted for TV" into nyc-dev (e811ebda) · Commits · e / os / android_frameworks_base

tests/UiBench/res/layout/activity_transition.xml

+1 −16

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		~ limitations under the License
		-->
		<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/transition_grid_layout"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:clipChildren="true"
		@@ -25,8 +26,6 @@
		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"/>
		@@ -36,8 +35,6 @@
		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
		@@ -46,8 +43,6 @@
		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
		@@ -56,8 +51,6 @@
		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
		@@ -66,8 +59,6 @@
		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
		@@ -76,8 +67,6 @@
		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
		@@ -86,8 +75,6 @@
		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
		@@ -96,8 +83,6 @@
		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

tests/UiBench/src/com/android/test/uibench/ActivityTransition.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -18,11 +18,13 @@ package com.android.test.uibench;
		import android.app.ActivityOptions;
		import android.app.SharedElementCallback;
		import android.content.Intent;
		import android.content.res.Configuration;
		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.GridLayout;
		import android.widget.ImageView;

		import java.util.List;
		@@ -90,6 +92,13 @@ public class ActivityTransition extends AppCompatActivity {
		getWindow().setBackgroundDrawable(new ColorDrawable(Color.BLACK));
		setContentView(R.layout.activity_transition);
		setupHero();

		// Ensure that all images are visible regardless of orientation.
		GridLayout gridLayout = (GridLayout) findViewById(R.id.transition_grid_layout);
		boolean isPortrait =
		getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT;
		gridLayout.setRowCount(isPortrait ? 4 : 2);
		gridLayout.setColumnCount(isPortrait ? 2 : 4);
		}

		private void setupHero() {