Merge "Fix order of buttons for device admin toggle"

This commit is contained in:
Ben Komalo
2011-09-01 16:09:30 -07:00
committed by Android (Google) Code Review

View File

@@ -120,13 +120,6 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="gone" />
<Button android:id="@+id/action_button"
android:layout_width="0dip"
android:layout_gravity="left"
android:layout_weight="1"
android:maxLines="2"
style="?android:attr/buttonBarButtonStyle"
android:layout_height="wrap_content" />
<Button android:id="@+id/cancel_button"
android:layout_width="0dip"
android:layout_gravity="right"
@@ -135,6 +128,13 @@
android:text="@string/cancel"
style="?android:attr/buttonBarButtonStyle"
android:layout_height="wrap_content" />
<Button android:id="@+id/action_button"
android:layout_width="0dip"
android:layout_gravity="left"
android:layout_weight="1"
android:maxLines="2"
style="?android:attr/buttonBarButtonStyle"
android:layout_height="wrap_content" />
<LinearLayout android:id="@+id/rightSpacer"
android:layout_width="0dip"
android:layout_weight="0.25"