Make test UI fit to clockwork.
Bug: 18248616
Change-Id: I570c92423de702f7a8b700016316a855dda3ded6
diff --git a/apps/CtsVerifier/res/layout/ble_advertiser_hardware_scan_filter.xml b/apps/CtsVerifier/res/layout/ble_advertiser_hardware_scan_filter.xml
index ce3e1e1..a545727 100644
--- a/apps/CtsVerifier/res/layout/ble_advertiser_hardware_scan_filter.xml
+++ b/apps/CtsVerifier/res/layout/ble_advertiser_hardware_scan_filter.xml
@@ -19,63 +19,56 @@
android:orientation="vertical"
android:padding="10dip"
>
-
- <LinearLayout android:orientation="vertical"
+ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_centerInParent="true"
- >
- <TextView android:text="@string/ble_advertiser_scannable"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- />
- <TextView android:text="@string/ble_advertiser_scannable_instruction"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- />
- <LinearLayout android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- >
- <Button android:id="@+id/ble_advertiser_scannable_start"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/ble_advertiser_start"
- />
- <Button android:id="@+id/ble_advertiser_scannable_stop"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/ble_advertiser_stop"
- />
- </LinearLayout>
- <TextView android:text="@string/ble_advertiser_unscannable"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- />
- <TextView android:text="@string/ble_advertiser_unscannable_instruction"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- />
- <LinearLayout android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- >
- <Button android:id="@+id/ble_advertiser_unscannable_start"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/ble_advertiser_start"
- />
- <Button android:id="@+id/ble_advertiser_unscannable_stop"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/ble_advertiser_stop"
- />
- </LinearLayout>
- </LinearLayout>
+ android:scrollbars="vertical">
- <include android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- layout="@layout/pass_fail_buttons"
- />
+ <LinearLayout android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true">
+ <TextView android:text="@string/ble_advertiser_scannable"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+ <TextView android:text="@string/ble_advertiser_scannable_instruction"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+ <LinearLayout android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <Button android:id="@+id/ble_advertiser_scannable_start"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/ble_advertiser_start"/>
+ <Button android:id="@+id/ble_advertiser_scannable_stop"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/ble_advertiser_stop"/>
+ </LinearLayout>
+ <TextView android:text="@string/ble_advertiser_unscannable"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+ <TextView android:text="@string/ble_advertiser_unscannable_instruction"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+ <LinearLayout android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <Button android:id="@+id/ble_advertiser_unscannable_start"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/ble_advertiser_start"/>
+ <Button android:id="@+id/ble_advertiser_unscannable_stop"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/ble_advertiser_stop"/>
+ </LinearLayout>
+
+ <include android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ layout="@layout/pass_fail_buttons"/>
+ </LinearLayout>
+ </ScrollView>
</RelativeLayout>
diff --git a/apps/CtsVerifier/res/layout/ble_advertiser_power_level.xml b/apps/CtsVerifier/res/layout/ble_advertiser_power_level.xml
index ec3284d..c8e0133 100644
--- a/apps/CtsVerifier/res/layout/ble_advertiser_power_level.xml
+++ b/apps/CtsVerifier/res/layout/ble_advertiser_power_level.xml
@@ -19,31 +19,34 @@
android:orientation="vertical"
android:padding="10dip"
>
-
- <TextView android:text="@string/ble_advertiser_power_level_instruction"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- />
- <LinearLayout android:orientation="horizontal"
+ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+ <LinearLayout android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_centerInParent="true"
- >
- <Button android:id="@+id/ble_power_level_start"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/ble_advertiser_start"
- />
- <Button android:id="@+id/ble_power_level_stop"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/ble_advertiser_stop"
- />
- </LinearLayout>
+ android:layout_height="wrap_content">
+ <TextView android:text="@string/ble_advertiser_power_level_instruction"
+ android:id="@+id/ble_advertiser_power_level_instruction"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:scrollbars="vertical"/>
+ <LinearLayout android:orientation="horizontal"
+ android:layout_below="@+id/ble_advertiser_power_level_instruction"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <Button android:id="@+id/ble_power_level_start"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/ble_advertiser_start"/>
+ <Button android:id="@+id/ble_power_level_stop"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/ble_advertiser_stop"/>
+ </LinearLayout>
- <include android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- layout="@layout/pass_fail_buttons"
- />
+ <include android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ layout="@layout/pass_fail_buttons"/>
+ </LinearLayout>
+ </ScrollView>
</RelativeLayout>
diff --git a/apps/CtsVerifier/res/layout/ble_scanner_hardware_scan_filter.xml b/apps/CtsVerifier/res/layout/ble_scanner_hardware_scan_filter.xml
index f356ded..dabd640 100644
--- a/apps/CtsVerifier/res/layout/ble_scanner_hardware_scan_filter.xml
+++ b/apps/CtsVerifier/res/layout/ble_scanner_hardware_scan_filter.xml
@@ -17,40 +17,41 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:padding="10dip"
- >
- <TextView android:text="@string/ble_scanner_scan_filter_instruction"
+ android:padding="10dip">
+ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- />
- <LinearLayout android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_centerInParent="true"
- >
- <LinearLayout android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- >
- <Button android:id="@+id/ble_scan_with_filter"
+ android:layout_height="wrap_content">
+ <LinearLayout android:orientation="vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+ <TextView android:text="@string/ble_scanner_scan_filter_instruction"
android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+ <LinearLayout android:orientation="vertical"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/ble_scan_with_filter"
- />
- <Button android:id="@+id/ble_scan_without_filter"
- android:layout_width="wrap_content"
+ android:layout_centerInParent="true">
+ <LinearLayout android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <Button android:id="@+id/ble_scan_with_filter"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/ble_scan_with_filter"/>
+ <Button android:id="@+id/ble_scan_without_filter"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/ble_scan_without_filter"/>
+ </LinearLayout>
+ <ListView android:id="@+id/ble_scan_result_list"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent">
+ </ListView>
+ </LinearLayout>
+ <include android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/ble_scan_without_filter"
- />
+ android:layout_alignParentBottom="true"
+ layout="@layout/pass_fail_buttons"/>
</LinearLayout>
- <ListView android:id="@+id/ble_scan_result_list"
- android:layout_height="wrap_content"
- android:layout_width="match_parent">
- </ListView>
- </LinearLayout>
- <include android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- layout="@layout/pass_fail_buttons"
- />
+ </ScrollView>
</RelativeLayout>
diff --git a/apps/CtsVerifier/res/layout/ble_scanner_power_level.xml b/apps/CtsVerifier/res/layout/ble_scanner_power_level.xml
index b240db6..c24dbb4 100644
--- a/apps/CtsVerifier/res/layout/ble_scanner_power_level.xml
+++ b/apps/CtsVerifier/res/layout/ble_scanner_power_level.xml
@@ -19,154 +19,139 @@
android:orientation="vertical"
android:padding="10dip"
>
- <TextView android:text="@string/ble_scanner_power_level_instruction"
+ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/ble_scanner_power_level_instruction"
- />
- <LinearLayout android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@+id/ble_scanner_power_level_instruction"
- android:layout_centerInParent="true"
- android:padding="10dp"
- >
- <LinearLayout android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_centerInParent="true"
- >
- <TextView android:text="@string/ble_ultra_low"
- android:layout_width="100dp"
- android:layout_height="wrap_content"
- />
- <TextView android:id="@+id/ble_ultra_low_mac"
- android:layout_width="200dp"
- android:layout_height="wrap_content"
- />
- <TextView android:id="@+id/ble_ultra_low_rssi"
- android:layout_width="100dp"
- android:layout_height="wrap_content"
- />
- </LinearLayout>
- <LinearLayout android:orientation="horizontal"
+ android:layout_height="wrap_content">
+ <LinearLayout android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <TextView android:layout_width="100dp"
- android:layout_height="wrap_content"/>
- <TextView android:id="@+id/ble_ultra_low_count"
- android:layout_width="100dp"
+ <TextView android:text="@string/ble_scanner_power_level_instruction"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:id="@+id/ble_scanner_power_level_instruction"
/>
- <TextView android:id="@+id/ble_ultra_low_set_power"
- android:layout_width="100dp"
+ <HorizontalScrollView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+ <LinearLayout android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/ble_scanner_power_level_instruction"
+ android:layout_centerInParent="true"
+ android:padding="10dp">
+ <LinearLayout android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true">
+ <TextView android:text="@string/ble_ultra_low"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"/>
+ <TextView android:id="@+id/ble_ultra_low_mac"
+ android:layout_width="200dp"
+ android:layout_height="wrap_content"/>
+ <TextView android:id="@+id/ble_ultra_low_rssi"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"/>
+ </LinearLayout>
+ <LinearLayout android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <TextView android:layout_width="100dp"
+ android:layout_height="wrap_content"/>
+ <TextView android:id="@+id/ble_ultra_low_count"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"/>
+ <TextView android:id="@+id/ble_ultra_low_set_power"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"/>
+ </LinearLayout>
+ <LinearLayout android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true">
+ <TextView android:text="@string/ble_low"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"/>
+ <TextView android:id="@+id/ble_low_mac"
+ android:layout_width="200dp"
+ android:layout_height="wrap_content"/>
+ <TextView android:id="@+id/ble_low_rssi"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"/>
+ </LinearLayout>
+ <LinearLayout android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <TextView android:layout_width="100dp"
+ android:layout_height="wrap_content"/>
+ <TextView android:id="@+id/ble_low_count"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"/>
+ <TextView android:id="@+id/ble_low_set_power"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"/>
+ </LinearLayout>
+ <LinearLayout android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true">
+ <TextView android:text="@string/ble_medium"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"/>
+ <TextView android:id="@+id/ble_medium_mac"
+ android:layout_width="200dp"
+ android:layout_height="wrap_content"/>
+ <TextView android:id="@+id/ble_medium_rssi"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"/>
+ </LinearLayout>
+ <LinearLayout android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <TextView android:layout_width="100dp"
+ android:layout_height="wrap_content"/>
+ <TextView android:id="@+id/ble_medium_count"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"/>
+ <TextView android:id="@+id/ble_medium_set_power"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"/>
+ </LinearLayout>
+ <LinearLayout android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true">
+ <TextView android:text="@string/ble_high"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"/>
+ <TextView android:id="@+id/ble_high_mac"
+ android:layout_width="200dp"
+ android:layout_height="wrap_content"/>
+ <TextView android:id="@+id/ble_high_rssi"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"/>
+ </LinearLayout>
+ <LinearLayout android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <TextView android:layout_width="100dp"
+ android:layout_height="wrap_content"/>
+ <TextView android:id="@+id/ble_high_count"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"/>
+ <TextView android:id="@+id/ble_high_set_power"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"/>
+ </LinearLayout>
+ </LinearLayout>
+ </HorizontalScrollView>
+ <TextView android:id="@+id/ble_timer"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content" />
+ <include android:layout_width="match_parent"
android:layout_height="wrap_content"
- />
+ android:layout_alignParentBottom="true"
+ layout="@layout/pass_fail_buttons"/>
</LinearLayout>
- <LinearLayout android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_centerInParent="true"
- >
- <TextView android:text="@string/ble_low"
- android:layout_width="100dp"
- android:layout_height="wrap_content"
- />
- <TextView android:id="@+id/ble_low_mac"
- android:layout_width="200dp"
- android:layout_height="wrap_content"
- />
- <TextView android:id="@+id/ble_low_rssi"
- android:layout_width="100dp"
- android:layout_height="wrap_content"
- />
- </LinearLayout>
- <LinearLayout android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
- <TextView android:layout_width="100dp"
- android:layout_height="wrap_content"/>
- <TextView android:id="@+id/ble_low_count"
- android:layout_width="100dp"
- android:layout_height="wrap_content"
- />
- <TextView android:id="@+id/ble_low_set_power"
- android:layout_width="100dp"
- android:layout_height="wrap_content"
- />
- </LinearLayout>
- <LinearLayout android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_centerInParent="true"
- >
- <TextView android:text="@string/ble_medium"
- android:layout_width="100dp"
- android:layout_height="wrap_content"
- />
- <TextView android:id="@+id/ble_medium_mac"
- android:layout_width="200dp"
- android:layout_height="wrap_content"
- />
- <TextView android:id="@+id/ble_medium_rssi"
- android:layout_width="100dp"
- android:layout_height="wrap_content"
- />
- </LinearLayout>
- <LinearLayout android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
- <TextView android:layout_width="100dp"
- android:layout_height="wrap_content"/>
- <TextView android:id="@+id/ble_medium_count"
- android:layout_width="100dp"
- android:layout_height="wrap_content"
- />
- <TextView android:id="@+id/ble_medium_set_power"
- android:layout_width="100dp"
- android:layout_height="wrap_content"
- />
- </LinearLayout>
- <LinearLayout android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_centerInParent="true"
- >
- <TextView android:text="@string/ble_high"
- android:layout_width="100dp"
- android:layout_height="wrap_content"
- />
- <TextView android:id="@+id/ble_high_mac"
- android:layout_width="200dp"
- android:layout_height="wrap_content"
- />
- <TextView android:id="@+id/ble_high_rssi"
- android:layout_width="100dp"
- android:layout_height="wrap_content"
- />
- </LinearLayout>
- <LinearLayout android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
- <TextView android:layout_width="100dp"
- android:layout_height="wrap_content"/>
- <TextView android:id="@+id/ble_high_count"
- android:layout_width="100dp"
- android:layout_height="wrap_content"
- />
- <TextView android:id="@+id/ble_high_set_power"
- android:layout_width="100dp"
- android:layout_height="wrap_content"
- />
- </LinearLayout>
- <TextView android:id="@+id/ble_timer"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content" />
- </LinearLayout>
-
- <include android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- layout="@layout/pass_fail_buttons"
- />
+ </ScrollView>
</RelativeLayout>