aboutsummaryrefslogtreecommitdiff
path: root/tests/EmbeddedKitchenSinkApp/res
diff options
context:
space:
mode:
authorHarry Slatyer <slatyer@google.com>2018-03-15 04:57:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-03-15 04:57:06 +0000
commit7e45b2bad1fa887a160d79738139d3062a1869b2 (patch)
treef41b6c6326642301181f251283ffaca4850bec0c /tests/EmbeddedKitchenSinkApp/res
parentccef3a4489a72fa05e28c25f582397a3b5e5943b (diff)
parent1336b99ba5e009ca175f130133bec0dc8dea4567 (diff)
downloadCar-7e45b2bad1fa887a160d79738139d3062a1869b2.tar.gz
Merge "Arrange kitchensink inst cluster buttons vertically." into pi-dev
Diffstat (limited to 'tests/EmbeddedKitchenSinkApp/res')
-rw-r--r--tests/EmbeddedKitchenSinkApp/res/layout/instrument_cluster.xml43
1 files changed, 27 insertions, 16 deletions
diff --git a/tests/EmbeddedKitchenSinkApp/res/layout/instrument_cluster.xml b/tests/EmbeddedKitchenSinkApp/res/layout/instrument_cluster.xml
index cb785a9790..f58af8f372 100644
--- a/tests/EmbeddedKitchenSinkApp/res/layout/instrument_cluster.xml
+++ b/tests/EmbeddedKitchenSinkApp/res/layout/instrument_cluster.xml
@@ -22,20 +22,31 @@
<LinearLayout
android:orientation="vertical"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content">
- <LinearLayout
- android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
- <Button android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:text="@string/cluster_start" android:id="@+id/cluster_start_button"/>
- <Button android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:text="@string/cluster_turn_left" android:id="@+id/cluster_turn_left_button"/>
- <Button android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:text="@string/cluster_stop" android:id="@+id/cluster_stop_button"/>
- <Button android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:text="@string/cluster_start_activity" android:id="@+id/cluster_start_activity"/>
- </LinearLayout>
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <Button
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:text="@string/cluster_start"
+ android:id="@+id/cluster_start_button"/>
+ <Button
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:text="@string/cluster_turn_left"
+ android:id="@+id/cluster_turn_left_button"/>
+ <Button
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:text="@string/cluster_stop"
+ android:id="@+id/cluster_stop_button"/>
+ <Button
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:text="@string/cluster_start_activity"
+ android:id="@+id/cluster_start_activity"/>
</LinearLayout>
-</LinearLayout> \ No newline at end of file
+</LinearLayout>