am d1eaac2b: am 52951f98: am 39bb0e6b: am 0c6b03d4: am 43b1b930: Merge "Added layout tweaks to handle small screens for CTS Sensor Test." into lollipop-mr1-cts-dev
* commit 'd1eaac2bc02f089f6ec46193f0aa676c15b1a61d':
Added layout tweaks to handle small screens for CTS Sensor Test.
diff --git a/apps/CtsVerifier/res/layout-small/sensor_test.xml b/apps/CtsVerifier/res/layout-small/sensor_test.xml
new file mode 100644
index 0000000..eefa5fa
--- /dev/null
+++ b/apps/CtsVerifier/res/layout-small/sensor_test.xml
@@ -0,0 +1,45 @@
+<?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.
+ 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.
+-->
+<android.support.wearable.view.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">
+ <ScrollView android:id="@+id/log_scroll_view"
+ app:layout_box="all"
+ android:fillViewport="true"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent">
+
+ <LinearLayout android:id="@+id/log_layout"
+ android:orientation="vertical"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"/>
+
+ <android.opengl.GLSurfaceView android:id="@+id/gl_surface_view"
+ android:visibility="gone"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:layout_width="match_parent"/>
+
+ <include layout="@layout/snsr_next_button"/>
+ </LinearLayout>
+
+ </ScrollView>
+</android.support.wearable.view.BoxInsetLayout>
diff --git a/apps/CtsVerifier/res/layout/snsr_next_button.xml b/apps/CtsVerifier/res/layout/snsr_next_button.xml
index e7a6d72..391c394 100644
--- a/apps/CtsVerifier/res/layout/snsr_next_button.xml
+++ b/apps/CtsVerifier/res/layout/snsr_next_button.xml
@@ -13,9 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
- android:gravity="center"
+ android:columnCount="@integer/test_list_footer_button_count"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/snsr_view_padding_bottom"
@@ -25,6 +25,7 @@
<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"
/>
@@ -32,6 +33,7 @@
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_columnWeight="1"
android:drawableTop="@drawable/fs_good"
/>
@@ -39,7 +41,8 @@
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_columnWeight="1"
android:drawableTop="@drawable/fs_error"
/>
-</LinearLayout>
+</GridLayout>