diff options
author | Kane Ho <hkho@google.com> | 2016-10-26 14:38:12 -0700 |
---|---|---|
committer | Kane Ho <hkho@google.com> | 2017-02-13 14:49:49 -0800 |
commit | d9e30f7667be51221db682bbeae0e3d96ef92f58 (patch) | |
tree | 74d82cadbd2b79ee2772e007fd5a3fbf253341a1 | |
parent | 814b11b9edfbf28df2f9647f377772f380c92112 (diff) | |
download | platform_cts-d9e30f7667be51221db682bbeae0e3d96ef92f58.tar.gz platform_cts-d9e30f7667be51221db682bbeae0e3d96ef92f58.tar.bz2 platform_cts-d9e30f7667be51221db682bbeae0e3d96ef92f58.zip |
DO NOT MERGE Fixing layout of several test suites for round screens.
Problem:
- Content is chopped on round screen.
- Some content is not scrollable on round screens.
Solution:
- Box the content into a square.
- Fix includes GNSS, Bluetooth, location mode, provisioning.
Change-Id: I400f70dfa489ceedc012dc1c5edee10c42f43e3d
-rw-r--r-- | apps/CtsVerifier/res/layout-port/gnss_test.xml | 58 | ||||
-rw-r--r-- | apps/CtsVerifier/res/layout-small/gnss_test.xml | 37 | ||||
-rw-r--r-- | apps/CtsVerifier/res/layout/bt_device_picker.xml | 118 | ||||
-rw-r--r-- | apps/CtsVerifier/res/layout/bt_messages.xml | 114 | ||||
-rw-r--r-- | apps/CtsVerifier/res/layout/bt_toggle.xml | 3 | ||||
-rw-r--r-- | apps/CtsVerifier/res/layout/da_policy_main.xml | 52 | ||||
-rw-r--r-- | apps/CtsVerifier/res/layout/fs_main.xml | 57 | ||||
-rw-r--r-- | apps/CtsVerifier/res/layout/js_charging.xml | 179 | ||||
-rw-r--r-- | apps/CtsVerifier/res/layout/js_connectivity.xml | 159 | ||||
-rw-r--r-- | apps/CtsVerifier/res/layout/js_idle.xml | 128 | ||||
-rw-r--r-- | apps/CtsVerifier/res/layout/location_mode_main.xml | 49 | ||||
-rw-r--r-- | apps/CtsVerifier/res/layout/pass_fail_list.xml | 48 | ||||
-rw-r--r-- | apps/CtsVerifier/res/layout/pass_fail_text.xml | 29 | ||||
-rw-r--r-- | apps/CtsVerifier/res/layout/positive_device_owner.xml | 47 | ||||
-rw-r--r-- | apps/CtsVerifier/res/layout/requesting_bugreport_device_owner.xml | 54 | ||||
-rw-r--r-- | apps/CtsVerifier/res/layout/snsr_next_button.xml | 52 |
16 files changed, 595 insertions, 589 deletions
diff --git a/apps/CtsVerifier/res/layout-port/gnss_test.xml b/apps/CtsVerifier/res/layout-port/gnss_test.xml index 560133a291f..1838e88db0e 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"> - - <TextView android:id="@+id/text" - android:textSize="14sp" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> - - <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> + android:layout_height="match_parent" + android:orientation="vertical" /> - <include layout="@layout/snsr_next_button" /> + </ScrollView> - </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 5caea076455..e36bf2686c3 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"/> + android:layout_height="wrap_content" + android:textSize="14sp" /> - <LinearLayout android:id="@+id/log_layout" - android:orientation="vertical" + <LinearLayout + android:id="@+id/log_layout" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_width="match_parent"/> + android:orientation="vertical" /> - <include layout="@layout/snsr_next_button"/> + <include layout="@layout/snsr_next_button" /> </LinearLayout> </ScrollView> -</com.android.cts.verifier.BoxInsetLayout> +</LinearLayout> diff --git a/apps/CtsVerifier/res/layout/bt_device_picker.xml b/apps/CtsVerifier/res/layout/bt_device_picker.xml index 48a4b4369ae..3c0d4bcb1fb 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" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - > + 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" - style="@android:style/Widget.DeviceDefault.ProgressBar.Horizontal" - /> + <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_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_height="wrap_content" + android:text="@string/bt_paired_devices" /> + <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:gravity="center" - android:text="@string/bt_no_devices" - android:visibility="gone" - /> - </FrameLayout> + android:layout_weight="1" + 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 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" + <TextView + style="?android:attr/listSeparatorTextViewStyle" 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_new_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_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 150443170dc..0d5100ee008 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:orientation="vertical"> + + <TextView + style="?android:attr/listSeparatorTextViewStyle" android:layout_width="match_parent" - android:layout_height="match_parent" - /> - <TextView android:id="@+id/bt_empty_sent_messages" + android:layout_height="wrap_content" + android:text="@string/bt_sent_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_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 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="match_parent" - /> - <TextView android:id="@+id/bt_empty_received_messages" + 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 87e8f7ab486..c592c78b418 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. diff --git a/apps/CtsVerifier/res/layout/da_policy_main.xml b/apps/CtsVerifier/res/layout/da_policy_main.xml index b80649e83e9..0f680e91eef 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" - android:layout_gravity="center_vertical" + <TextView + android:id="@id/android:empty" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" 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" - /> - </LinearLayout> + 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 40b74e97769..90d48e52a83 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"> - - <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"/> - - <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> + 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" /> + + <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" /> + + <include layout="@layout/pass_fail_buttons" /> +</LinearLayout> diff --git a/apps/CtsVerifier/res/layout/js_charging.xml b/apps/CtsVerifier/res/layout/js_charging.xml index e0986babb96..104b9abcc2d 100644 --- a/apps/CtsVerifier/res/layout/js_charging.xml +++ b/apps/CtsVerifier/res/layout/js_charging.xml @@ -1,98 +1,109 @@ -<?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" +<?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. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<ScrollView 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"> + + <LinearLayout + android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> - <LinearLayout - android:orientation="vertical" + <TextView android:layout_width="match_parent" - android:layout_height="match_parent"> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/js_test_description" - android:layout_margin="@dimen/js_padding"/> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/js_padding" - android:text="@string/js_charging_description_1" - android:textStyle="bold"/> - <Button - android:id="@+id/js_charging_start_test_button" + android:layout_height="wrap_content" + android:text="@string/js_test_description" + android:layout_margin="@dimen/js_padding"/> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/js_padding" + android:text="@string/js_charging_description_1" + android:textStyle="bold"/> + <Button + android:id="@+id/js_charging_start_test_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:text="@string/js_start_test_text" + android:onClick="startTest" + android:enabled="false"/> + <TextView + android:id="@+id/js_waiting_for_charging_text_view" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/js_padding" + android:text="@string/js_charging_description_3" + android:textStyle="bold" + android:visibility="gone"/> + <com.android.cts.verifier.TimerProgressBar + android:id="@+id/js_waiting_for_charging_progress_bar" + style="?android:attr/progressBarStyleHorizontal" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/js_padding" + android:visibility="gone"/> + <TextView + android:id="@+id/js_problem_with_charger_text_view" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/js_padding" + android:text="@string/js_charging_description_4" + android:textStyle="bold" + android:visibility="gone"/> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/js_padding" + android:layout_marginBottom="@dimen/js_padding"> + <ImageView + android:id="@+id/charging_on_test_image" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" - android:text="@string/js_start_test_text" - android:onClick="startTest" - android:enabled="false"/> + android:src="@drawable/fs_indeterminate" + android:layout_marginRight="@dimen/js_padding"/> <TextView - android:id="@+id/js_waiting_for_charging_text_view" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/js_padding" - android:text="@string/js_charging_description_3" - android:textStyle="bold" - android:visibility="gone"/> - <com.android.cts.verifier.TimerProgressBar - android:id="@+id/js_waiting_for_charging_progress_bar" - style="?android:attr/progressBarStyleHorizontal" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/js_padding" - android:visibility="gone"/> - <TextView - android:id="@+id/js_problem_with_charger_text_view" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="@dimen/js_padding" - android:text="@string/js_charging_description_4" - android:textStyle="bold" - android:visibility="gone"/> - <LinearLayout + android:text="@string/js_charging_on_test" + android:textSize="16dp"/> + </LinearLayout> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/js_padding" + android:text="@string/js_charging_description_2" + android:textStyle="bold"/> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/js_padding" + android:layout_marginBottom="@dimen/js_padding"> + <ImageView + android:id="@+id/charging_off_test_image" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/js_padding" - android:layout_marginBottom="@dimen/js_padding"> - <ImageView - android:id="@+id/charging_on_test_image" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/fs_indeterminate" - android:layout_marginRight="@dimen/js_padding"/> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/js_charging_on_test" - android:textSize="16dp"/> - </LinearLayout> + android:src="@drawable/fs_indeterminate" + android:layout_marginRight="@dimen/js_padding"/> <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/js_padding" - android:text="@string/js_charging_description_2" - android:textStyle="bold"/> - <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/js_padding" - android:layout_marginBottom="@dimen/js_padding"> - <ImageView - android:id="@+id/charging_off_test_image" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/fs_indeterminate" - android:layout_marginRight="@dimen/js_padding"/> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/js_charging_off_test" - android:textSize="16dp"/> - </LinearLayout> - <include layout="@layout/pass_fail_buttons" /> + android:text="@string/js_charging_off_test" + android:textSize="16dp"/> </LinearLayout> - </ScrollView> -</com.android.cts.verifier.BoxInsetLayout> + <include layout="@layout/pass_fail_buttons" /> + </LinearLayout> +</ScrollView> diff --git a/apps/CtsVerifier/res/layout/js_connectivity.xml b/apps/CtsVerifier/res/layout/js_connectivity.xml index 0fbd48f23d1..981d4445706 100644 --- a/apps/CtsVerifier/res/layout/js_connectivity.xml +++ b/apps/CtsVerifier/res/layout/js_connectivity.xml @@ -1,91 +1,102 @@ -<?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" +<?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. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<ScrollView + 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_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + <LinearLayout + android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/js_test_description" + android:layout_margin="@dimen/js_padding"/> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/js_connectivity_description_1" + android:layout_margin="@dimen/js_padding" + android:textStyle="bold"/> + + <Button + android:id="@+id/js_connectivity_start_test_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:text="@string/js_start_test_text" + android:onClick="startTest" + android:enabled="false"/> + <LinearLayout - android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent"> - <TextView - android:layout_width="match_parent" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/js_padding" + android:layout_marginBottom="@dimen/js_padding"> + <ImageView + android:id="@+id/connectivity_off_test_unmetered_image" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/js_test_description" - android:layout_margin="@dimen/js_padding"/> - + android:src="@drawable/fs_indeterminate" + android:layout_marginRight="@dimen/js_padding"/> <TextView - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/js_connectivity_description_1" - android:layout_margin="@dimen/js_padding" - android:textStyle="bold"/> + android:text="@string/js_unmetered_connectivity_test" + android:textSize="16dp"/> + </LinearLayout> - <Button - android:id="@+id/js_connectivity_start_test_button" + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/js_padding" + android:layout_marginBottom="@dimen/js_padding"> + <ImageView + android:id="@+id/connectivity_off_test_any_connectivity_image" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" - android:text="@string/js_start_test_text" - android:onClick="startTest" - android:enabled="false"/> - - <LinearLayout + android:src="@drawable/fs_indeterminate" + android:layout_marginRight="@dimen/js_padding"/> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/js_padding" - android:layout_marginBottom="@dimen/js_padding"> - <ImageView - android:id="@+id/connectivity_off_test_unmetered_image" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/fs_indeterminate" - android:layout_marginRight="@dimen/js_padding"/> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/js_unmetered_connectivity_test" - android:textSize="16dp"/> - </LinearLayout> + android:text="@string/js_any_connectivity_test" + android:textSize="16dp"/> + </LinearLayout> - <LinearLayout + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/js_padding" + android:layout_marginBottom="@dimen/js_padding"> + <ImageView + android:id="@+id/connectivity_off_test_no_connectivity_image" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/js_padding" - android:layout_marginBottom="@dimen/js_padding"> - <ImageView - android:id="@+id/connectivity_off_test_any_connectivity_image" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/fs_indeterminate" - android:layout_marginRight="@dimen/js_padding"/> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/js_any_connectivity_test" - android:textSize="16dp"/> - </LinearLayout> - - <LinearLayout + android:src="@drawable/fs_indeterminate" + android:layout_marginRight="@dimen/js_padding"/> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/js_padding" - android:layout_marginBottom="@dimen/js_padding"> - <ImageView - android:id="@+id/connectivity_off_test_no_connectivity_image" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/fs_indeterminate" - android:layout_marginRight="@dimen/js_padding"/> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/js_no_connectivity_test" - android:textSize="16dp"/> - </LinearLayout> - - <include layout="@layout/pass_fail_buttons" /> + android:text="@string/js_no_connectivity_test" + android:textSize="16dp"/> </LinearLayout> - </ScrollView> -</com.android.cts.verifier.BoxInsetLayout> + + <include layout="@layout/pass_fail_buttons" /> + </LinearLayout> +</ScrollView> diff --git a/apps/CtsVerifier/res/layout/js_idle.xml b/apps/CtsVerifier/res/layout/js_idle.xml index 732f503b577..f329d5b1e00 100644 --- a/apps/CtsVerifier/res/layout/js_idle.xml +++ b/apps/CtsVerifier/res/layout/js_idle.xml @@ -1,72 +1,82 @@ -<?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" +<?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. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<ScrollView + 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"> + <LinearLayout + android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> - <LinearLayout - android:orientation="vertical" + <TextView android:layout_width="match_parent" - android:layout_height="match_parent"> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/js_test_description" - android:layout_margin="@dimen/js_padding"/> - <Button - android:id="@+id/js_idle_start_test_button" + android:layout_height="wrap_content" + android:text="@string/js_test_description" + android:layout_margin="@dimen/js_padding"/> + <Button + android:id="@+id/js_idle_start_test_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:text="@string/js_start_test_text" + android:onClick="startTest" + android:enabled="false"/> + <TextView + android:id="@+id/js_idle_continue_instruction_view" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/js_idle_continue_instruction" + android:layout_margin="@dimen/js_padding" + android:textStyle="bold" + android:visibility="gone"/> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/js_padding" + android:layout_marginBottom="@dimen/js_padding"> + <ImageView + android:id="@+id/idle_off_test_image" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" - android:text="@string/js_start_test_text" - android:onClick="startTest" - android:enabled="false"/> + android:src="@drawable/fs_indeterminate" + android:layout_marginRight="@dimen/js_padding"/> <TextView - android:id="@+id/js_idle_continue_instruction_view" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/js_idle_continue_instruction" - android:layout_margin="@dimen/js_padding" - android:textStyle="bold" - android:visibility="gone"/> - - <LinearLayout + android:text="@string/js_idle_item_idle_off" + android:textSize="16dp"/> + </LinearLayout> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/js_padding" + android:layout_marginBottom="@dimen/js_padding"> + <ImageView + android:id="@+id/idle_on_test_image" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/js_padding" - android:layout_marginBottom="@dimen/js_padding"> - <ImageView - android:id="@+id/idle_off_test_image" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/fs_indeterminate" - android:layout_marginRight="@dimen/js_padding"/> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/js_idle_item_idle_off" - android:textSize="16dp"/> - </LinearLayout> - <LinearLayout + android:src="@drawable/fs_indeterminate" + android:layout_marginRight="@dimen/js_padding"/> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/js_padding" - android:layout_marginBottom="@dimen/js_padding"> - <ImageView - android:id="@+id/idle_on_test_image" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/fs_indeterminate" - android:layout_marginRight="@dimen/js_padding"/> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/js_idle_item_idle_on" - android:textSize="16dp"/> - </LinearLayout> - <include layout="@layout/pass_fail_buttons" /> + android:text="@string/js_idle_item_idle_on" + android:textSize="16dp"/> </LinearLayout> - </ScrollView> -</com.android.cts.verifier.BoxInsetLayout> + <include layout="@layout/pass_fail_buttons" /> + </LinearLayout> +</ScrollView> diff --git a/apps/CtsVerifier/res/layout/location_mode_main.xml b/apps/CtsVerifier/res/layout/location_mode_main.xml index 58ac0693556..8b2ab432ca4 100644 --- a/apps/CtsVerifier/res/layout/location_mode_main.xml +++ b/apps/CtsVerifier/res/layout/location_mode_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,27 @@ 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_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="10dip" > - - <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:layout_height="match_parent" + android:orientation="vertical"> - <LinearLayout - android:id="@+id/test_items" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - </LinearLayout> - </ScrollView> + <ScrollView + android:id="@+id/test_scroller" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:orientation="vertical"> - <include + <LinearLayout + android:id="@+id/test_items" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="0" - layout="@layout/pass_fail_buttons" /> + android:orientation="vertical" > + </LinearLayout> + </ScrollView> + + <include layout="@layout/pass_fail_buttons" /> - </LinearLayout> -</com.android.cts.verifier.BoxInsetLayout> +</LinearLayout> diff --git a/apps/CtsVerifier/res/layout/pass_fail_list.xml b/apps/CtsVerifier/res/layout/pass_fail_list.xml index 575e630515a..20e3c3b32a3 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"> - - <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" - /> - - <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> + android:layout_height="match_parent" + android:orientation="vertical"> + + <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" /> + + <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 e6b6a7393cc..99d0b7ace13 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/positive_device_owner.xml b/apps/CtsVerifier/res/layout/positive_device_owner.xml index eff3c41d49d..aab9ecd2609 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" /> - </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" /> + <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" /> - <include layout="@layout/pass_fail_buttons" /> + <ListView + android:id="@+id/android:list" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + <include layout="@layout/pass_fail_buttons" /> + </LinearLayout> + </ScrollView> </LinearLayout> diff --git a/apps/CtsVerifier/res/layout/requesting_bugreport_device_owner.xml b/apps/CtsVerifier/res/layout/requesting_bugreport_device_owner.xml index b2955ec3229..31cedb2f14e 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. @@ -13,37 +12,34 @@ 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" + android:orientation="vertical"> + <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" - > + android:orientation="vertical"> - <ScrollView - android:layout_width="match_parent" - android:layout_height="100dp" - android:layout_weight="2"> <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" /> - </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" /> + android:id="@+id/requesting_bugreport_device_owner_instructions" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/device_owner_requesting_bugreport_tests_info" + android:textSize="18dip" /> - <ListView - android:id="@+id/android:list" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="3" /> + <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" /> - <include layout="@layout/pass_fail_buttons" /> + <ListView + android:id="@+id/android:list" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> -</LinearLayout> + <include layout="@layout/pass_fail_buttons" /> + </LinearLayout> +</ScrollView> diff --git a/apps/CtsVerifier/res/layout/snsr_next_button.xml b/apps/CtsVerifier/res/layout/snsr_next_button.xml index 391c394eecb..78c9f1f8703 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" - > - - <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" - /> + android:text="@string/next_button_text" /> - <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/pass_button" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:drawableTop="@drawable/fs_good" + android:visibility="gone" /> - <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> |