am 5d3ca886: Merge "Fix Layout For Small Devices" into klp-dev
* commit '5d3ca886441cf214b62daaabad4856c1c0ffef37':
Fix Layout For Small Devices
diff --git a/apps/CtsVerifier/res/layout/intent_driven_test.xml b/apps/CtsVerifier/res/layout/intent_driven_test.xml
index 1b68074..e23f441 100644
--- a/apps/CtsVerifier/res/layout/intent_driven_test.xml
+++ b/apps/CtsVerifier/res/layout/intent_driven_test.xml
@@ -1,36 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:orientation="vertical"
>
- <LinearLayout android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:padding="5dp"
- >
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1">
+ <TextView android:id="@+id/info"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="18sp"
+ android:padding="5dp"
+ android:text="@string/dc_start_alarm_test_info"
+ />
+ </ScrollView>
- <TextView android:id="@+id/info"
- android:layout_width="wrap_content"
- android:textSize="18sp"
- android:layout_height="wrap_content"
- android:text="@string/dc_show_alarms_test_info"
- />
-
- <LinearLayout android:id="@+id/buttons"
- android:orientation="horizontal"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"/>
- </LinearLayout>
+ <LinearLayout android:id="@+id/buttons"
+ android:orientation="horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- >
+ android:layout_height="wrap_content">
<include layout="@layout/pass_fail_buttons"/>
</LinearLayout>
-</RelativeLayout>
+</LinearLayout>
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/IntentDrivenTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/IntentDrivenTestActivity.java
index 9833abd..678a338 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/IntentDrivenTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/IntentDrivenTestActivity.java
@@ -119,6 +119,14 @@
private final ButtonInfo[] mButtons;
public TestInfo(String testId, int title, int infoText, ButtonInfo... buttons) {
+ /** The Intent Driven Test layout {@link R.layout.intent_driven_test} is designed for
+ * up to 2 buttons and won't render well with more buttons on small screen devices.
+ * If you need more than 2 buttons, please change the layout so it can properly render
+ * them even on the smallest devices.
+ */
+ if (buttons.length > 2) {
+ throw new RuntimeException("Too many buttons");
+ }
mTestId = testId;
mTitle = title;
mInfoText = infoText;