commit 1743c15749fd930b329f6b41f60c78814879f225
author Ben Komalo <benkomalo@google.com> Thu Sep 01 16:01:34 2011 -0700
committer Ben Komalo <benkomalo@google.com> Thu Sep 01 16:01:34 2011 -0700
tree 876008314e78bc50b9a1b5c34c21a3101edf5747
parent 4853d2762858ba12f570b8b8dcea805bcb0d6865

Fix order of buttons for device admin toggle

Bug: 5156853
Change-Id: Ia70d5f42909d8983a0858ed67d32df12c049f420

res/layout/device_admin_add.xml

diff --git a/res/layout/device_admin_add.xml b/res/layout/device_admin_add.xml
index ac30ed9..b1ad72c 100644
--- a/res/layout/device_admin_add.xml
+++ b/res/layout/device_admin_add.xml
@@ -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"