commit 1f429286d2e0eae568f7201f01d3bb3fe56902b1
author Lei Yu <jackqdyulei@google.com> Wed May 09 15:08:09 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed May 09 15:08:09 2018 -0700
tree aecd6829b8f3cb45c993e659745fe82ae252ddd6
parent aee672badcefbe7cab772e694b2b9df524d5c40d
parent 1dbe185db287c2a19210847bc9115a2ce61c13db

Merge "Use WRAP_CONTENT for battery saver button" into pi-dev
am: 1dbe185db2

Change-Id: I14a5de9f360b11de52ecda509fcdeca11d1af0a2

res/layout/two_state_button.xml

diff --git a/res/layout/two_state_button.xml b/res/layout/two_state_button.xml
index 22bf2bd..3ad1634 100644
--- a/res/layout/two_state_button.xml
+++ b/res/layout/two_state_button.xml
@@ -27,19 +27,15 @@
     <Button
         android:id="@+id/state_on_button"
         style="@style/ActionPrimaryButton"
-        android:layout_width="0dp"
-        android:layout_weight="1"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:paddingEnd="8dp" />
+        android:layout_gravity="center" />
 
     <Button
         android:id="@+id/state_off_button"
         style="@style/ActionSecondaryButton"
-        android:layout_width="0dp"
-        android:layout_weight="1"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:paddingEnd="8dp" />
+        android:layout_gravity="center" />
 
 </LinearLayout>
\ No newline at end of file