Merge "Display rotation animations on watches" am: 09ab2e706f
Bug: 191096891
Test: CTS Verifier > Gyroscope Measurement Test
Merged-In: I5496ccca0e7a5fb94f5e4b2a110b0827e78fffb3
Original change: https://android-review.googlesource.com/c/platform/cts/+/1741019
Change-Id: Id14c448b389969fe48f1d967cfd909147a3f7b06
(cherry picked from commit 1c1c0556a2e15b345ec1c259308b4760660a5c8e)
diff --git a/apps/CtsVerifier/res/layout-land/sensor_test.xml b/apps/CtsVerifier/res/layout-land/sensor_test.xml
index 5dbd95a..9d8f4d6 100644
--- a/apps/CtsVerifier/res/layout-land/sensor_test.xml
+++ b/apps/CtsVerifier/res/layout-land/sensor_test.xml
@@ -46,7 +46,7 @@
<android.opengl.GLSurfaceView android:id="@+id/gl_surface_view"
android:visibility="gone"
- android:layout_width="0dp"
+ android:layout_width="@dimen/snsr_glview_size"
android:layout_height="match_parent"
android:layout_weight="1"/>
diff --git a/apps/CtsVerifier/res/layout-port/sensor_test.xml b/apps/CtsVerifier/res/layout-port/sensor_test.xml
index 024a3f3..9d00b86 100644
--- a/apps/CtsVerifier/res/layout-port/sensor_test.xml
+++ b/apps/CtsVerifier/res/layout-port/sensor_test.xml
@@ -37,7 +37,7 @@
<android.opengl.GLSurfaceView android:id="@+id/gl_surface_view"
android:visibility="gone"
- android:layout_height="0dp"
+ android:layout_height="@dimen/snsr_glview_size"
android:layout_weight="1"
android:layout_width="match_parent"/>
diff --git a/apps/CtsVerifier/res/layout-small/sensor_test.xml b/apps/CtsVerifier/res/layout-small/sensor_test.xml
index 348e321..7f2805e 100644
--- a/apps/CtsVerifier/res/layout-small/sensor_test.xml
+++ b/apps/CtsVerifier/res/layout-small/sensor_test.xml
@@ -37,7 +37,7 @@
<android.opengl.GLSurfaceView android:id="@+id/gl_surface_view"
android:visibility="gone"
- android:layout_height="0dp"
+ android:layout_height="@dimen/snsr_glview_size"
android:layout_weight="1"
android:layout_width="match_parent"/>
diff --git a/apps/CtsVerifier/res/values-small-watch/dimens.xml b/apps/CtsVerifier/res/values-small-watch/dimens.xml
new file mode 100644
index 0000000..24e84c5
--- /dev/null
+++ b/apps/CtsVerifier/res/values-small-watch/dimens.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+<resources>
+ <dimen name="snsr_glview_size">80dp</dimen>
+</resources>
diff --git a/apps/CtsVerifier/res/values/dimens.xml b/apps/CtsVerifier/res/values/dimens.xml
index a1e1955..5b6bc27 100644
--- a/apps/CtsVerifier/res/values/dimens.xml
+++ b/apps/CtsVerifier/res/values/dimens.xml
@@ -36,6 +36,8 @@
<dimen name="snsr_view_padding_left">8dp</dimen>
<dimen name="snsr_view_padding_right">8dp</dimen>
+ <dimen name="snsr_glview_size">0dp</dimen>
+
<dimen name="js_padding">10dp</dimen>
<!-- Default screen margins, per the Android Design guidelines. -->
