resolve merge conflicts of d5989e4 to nyc-dr1-dev am: cb78bbbe3b
am: 1d565b0371
Change-Id: I2de048611496a779cda7a6da74287c4643a68e28
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 6f29335..c62f02d 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -69,7 +69,8 @@
android:icon="@drawable/icon"
android:backupAgent="VerifierBackupAgent"
android:debuggable="true"
- android:largeHeap="true">
+ android:largeHeap="true"
+ android:theme="@android:style/Theme.DeviceDefault">
<meta-data android:name="com.google.android.backup.api_key"
android:value="AEdPqrEAAAAIbK6ldcOzoeRtQ1u1dFVJ1A7KetRhit-a1Xa82Q" />
diff --git a/apps/CtsVerifier/res/layout-port/gnss_test.xml b/apps/CtsVerifier/res/layout-port/gnss_test.xml
index 560133a..1838e88 100644
--- a/apps/CtsVerifier/res/layout-port/gnss_test.xml
+++ b/apps/CtsVerifier/res/layout-port/gnss_test.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2016 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.
@@ -13,45 +12,32 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.cts.verifier.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/RootLayoutPadding"
android:layout_width="match_parent"
- android:layout_height="match_parent">
- <LinearLayout app:ctsv_layout_box="all"
- android:orientation="vertical"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/text"
android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="14sp" />
+
+ <ScrollView
+ android:id="@+id/log_scroll_view"
+ android:layout_width="0dp"
android:layout_height="match_parent"
- >
+ android:layout_weight="1"
+ android:fillViewport="true">
<LinearLayout
- android:orientation="horizontal"
+ android:id="@+id/log_layout"
android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1">
+ android:layout_height="match_parent"
+ android:orientation="vertical" />
- <TextView android:id="@+id/text"
- android:textSize="14sp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"/>
+ </ScrollView>
- <ScrollView
- android:id="@+id/log_scroll_view"
- android:fillViewport="true"
- android:layout_height="match_parent"
- android:layout_width="0dp"
- android:layout_weight="1">
-
- <LinearLayout
- android:id="@+id/log_layout"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"/>
-
- </ScrollView>
-
- </LinearLayout>
-
- <include layout="@layout/snsr_next_button" />
-
- </LinearLayout>
-</com.android.cts.verifier.BoxInsetLayout>
+ <include layout="@layout/snsr_next_button" />
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout-small/gnss_test.xml b/apps/CtsVerifier/res/layout-small/gnss_test.xml
index 5caea07..e36bf26 100644
--- a/apps/CtsVerifier/res/layout-small/gnss_test.xml
+++ b/apps/CtsVerifier/res/layout-small/gnss_test.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2016 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.
@@ -13,32 +12,34 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.cts.verifier.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/RootLayoutPadding"
android:layout_width="match_parent"
android:layout_height="match_parent">
- <ScrollView android:id="@+id/log_scroll_view"
- app:ctsv_layout_box="all"
- android:fillViewport="true"
+ <ScrollView
+ android:id="@+id/log_scroll_view"
+ android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_width="match_parent">
+ android:fillViewport="true">
<LinearLayout
- android:orientation="vertical"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_width="match_parent">
+ android:orientation="vertical">
- <TextView android:id="@+id/text"
- android:textSize="14sp"
+ <TextView
+ android:id="@+id/text"
android:layout_width="match_parent"
- android:layout_height="wrap_content"/>
-
- <LinearLayout android:id="@+id/log_layout"
- android:orientation="vertical"
android:layout_height="wrap_content"
- android:layout_width="match_parent"/>
+ android:textSize="14sp" />
- <include layout="@layout/snsr_next_button"/>
+ <LinearLayout
+ android:id="@+id/log_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical" />
+
+ <include layout="@layout/snsr_next_button" />
</LinearLayout>
</ScrollView>
-</com.android.cts.verifier.BoxInsetLayout>
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/audio_dev_notify.xml b/apps/CtsVerifier/res/layout/audio_dev_notify.xml
index ceedf1c..aa6d3c4 100644
--- a/apps/CtsVerifier/res/layout/audio_dev_notify.xml
+++ b/apps/CtsVerifier/res/layout/audio_dev_notify.xml
@@ -18,12 +18,11 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/scrollView"
- >
+ style="@style/RootLayoutPadding">
-<LinearLayout
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="20dp"
android:orientation="vertical">
<TextView
diff --git a/apps/CtsVerifier/res/layout/audio_frequency_line_activity.xml b/apps/CtsVerifier/res/layout/audio_frequency_line_activity.xml
index 6a755d5..41292d1 100644
--- a/apps/CtsVerifier/res/layout/audio_frequency_line_activity.xml
+++ b/apps/CtsVerifier/res/layout/audio_frequency_line_activity.xml
@@ -17,9 +17,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="10dip"
android:orientation="vertical"
->
+ style="@style/RootLayoutPadding">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -131,4 +130,4 @@
</LinearLayout>
</ScrollView>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/audio_frequency_mic_activity.xml b/apps/CtsVerifier/res/layout/audio_frequency_mic_activity.xml
index 8722f1d..bdf9e7c 100644
--- a/apps/CtsVerifier/res/layout/audio_frequency_mic_activity.xml
+++ b/apps/CtsVerifier/res/layout/audio_frequency_mic_activity.xml
@@ -17,9 +17,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="10dip"
android:orientation="vertical"
->
+ style="@style/RootLayoutPadding">
<ScrollView
android:layout_width="match_parent"
@@ -192,4 +191,4 @@
</LinearLayout>
</ScrollView>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/audio_frequency_speaker_activity.xml b/apps/CtsVerifier/res/layout/audio_frequency_speaker_activity.xml
index 926a4c7..435f5a7 100644
--- a/apps/CtsVerifier/res/layout/audio_frequency_speaker_activity.xml
+++ b/apps/CtsVerifier/res/layout/audio_frequency_speaker_activity.xml
@@ -17,8 +17,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="10dip"
- android:orientation="vertical">
+ android:orientation="vertical"
+ style="@style/RootLayoutPadding">
<ScrollView
android:layout_width="match_parent"
@@ -97,4 +97,4 @@
</LinearLayout>
</ScrollView>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/audio_frequency_unprocessed_activity.xml b/apps/CtsVerifier/res/layout/audio_frequency_unprocessed_activity.xml
index abc8033..2e43b5f 100644
--- a/apps/CtsVerifier/res/layout/audio_frequency_unprocessed_activity.xml
+++ b/apps/CtsVerifier/res/layout/audio_frequency_unprocessed_activity.xml
@@ -17,9 +17,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="10dip"
android:orientation="vertical"
->
+ style="@style/RootLayoutPadding">
<ScrollView
android:layout_width="match_parent"
@@ -77,4 +76,4 @@
</LinearLayout>
</ScrollView>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/audio_input_routingnotifications_test.xml b/apps/CtsVerifier/res/layout/audio_input_routingnotifications_test.xml
index 60a12ef..e09475c 100644
--- a/apps/CtsVerifier/res/layout/audio_input_routingnotifications_test.xml
+++ b/apps/CtsVerifier/res/layout/audio_input_routingnotifications_test.xml
@@ -18,12 +18,11 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/scrollView"
- >
+ style="@style/RootLayoutPadding">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding = "20dp"
android:orientation="vertical">
<TextView
diff --git a/apps/CtsVerifier/res/layout/audio_loopback_activity.xml b/apps/CtsVerifier/res/layout/audio_loopback_activity.xml
index 350f428..89d2e19 100644
--- a/apps/CtsVerifier/res/layout/audio_loopback_activity.xml
+++ b/apps/CtsVerifier/res/layout/audio_loopback_activity.xml
@@ -17,9 +17,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="10dip"
android:orientation="vertical"
->
+ style="@style/RootLayoutPadding">
<ScrollView
android:layout_width="match_parent"
@@ -151,4 +150,4 @@
</LinearLayout>
</ScrollView>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/audio_output_routingnotifications_test.xml b/apps/CtsVerifier/res/layout/audio_output_routingnotifications_test.xml
index d039691..dc55e2a 100644
--- a/apps/CtsVerifier/res/layout/audio_output_routingnotifications_test.xml
+++ b/apps/CtsVerifier/res/layout/audio_output_routingnotifications_test.xml
@@ -18,12 +18,11 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/scrollView"
- >
+ style="@style/RootLayoutPadding">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="20dp"
android:orientation="vertical">
<TextView
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 a545727..a20dea4 100644
--- a/apps/CtsVerifier/res/layout/ble_advertiser_hardware_scan_filter.xml
+++ b/apps/CtsVerifier/res/layout/ble_advertiser_hardware_scan_filter.xml
@@ -17,8 +17,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:padding="10dip"
- >
+ style="@style/RootLayoutPadding">
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/apps/CtsVerifier/res/layout/ble_advertiser_power_level.xml b/apps/CtsVerifier/res/layout/ble_advertiser_power_level.xml
index c8e0133..5a4ef24 100644
--- a/apps/CtsVerifier/res/layout/ble_advertiser_power_level.xml
+++ b/apps/CtsVerifier/res/layout/ble_advertiser_power_level.xml
@@ -17,8 +17,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:padding="10dip"
- >
+ style="@style/RootLayoutPadding">
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
diff --git a/apps/CtsVerifier/res/layout/ble_advertiser_test.xml b/apps/CtsVerifier/res/layout/ble_advertiser_test.xml
index 7db2b4e..58b7e56 100644
--- a/apps/CtsVerifier/res/layout/ble_advertiser_test.xml
+++ b/apps/CtsVerifier/res/layout/ble_advertiser_test.xml
@@ -17,8 +17,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:padding="10dip"
- >
+ style="@style/RootLayoutPadding">
<ListView android:id="@+id/ble_advertiser_tests"
android:layout_height="fill_parent"
android:layout_width="match_parent"
diff --git a/apps/CtsVerifier/res/layout/bt_device_picker.xml b/apps/CtsVerifier/res/layout/bt_device_picker.xml
index 48a4b43..3c0d4bc 100644
--- a/apps/CtsVerifier/res/layout/bt_device_picker.xml
+++ b/apps/CtsVerifier/res/layout/bt_device_picker.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2011 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.
@@ -14,69 +13,78 @@
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/RootLayoutPadding"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <ProgressBar
+ android:id="@+id/bt_progress_bar"
+ style="@android:style/Widget.DeviceDefault.ProgressBar.Horizontal"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- >
+ android:layout_height="4dp"
+ android:indeterminate="true" />
- <ProgressBar android:id="@+id/bt_progress_bar"
- android:indeterminate="true"
- android:layout_height="4dp"
- android:layout_width="match_parent"
- style="@android:style/Widget.DeviceDefault.ProgressBar.Horizontal"
- />
-
- <TextView android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/bt_paired_devices"
- style="?android:attr/listSeparatorTextViewStyle"
- />
- <FrameLayout android:orientation="vertical"
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_weight="1"
- >
- <ListView android:id="@+id/bt_paired_devices"
+ android:orientation="vertical">
+ <TextView
+ style="?android:attr/listSeparatorTextViewStyle"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- />
- <TextView android:id="@+id/bt_empty_paired_devices"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center"
- android:text="@string/bt_no_devices"
- android:visibility="gone"
- />
- </FrameLayout>
-
- <TextView android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/bt_new_devices"
- style="?android:attr/listSeparatorTextViewStyle"
- />
- <FrameLayout android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- >
- <ListView android:id="@+id/bt_new_devices"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- />
- <TextView android:id="@+id/bt_empty_new_devices"
+ android:layout_height="wrap_content"
+ android:text="@string/bt_paired_devices" />
+ <FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
- android:gravity="center"
- android:text="@string/bt_no_devices"
- android:visibility="gone"
- />
- </FrameLayout>
-
- <Button android:id="@+id/bt_scan_button"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:drawableTop="@android:drawable/ic_menu_search"
- android:text="@string/bt_scan"
- />
+ android:orientation="vertical">
+ <ListView
+ android:id="@+id/bt_paired_devices"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+ <TextView
+ android:id="@+id/bt_empty_paired_devices"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:text="@string/bt_no_devices"
+ android:visibility="gone" />
+ </FrameLayout>
+
+ <TextView
+ style="?android:attr/listSeparatorTextViewStyle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/bt_new_devices" />
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical">
+ <ListView
+ android:id="@+id/bt_new_devices"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+ <TextView
+ android:id="@+id/bt_empty_new_devices"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:text="@string/bt_no_devices"
+ android:visibility="gone" />
+ </FrameLayout>
+
+ <Button
+ android:id="@+id/bt_scan_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:drawableTop="@android:drawable/ic_menu_search"
+ android:text="@string/bt_scan" />
+ </LinearLayout>
+ </ScrollView>
</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/bt_messages.xml b/apps/CtsVerifier/res/layout/bt_messages.xml
index 1504431..0d5100e 100644
--- a/apps/CtsVerifier/res/layout/bt_messages.xml
+++ b/apps/CtsVerifier/res/layout/bt_messages.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2011 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.
@@ -14,69 +13,78 @@
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- >
+ style="@style/RootLayoutPadding"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
- <ProgressBar android:id="@+id/bt_progress_bar"
- android:indeterminate="true"
- android:layout_height="4dp"
- android:layout_width="match_parent"
+ <ProgressBar
+ android:id="@+id/bt_progress_bar"
style="@android:style/Widget.DeviceDefault.ProgressBar.Horizontal"
- />
+ android:layout_width="match_parent"
+ android:layout_height="4dp"
+ android:indeterminate="true" />
- <TextView android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/bt_sent_messages"
- style="?android:attr/listSeparatorTextViewStyle"
- />
- <FrameLayout android:orientation="vertical"
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_weight="1"
- >
- <ListView android:id="@+id/bt_sent_messages"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- />
- <TextView android:id="@+id/bt_empty_sent_messages"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center"
- android:visibility="gone"
- />
- </FrameLayout>
+ android:orientation="vertical">
- <TextView android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/bt_received_messages"
- style="?android:attr/listSeparatorTextViewStyle"
- />
- <FrameLayout android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- >
- <ListView android:id="@+id/bt_received_messages"
+ <TextView
+ style="?android:attr/listSeparatorTextViewStyle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/bt_sent_messages" />
+ <FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- />
- <TextView android:id="@+id/bt_empty_received_messages"
+ android:layout_weight="1"
+ android:orientation="vertical">
+ <ListView
+ android:id="@+id/bt_sent_messages"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+ <TextView
+ android:id="@+id/bt_empty_sent_messages"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:visibility="gone" />
+ </FrameLayout>
+
+ <TextView
+ style="?android:attr/listSeparatorTextViewStyle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/bt_received_messages" />
+ <FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:gravity="center"
- android:visibility="gone"
- />
- </FrameLayout>
+ android:layout_weight="1"
+ android:orientation="vertical">
+ <ListView
+ android:id="@+id/bt_received_messages"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+ <TextView
+ android:id="@+id/bt_empty_received_messages"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:visibility="gone" />
+ </FrameLayout>
- <Button android:id="@+id/bt_make_discoverable_button"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:drawableTop="@android:drawable/ic_menu_mylocation"
- android:text="@string/bt_make_discoverable"
- />
-
- <include layout="@layout/pass_fail_buttons" />
+ <Button
+ android:id="@+id/bt_make_discoverable_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:drawableTop="@android:drawable/ic_menu_mylocation"
+ android:text="@string/bt_make_discoverable" />
+ <include layout="@layout/pass_fail_buttons" />
+ </LinearLayout>
+ </ScrollView>
</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/bt_toggle.xml b/apps/CtsVerifier/res/layout/bt_toggle.xml
index 71def84..e3c00b7 100644
--- a/apps/CtsVerifier/res/layout/bt_toggle.xml
+++ b/apps/CtsVerifier/res/layout/bt_toggle.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2011 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.
@@ -14,31 +13,29 @@
limitations under the License.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+ <TextView
+ style="@style/InstructionsFont"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:padding="10dip"
- >
- <TextView android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:gravity="center"
- android:text="@string/bt_toggle_instructions"
- style="@style/InstructionsFont"
- />
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:gravity="center"
+ android:text="@string/bt_toggle_instructions" />
- <ToggleButton android:id="@+id/bt_toggle_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerInParent="true"
- android:textOn="@string/bt_disable_bluetooth"
- android:textOff="@string/bt_enable_bluetooth"
- />
-
- <include android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- layout="@layout/pass_fail_buttons"
- />
+ <ToggleButton
+ android:id="@+id/bt_toggle_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:textOff="@string/bt_enable_bluetooth"
+ android:textOn="@string/bt_disable_bluetooth" />
+
+ <include
+ layout="@layout/pass_fail_buttons"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true" />
</RelativeLayout>
diff --git a/apps/CtsVerifier/res/layout/ca_boot_notify.xml b/apps/CtsVerifier/res/layout/ca_boot_notify.xml
index f56209d..262c6ad 100644
--- a/apps/CtsVerifier/res/layout/ca_boot_notify.xml
+++ b/apps/CtsVerifier/res/layout/ca_boot_notify.xml
@@ -14,60 +14,59 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.cts.verifier.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
- <LinearLayout app:ctsv_layout_box="all"
- android:orientation="vertical" android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/RootLayoutPadding"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical">
- <ScrollView
+ <ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_alignParentTop="true" >
+ android:layout_alignParentTop="true">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
- <TextView
- android:id="@+id/check_cert_desc"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/caboot_check_cert_installed"/>
+ <TextView
+ android:id="@+id/check_cert_desc"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/caboot_check_cert_installed" />
- <Button android:id="@+id/check_creds"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/caboot_check_creds" />
+ <Button
+ android:id="@+id/check_creds"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/caboot_check_creds" />
- <TextView
- android:id="@+id/need_to_install_cert"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/caboot_if_not_installed"/>
+ <TextView
+ android:id="@+id/need_to_install_cert"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/caboot_if_not_installed" />
- <Button android:id="@+id/install"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/caboot_install_cert" />
+ <Button
+ android:id="@+id/install"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/caboot_install_cert" />
- <TextView
- android:id="@+id/reboot"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/caboot_reboot_desc"/>
+ <TextView
+ android:id="@+id/reboot"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/caboot_reboot_desc" />
- <TextView
- android:id="@+id/after_reboot"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/caboot_after_boot"/>
+ <TextView
+ android:id="@+id/after_reboot"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/caboot_after_boot" />
- <include layout="@layout/pass_fail_buttons" />
+ <include layout="@layout/pass_fail_buttons" />
</LinearLayout>
- </ScrollView>
- </LinearLayout>
-</com.android.cts.verifier.BoxInsetLayout>
+ </ScrollView>
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/cainstallnotify_main.xml b/apps/CtsVerifier/res/layout/cainstallnotify_main.xml
index 0182a0f..b5feeea 100644
--- a/apps/CtsVerifier/res/layout/cainstallnotify_main.xml
+++ b/apps/CtsVerifier/res/layout/cainstallnotify_main.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
Copyright (C) 2013 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,37 +13,31 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.cts.verifier.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/RootLayoutPadding"
android:layout_width="match_parent"
- android:layout_height="match_parent">
- <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+
+ <ScrollView
+ android:id="@+id/ca_notify_test_scroller"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:padding="10dip" >
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:orientation="vertical">
- <ScrollView
- android:id="@+id/ca_notify_test_scroller"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:orientation="vertical"
- android:padding="10dip" >
-
- <LinearLayout
- android:id="@+id/ca_notify_test_items"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical" >
- </LinearLayout>
- </ScrollView>
-
- <include
+ <LinearLayout
+ android:id="@+id/ca_notify_test_items"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="0"
- layout="@layout/pass_fail_buttons" />
+ android:orientation="vertical" />
+ </ScrollView>
- </LinearLayout>
-</com.android.cts.verifier.BoxInsetLayout>
+ <include
+ layout="@layout/pass_fail_buttons"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="0" />
+
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/da_policy_main.xml b/apps/CtsVerifier/res/layout/da_policy_main.xml
index b80649e..0f680e9 100644
--- a/apps/CtsVerifier/res/layout/da_policy_main.xml
+++ b/apps/CtsVerifier/res/layout/da_policy_main.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2011 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.
@@ -13,46 +12,49 @@
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:orientation="vertical"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/RootLayoutPadding"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- >
-
- <ListView android:id="@id/android:list"
+ android:orientation="vertical">
+ <ListView
+ android:id="@id/android:list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="1"
- />
+ android:layout_weight="1" />
- <TextView android:id="@id/android:empty"
+ <TextView
+ android:id="@id/android:empty"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="10dip"
android:text="@string/da_no_policy"
- android:textSize="18dip"
- />
+ android:textSize="18dip" />
- <LinearLayout android:orientation="horizontal"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- >
- <Button android:id="@+id/generate_policy_button"
+ android:orientation="horizontal">
+ <Button
+ android:id="@+id/generate_policy_button"
android:layout_width="1dip"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:text="@string/da_generate_policy"
- />
- <Button android:id="@+id/apply_policy_button"
+ android:text="@string/da_generate_policy" />
+ <Button
+ android:id="@+id/apply_policy_button"
android:layout_width="1dip"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:text="@string/da_apply_policy"
- />
+ android:text="@string/da_apply_policy" />
+ </LinearLayout>
+
+ <include layout="@layout/pass_fail_buttons" />
</LinearLayout>
-
- <include layout="@layout/pass_fail_buttons" />
-
-</LinearLayout>
+</ScrollView>
diff --git a/apps/CtsVerifier/res/layout/fs_main.xml b/apps/CtsVerifier/res/layout/fs_main.xml
index 40b74e9..90d48e5 100644
--- a/apps/CtsVerifier/res/layout/fs_main.xml
+++ b/apps/CtsVerifier/res/layout/fs_main.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2010 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.
@@ -13,32 +12,30 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.cts.verifier.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/RootLayoutPadding"
android:layout_width="match_parent"
- android:layout_height="match_parent">
- <LinearLayout app:ctsv_layout_box="all"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:orientation="vertical">
- <TextView android:id="@+id/fs_warnings"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/empty"/>
+ <TextView
+ android:id="@+id/fs_warnings"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/empty" />
- <ListView android:id="@id/android:list"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:drawSelectorOnTop="false"/>
+ <ListView
+ android:id="@id/android:list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:drawSelectorOnTop="false" />
- <TextView android:id="@id/android:empty"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:text="@string/fs_no_data"/>
+ <TextView
+ android:id="@id/android:empty"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:text="@string/fs_no_data" />
- <include layout="@layout/pass_fail_buttons" />
-
- </LinearLayout>
-</com.android.cts.verifier.BoxInsetLayout>
+ <include layout="@layout/pass_fail_buttons" />
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/hifi_ultrasound.xml b/apps/CtsVerifier/res/layout/hifi_ultrasound.xml
index 7d2de5a..8ad3fbd 100644
--- a/apps/CtsVerifier/res/layout/hifi_ultrasound.xml
+++ b/apps/CtsVerifier/res/layout/hifi_ultrasound.xml
@@ -14,17 +14,19 @@
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical">
+ style="@style/RootLayoutPadding">
+
+<LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
<TextView
android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="7"
- android:scrollbars="vertical"
- android:gravity="bottom"
+ android:layout_height="wrap_content"
android:id="@+id/info_text"/>
<LinearLayout
@@ -46,6 +48,6 @@
android:id="@+id/player_button"/>
</LinearLayout>
- <include layout="@layout/pass_fail_buttons" />
-
-</LinearLayout>
+ <include layout="@layout/pass_fail_buttons" />
+ </LinearLayout>
+</ScrollView>
diff --git a/apps/CtsVerifier/res/layout/intent_driven_test.xml b/apps/CtsVerifier/res/layout/intent_driven_test.xml
index dbb54c9..794a6d6 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"?>
-<com.android.cts.verifier.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent">
- <LinearLayout app:ctsv_layout_box="all"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ style="@style/RootLayoutPadding">
+
+ <ScrollView
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
- <ScrollView
+ android:layout_height="0dp"
+ android:layout_weight="1">
+ <TextView android:id="@+id/info"
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>
+ android:layout_height="wrap_content"
+ android:textSize="18sp"
+ android:padding="5dp"
+ android:text="@string/dc_start_alarm_test_info"/>
+ </ScrollView>
- <LinearLayout android:id="@+id/buttons"
- android:orientation="horizontal"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
+ <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">
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
- <include layout="@layout/pass_fail_buttons"/>
- </LinearLayout>
+ <include layout="@layout/pass_fail_buttons"/>
</LinearLayout>
-</com.android.cts.verifier.BoxInsetLayout>
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/js_charging.xml b/apps/CtsVerifier/res/layout/js_charging.xml
index e0986ba..70348fb 100644
--- a/apps/CtsVerifier/res/layout/js_charging.xml
+++ b/apps/CtsVerifier/res/layout/js_charging.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<com.android.cts.verifier.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/RootLayoutPadding"
android:layout_width="match_parent"
- android:layout_height="match_parent">
- <ScrollView app:ctsv_layout_box="all"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+ <ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
@@ -95,4 +96,4 @@
<include layout="@layout/pass_fail_buttons" />
</LinearLayout>
</ScrollView>
-</com.android.cts.verifier.BoxInsetLayout>
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/js_connectivity.xml b/apps/CtsVerifier/res/layout/js_connectivity.xml
index 0fbd48f..639280d 100644
--- a/apps/CtsVerifier/res/layout/js_connectivity.xml
+++ b/apps/CtsVerifier/res/layout/js_connectivity.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<com.android.cts.verifier.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/RootLayoutPadding"
android:layout_width="match_parent"
- android:layout_height="match_parent">
- <ScrollView app:ctsv_layout_box="all"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+ <ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
@@ -88,4 +89,4 @@
<include layout="@layout/pass_fail_buttons" />
</LinearLayout>
</ScrollView>
-</com.android.cts.verifier.BoxInsetLayout>
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/js_idle.xml b/apps/CtsVerifier/res/layout/js_idle.xml
index 732f503..f9dcc70 100644
--- a/apps/CtsVerifier/res/layout/js_idle.xml
+++ b/apps/CtsVerifier/res/layout/js_idle.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
-<com.android.cts.verifier.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent">
- <ScrollView app:ctsv_layout_box="all"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+ <ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
@@ -69,4 +69,4 @@
<include layout="@layout/pass_fail_buttons" />
</LinearLayout>
</ScrollView>
-</com.android.cts.verifier.BoxInsetLayout>
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/keychain_main.xml b/apps/CtsVerifier/res/layout/keychain_main.xml
index b134908..e31cac8 100644
--- a/apps/CtsVerifier/res/layout/keychain_main.xml
+++ b/apps/CtsVerifier/res/layout/keychain_main.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?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");
@@ -14,23 +13,22 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.cts.verifier.BoxInsetLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/RootLayoutPadding"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:orientation="vertical">
- <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+ <ScrollView
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:padding="10dip">
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:fillViewport="true">
- <ScrollView
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:fillViewport="true">
+ android:layout_height="match_parent"
+ android:orientation="vertical">
<LinearLayout
android:id="@+id/test_messages"
@@ -53,43 +51,43 @@
android:orientation="vertical" />
</LinearLayout>
- </ScrollView>
- <LinearLayout
- android:id="@+id/action_buttons"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:orientation="horizontal">
+ <LinearLayout
+ android:id="@+id/action_buttons"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:orientation="horizontal">
- <Button
- android:id="@+id/action_reset"
- android:text="@string/keychain_reset"
- android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="wrap_content" />
+ <Button
+ android:id="@+id/action_reset"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="@string/keychain_reset" />
- <Button
- android:id="@+id/action_skip"
- android:text="@string/keychain_skip"
- android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="wrap_content" />
+ <Button
+ android:id="@+id/action_skip"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="@string/keychain_skip" />
- <Button
- android:id="@+id/action_next"
- android:text="@string/next_button_text"
- android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="wrap_content" />
+ <Button
+ android:id="@+id/action_next"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="@string/next_button_text" />
+ </LinearLayout>
</LinearLayout>
+ </ScrollView>
- <include
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- layout="@layout/pass_fail_buttons" />
+ <include
+ layout="@layout/pass_fail_buttons"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="0" />
- </LinearLayout>
-</com.android.cts.verifier.BoxInsetLayout>
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/list_content.xml b/apps/CtsVerifier/res/layout/list_content.xml
index e7de596..decef55 100644
--- a/apps/CtsVerifier/res/layout/list_content.xml
+++ b/apps/CtsVerifier/res/layout/list_content.xml
@@ -15,14 +15,12 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
-<com.android.cts.verifier.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <ListView
- android:id="@android:id/list"
- app:ctsv_layout_box="all"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
-</com.android.cts.verifier.BoxInsetLayout>
+ android:layout_height="match_parent"
+ style="@style/RootLayoutPadding">
+ <ListView
+ android:id="@android:id/list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/location_mode_main.xml b/apps/CtsVerifier/res/layout/location_mode_main.xml
index 58ac069..612a963 100644
--- a/apps/CtsVerifier/res/layout/location_mode_main.xml
+++ b/apps/CtsVerifier/res/layout/location_mode_main.xml
@@ -14,23 +14,22 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.cts.verifier.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/RootLayoutPadding"
android:layout_width="match_parent"
- android:layout_height="match_parent">
- <LinearLayout app:ctsv_layout_box="all"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
- android:padding="10dip" >
+ android:orientation="vertical">
<ScrollView
android:id="@+id/test_scroller"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
- android:orientation="vertical"
- android:padding="10dip" >
+ android:orientation="vertical">
<LinearLayout
android:id="@+id/test_items"
@@ -40,11 +39,7 @@
</LinearLayout>
</ScrollView>
- <include
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- layout="@layout/pass_fail_buttons" />
+ <include layout="@layout/pass_fail_buttons" />
</LinearLayout>
-</com.android.cts.verifier.BoxInsetLayout>
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/network_screen_off.xml b/apps/CtsVerifier/res/layout/network_screen_off.xml
index 5a2446d..c0eeee8 100644
--- a/apps/CtsVerifier/res/layout/network_screen_off.xml
+++ b/apps/CtsVerifier/res/layout/network_screen_off.xml
@@ -15,7 +15,8 @@
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ style="@style/RootLayoutPadding">
<Button android:id="@+id/start_btn"
android:text="@string/network_screen_off_test_start"
diff --git a/apps/CtsVerifier/res/layout/nls_main.xml b/apps/CtsVerifier/res/layout/nls_main.xml
index 0ee4cbf..24dfb91 100644
--- a/apps/CtsVerifier/res/layout/nls_main.xml
+++ b/apps/CtsVerifier/res/layout/nls_main.xml
@@ -18,15 +18,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:padding="10dip" >
+ style="@style/RootLayoutPadding">
<ScrollView
android:id="@+id/nls_test_scroller"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
- android:orientation="vertical"
- android:padding="10dip" >
+ android:orientation="vertical">
<LinearLayout
android:id="@+id/nls_test_items"
diff --git a/apps/CtsVerifier/res/layout/pa_main.xml b/apps/CtsVerifier/res/layout/pa_main.xml
index b748123..a08daf0 100644
--- a/apps/CtsVerifier/res/layout/pa_main.xml
+++ b/apps/CtsVerifier/res/layout/pa_main.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- 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.
@@ -13,24 +12,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.cts.verifier.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
- <RelativeLayout app:ctsv_layout_box="all"
+
+ <include
+ android:id="@+id/pass_fail_buttons"
+ layout="@layout/pass_fail_buttons"
+ android:layout_gravity="top" />
+
+ <TextureView
+ android:id="@+id/texture_view"
android:layout_width="match_parent"
- android:layout_height="match_parent" >
+ android:layout_height="match_parent"
+ android:layout_below="@id/pass_fail_buttons" />
- <include
- android:id="@+id/pass_fail_buttons"
- android:layout_gravity="top"
- layout="@layout/pass_fail_buttons" />
-
- <TextureView
- android:id="@+id/texture_view"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_below="@id/pass_fail_buttons" />
-
- </RelativeLayout>
-</com.android.cts.verifier.BoxInsetLayout>
+</RelativeLayout>
diff --git a/apps/CtsVerifier/res/layout/pass_fail_list.xml b/apps/CtsVerifier/res/layout/pass_fail_list.xml
index 575e630..20e3c3b 100644
--- a/apps/CtsVerifier/res/layout/pass_fail_list.xml
+++ b/apps/CtsVerifier/res/layout/pass_fail_list.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2011 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.
@@ -13,30 +12,23 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.cts.verifier.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/RootLayoutPadding"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:orientation="vertical">
- <LinearLayout app:ctsv_layout_box="all"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- >
+ <ListView
+ android:id="@+id/android:list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
- <ListView android:id="@id/android:list"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- />
+ <TextView
+ android:id="@+id/android:empty"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
- <TextView android:id="@id/android:empty"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_weight="1"
- />
-
- <include layout="@layout/pass_fail_buttons" />
-
- </LinearLayout>
-</com.android.cts.verifier.BoxInsetLayout>
+ <include layout="@layout/pass_fail_buttons" />
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/pass_fail_text.xml b/apps/CtsVerifier/res/layout/pass_fail_text.xml
index e6b6a73..99d0b7a 100644
--- a/apps/CtsVerifier/res/layout/pass_fail_text.xml
+++ b/apps/CtsVerifier/res/layout/pass_fail_text.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2011 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.
@@ -14,21 +13,21 @@
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- >
+ style="@style/RootLayoutPadding"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
- <ScrollView android:id="@+id/scroll"
+ <ScrollView
+ android:id="@+id/scroll"
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1">
+ <TextView
+ android:id="@+id/text"
+ style="@style/InstructionsFont"
android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
- >
- <TextView android:id="@+id/text"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- style="@style/InstructionsFont"
- />
+ android:layout_height="wrap_content" />
</ScrollView>
<include layout="@layout/pass_fail_buttons" />
diff --git a/apps/CtsVerifier/res/layout/pla_list.xml b/apps/CtsVerifier/res/layout/pla_list.xml
index 0973136..83dac69 100644
--- a/apps/CtsVerifier/res/layout/pla_list.xml
+++ b/apps/CtsVerifier/res/layout/pla_list.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- 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.
@@ -14,14 +13,14 @@
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/RootLayoutPadding"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:orientation="vertical" >
+ android:orientation="vertical">
<ListView
android:id="@+id/pla_list"
android:layout_width="match_parent"
- android:layout_height="wrap_content" >
- </ListView>
+ android:layout_height="wrap_content" />
</LinearLayout>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/layout/poa_main.xml b/apps/CtsVerifier/res/layout/poa_main.xml
index b3c5588..f43b458 100644
--- a/apps/CtsVerifier/res/layout/poa_main.xml
+++ b/apps/CtsVerifier/res/layout/poa_main.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- 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.
@@ -13,22 +12,22 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.cts.verifier.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
- <LinearLayout app:ctsv_layout_box="all"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:orientation="vertical" >
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/RootLayoutPadding"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical">
- <include layout="@layout/pass_fail_buttons" />
+ <include layout="@layout/pass_fail_buttons" />
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<TextView
android:id="@+id/poa_status_text"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textAppearance="@style/InstructionsFont" />
+ </ScrollView>
- </LinearLayout>
-</com.android.cts.verifier.BoxInsetLayout>
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/poa_touch.xml b/apps/CtsVerifier/res/layout/poa_touch.xml
index 0085227..cba7e98 100644
--- a/apps/CtsVerifier/res/layout/poa_touch.xml
+++ b/apps/CtsVerifier/res/layout/poa_touch.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- 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.
@@ -15,12 +14,12 @@
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent" >
+ android:layout_height="match_parent">
<com.android.cts.verifier.projection.offscreen.ColorChangeOnKeyView
android:id="@+id/multi_touch_view"
- android:focusable="true"
- android:focusableInTouchMode="true"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="match_parent"
+ android:focusable="true"
+ android:focusableInTouchMode="true" />
</RelativeLayout>
diff --git a/apps/CtsVerifier/res/layout/positive_device_owner.xml b/apps/CtsVerifier/res/layout/positive_device_owner.xml
index 2ffb463..fa437de 100644
--- a/apps/CtsVerifier/res/layout/positive_device_owner.xml
+++ b/apps/CtsVerifier/res/layout/positive_device_owner.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
+<?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.
@@ -14,36 +13,38 @@
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- >
+ style="@style/RootLayoutPadding"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
<ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="150dp"
- android:layout_weight="2">
- <TextView
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <TextView
android:id="@+id/positive_device_owner_instructions"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="10dip"
android:text="@string/device_owner_positive_tests_instructions"
android:textSize="18dip" />
+
+ <Button
+ android:id="@+id/set_device_owner_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/set_device_owner_button_label" />
+
+ <ListView
+ android:id="@+id/android:list"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ <include layout="@layout/pass_fail_buttons" />
+ </LinearLayout>
</ScrollView>
-
- <Button
- android:id="@+id/set_device_owner_button"
- android:layout_width="204dp"
- android:layout_height="wrap_content"
- android:text="@string/set_device_owner_button_label" />
-
- <ListView
- android:id="@+id/android:list"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="3" />
-
- <include layout="@layout/pass_fail_buttons" />
-
</LinearLayout>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/layout/provisioning_byod.xml b/apps/CtsVerifier/res/layout/provisioning_byod.xml
index 54b5121..fb4093a 100644
--- a/apps/CtsVerifier/res/layout/provisioning_byod.xml
+++ b/apps/CtsVerifier/res/layout/provisioning_byod.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2011 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.
@@ -13,35 +12,31 @@
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:orientation="vertical"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/RootLayoutPadding"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- >
-
- <ScrollView
- android:layout_width="match_parent"
- android:layout_height="150dp"
- android:layout_weight="2">
+ android:orientation="vertical">
<TextView
- android:id="@+id/test_instructions"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="10dip"
- android:textSize="18dip" />
- </ScrollView>
+ android:id="@+id/test_instructions"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:padding="10dip"
+ android:textSize="18dip" />
+ <Button
+ android:id="@+id/prepare_test_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
- <Button
- android:id="@+id/prepare_test_button"
- android:layout_width="204dp"
- android:layout_height="wrap_content" />
+ <ListView
+ android:id="@+id/android:list"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
- <ListView
- android:id="@+id/android:list"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="3" />
-
- <include layout="@layout/pass_fail_buttons" />
-
-</LinearLayout>
\ No newline at end of file
+ <include layout="@layout/pass_fail_buttons" />
+ </LinearLayout>
+</ScrollView>
diff --git a/apps/CtsVerifier/res/layout/pwa_widgets.xml b/apps/CtsVerifier/res/layout/pwa_widgets.xml
index 7ead0cb..e5ebddb 100644
--- a/apps/CtsVerifier/res/layout/pwa_widgets.xml
+++ b/apps/CtsVerifier/res/layout/pwa_widgets.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- 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.
@@ -13,50 +12,47 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.cts.verifier.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
- <TextureView
- app:ctsv_layout_box="all"
- android:id="@+id/texture_view"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ <TextureView
+ android:id="@+id/texture_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
- <LinearLayout
- app:ctsv_layout_box="all"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical" >
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent" >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <include layout="@layout/pass_fail_buttons" />
- </LinearLayout>
+ <include layout="@layout/pass_fail_buttons" />
+ </LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal" >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
- <Button
- android:id="@+id/up_button"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:text="@string/pwa_button_up" />
+ <Button
+ android:id="@+id/up_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="@string/pwa_button_up" />
- <Button
- android:id="@+id/down_button"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:text="@string/pwa_button_down" />
+ <Button
+ android:id="@+id/down_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="@string/pwa_button_down" />
- </LinearLayout>
- </LinearLayout>
+ </LinearLayout>
+ </LinearLayout>
-</com.android.cts.verifier.BoxInsetLayout>
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/requesting_bugreport_device_owner.xml b/apps/CtsVerifier/res/layout/requesting_bugreport_device_owner.xml
index b2955ec..b83388b 100644
--- a/apps/CtsVerifier/res/layout/requesting_bugreport_device_owner.xml
+++ b/apps/CtsVerifier/res/layout/requesting_bugreport_device_owner.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2016 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.
@@ -14,36 +13,38 @@
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- >
+ style="@style/RootLayoutPadding"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
<ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="100dp"
- android:layout_weight="2">
- <TextView
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <TextView
android:id="@+id/requesting_bugreport_device_owner_instructions"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="10dip"
android:text="@string/device_owner_requesting_bugreport_tests_info"
android:textSize="18dip" />
+
+ <Button
+ android:id="@+id/set_device_owner_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/set_device_owner_button_label" />
+
+ <ListView
+ android:id="@+id/android:list"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ <include layout="@layout/pass_fail_buttons" />
+ </LinearLayout>
</ScrollView>
-
- <Button
- android:id="@+id/set_device_owner_button"
- android:layout_width="204dp"
- android:layout_height="wrap_content"
- android:text="@string/set_device_owner_button_label" />
-
- <ListView
- android:id="@+id/android:list"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="3" />
-
- <include layout="@layout/pass_fail_buttons" />
-
</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/snsr_hrm.xml b/apps/CtsVerifier/res/layout/snsr_hrm.xml
index 506ba9f..4c6b6ff 100644
--- a/apps/CtsVerifier/res/layout/snsr_hrm.xml
+++ b/apps/CtsVerifier/res/layout/snsr_hrm.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2014 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,43 +14,45 @@
~ limitations under the License
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/RootLayoutPadding"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <include
+ android:id="@+id/pass_fail_buttons"
+ layout="@layout/pass_fail_buttons"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true" />
- <include android:id="@+id/pass_fail_buttons"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- layout="@layout/pass_fail_buttons" />
+ <TextView
+ android:id="@+id/sensor_value"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_above="@+id/sensor_accuracy_value"
+ android:layout_centerInParent="true"
+ android:layout_marginBottom="10dip"
+ android:background="@drawable/gray_bubble"
+ android:drawablePadding="10dip"
+ android:paddingBottom="5dip"
+ android:paddingLeft="10dip"
+ android:paddingRight="10dip"
+ android:paddingTop="5dip"
+ android:textSize="28dip" />
- <TextView android:id="@+id/sensor_value"
- android:background="@drawable/gray_bubble"
- android:drawablePadding="10dip"
- android:layout_above="@+id/sensor_accuracy_value"
- android:layout_centerInParent="true"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="10dip"
- android:paddingLeft="10dip"
- android:paddingRight="10dip"
- android:paddingTop="5dip"
- android:paddingBottom="5dip"
- android:textSize="28dip"
- />
-
- <TextView android:id="@+id/sensor_accuracy_value"
- android:background="@drawable/gray_bubble"
- android:drawablePadding="10dip"
- android:layout_above="@+id/pass_fail_buttons"
- android:layout_centerInParent="true"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="10dip"
- android:paddingLeft="10dip"
- android:paddingRight="10dip"
- android:paddingTop="5dip"
- android:paddingBottom="5dip"
- android:textSize="28dip"
- />
+ <TextView
+ android:id="@+id/sensor_accuracy_value"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_above="@+id/pass_fail_buttons"
+ android:layout_centerInParent="true"
+ android:layout_marginBottom="10dip"
+ android:background="@drawable/gray_bubble"
+ android:drawablePadding="10dip"
+ android:paddingBottom="5dip"
+ android:paddingLeft="10dip"
+ android:paddingRight="10dip"
+ android:paddingTop="5dip"
+ android:textSize="28dip" />
</RelativeLayout>
diff --git a/apps/CtsVerifier/res/layout/snsr_next_button.xml b/apps/CtsVerifier/res/layout/snsr_next_button.xml
index 391c394..78c9f1f 100644
--- a/apps/CtsVerifier/res/layout/snsr_next_button.xml
+++ b/apps/CtsVerifier/res/layout/snsr_next_button.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2013 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.
@@ -14,35 +13,32 @@
limitations under the License.
-->
<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal"
- android:columnCount="@integer/test_list_footer_button_count"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:columnCount="@integer/test_list_footer_button_count"
+ android:orientation="horizontal"
+ android:paddingBottom="@dimen/snsr_view_padding_bottom"
+ android:paddingTop="@dimen/snsr_view_padding_top">
+
+ <Button
+ android:id="@+id/next_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingBottom="@dimen/snsr_view_padding_bottom"
- android:paddingTop="@dimen/snsr_view_padding_top"
- >
+ android:text="@string/next_button_text" />
- <Button android:id="@+id/next_button"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_columnWeight="1"
- android:text="@string/next_button_text"
- />
+ <Button
+ android:id="@+id/pass_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:drawableTop="@drawable/fs_good"
+ android:visibility="gone" />
- <Button android:id="@+id/pass_button"
- android:visibility="gone"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_columnWeight="1"
- android:drawableTop="@drawable/fs_good"
- />
-
- <Button android:id="@+id/fail_button"
- android:visibility="gone"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_columnWeight="1"
- android:drawableTop="@drawable/fs_error"
- />
+ <Button
+ android:id="@+id/fail_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_columnWeight="1"
+ android:drawableTop="@drawable/fs_error"
+ android:visibility="gone" />
</GridLayout>
diff --git a/apps/CtsVerifier/res/values-round/styles.xml b/apps/CtsVerifier/res/values-round/styles.xml
new file mode 100644
index 0000000..31e3c17
--- /dev/null
+++ b/apps/CtsVerifier/res/values-round/styles.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <style name="RootLayoutPadding">
+ <item name="android:paddingEnd">?android:listPreferredItemPaddingEnd</item>
+ <item name="android:paddingBottom">?android:dialogPreferredPadding</item>
+ <item name="android:paddingLeft">?android:listPreferredItemPaddingLeft</item>
+ <item name="android:paddingRight">?android:listPreferredItemPaddingRight</item>
+ <item name="android:paddingStart">?android:listPreferredItemPaddingStart</item>
+ <item name="android:paddingTop">?android:dialogPreferredPadding</item>
+ </style>
+</resources>
diff --git a/apps/CtsVerifier/res/values/styles.xml b/apps/CtsVerifier/res/values/styles.xml
index 16fa87f..0e05817 100644
--- a/apps/CtsVerifier/res/values/styles.xml
+++ b/apps/CtsVerifier/res/values/styles.xml
@@ -10,4 +10,7 @@
<item name="android:textSize">18sp</item>
<item name="android:padding">5dp</item>
</style>
+ <style name="RootLayoutPadding">
+ <item name="android:padding">10dip</item>
+ </style>
</resources>
diff --git a/hostsidetests/services/windowmanager/src/android/wm/cts/CrossAppDragAndDropTests.java b/hostsidetests/services/windowmanager/src/android/wm/cts/CrossAppDragAndDropTests.java
index 8fc3264..354b43c 100644
--- a/hostsidetests/services/windowmanager/src/android/wm/cts/CrossAppDragAndDropTests.java
+++ b/hostsidetests/services/windowmanager/src/android/wm/cts/CrossAppDragAndDropTests.java
@@ -92,15 +92,24 @@
@Override
protected void setUp() throws Exception {
super.setUp();
+
mDevice = getDevice();
+ if (!supportsDragAndDrop()) {
+ return;
+ }
+
mSourcePackageName = SOURCE_PACKAGE_NAME;
mTargetPackageName = TARGET_PACKAGE_NAME;
- cleanupState();
}
@Override
protected void tearDown() throws Exception {
super.tearDown();
+
+ if (!supportsDragAndDrop()) {
+ return;
+ }
+
mDevice.executeShellCommand(AM_FORCE_STOP + mSourcePackageName);
mDevice.executeShellCommand(AM_FORCE_STOP + mTargetPackageName);
}
@@ -288,6 +297,9 @@
private void doTestDragAndDrop(String sourceMode, String targetMode, String expectedDropResult)
throws Exception {
+ if (!supportsDragAndDrop()) {
+ return;
+ }
launchDockedActivity(mSourcePackageName, SOURCE_ACTIVITY_NAME, sourceMode);
launchFullscreenActivity(mTargetPackageName, TARGET_ACTIVITY_NAME, targetMode);
@@ -303,8 +315,11 @@
assertResult(RESULT_KEY_DROP_RESULT, expectedDropResult);
}
+ private void assertResult(String resultKey, String expectedResult) throws Exception {
+ if (!supportsDragAndDrop()) {
+ return;
+ }
- private void assertResult(String resultKey, String expectedResult) {
if (expectedResult == null) {
if (mResults.containsKey(resultKey)) {
fail("Unexpected " + resultKey + "=" + mResults.get(resultKey));
@@ -315,6 +330,11 @@
}
}
+ private boolean supportsDragAndDrop() throws Exception {
+ // Do not run this test on watches.
+ return !mDevice.hasFeature("feature:android.hardware.type.watch");
+ }
+
public void testCancelSoon() throws Exception {
doTestDragAndDrop(CANCEL_SOON, REQUEST_NONE, null);
assertResult(RESULT_KEY_DRAG_STARTED, RESULT_OK);
diff --git a/tests/app/src/android/app/cts/SearchManagerTest.java b/tests/app/src/android/app/cts/SearchManagerTest.java
index 13a8073..3a20225 100644
--- a/tests/app/src/android/app/cts/SearchManagerTest.java
+++ b/tests/app/src/android/app/cts/SearchManagerTest.java
@@ -33,7 +33,7 @@
}
public void testStopSearch() throws InterruptedException {
- if (isTelevision()) {
+ if (isTelevision() || isWatch()) {
return;
}
SearchManagerStubActivity.setCTSResult(this);
@@ -42,7 +42,7 @@
}
public void testSetOnDismissListener() throws InterruptedException {
- if (isTelevision()) {
+ if (isTelevision() || isWatch()) {
return;
}
SearchManagerStubActivity.setCTSResult(this);
@@ -51,7 +51,7 @@
}
public void testSetOnCancelListener() throws InterruptedException {
- if (isTelevision()) {
+ if (isTelevision() || isWatch()) {
return;
}
SearchManagerStubActivity.setCTSResult(this);
@@ -65,4 +65,10 @@
return pm.hasSystemFeature(PackageManager.FEATURE_TELEVISION)
|| pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK);
}
+
+ private boolean isWatch() {
+ Context context = getInstrumentation().getTargetContext();
+ PackageManager pm = context.getPackageManager();
+ return pm.hasSystemFeature(PackageManager.FEATURE_WATCH);
+ }
}
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStoreIntentsTest.java b/tests/tests/provider/src/android/provider/cts/MediaStoreIntentsTest.java
index 529b176..7df2f97 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStoreIntentsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStoreIntentsTest.java
@@ -17,6 +17,7 @@
package android.provider.cts;
import android.content.Intent;
+import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.net.Uri;
import android.provider.MediaStore;
@@ -68,6 +69,9 @@
}
public void testViewImageFile() {
+ if (getContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {
+ return;
+ }
final String[] schemes = new String[] {
"file", "http", "https", "content" };
final String[] mimes = new String[] {
diff --git a/tests/tests/speech/src/android/speech/tts/cts/TextToSpeechTest.java b/tests/tests/speech/src/android/speech/tts/cts/TextToSpeechTest.java
index 43b0fe3..c117745 100644
--- a/tests/tests/speech/src/android/speech/tts/cts/TextToSpeechTest.java
+++ b/tests/tests/speech/src/android/speech/tts/cts/TextToSpeechTest.java
@@ -144,6 +144,9 @@
}
public void testSpeakStop() throws Exception {
+ if (mTts == null) {
+ return;
+ }
getTts().stop();
final int iterations = 20;
for (int i = 0; i < iterations; i++) {