Swap the positive and negative buttons.

Change-Id: Ib5d7f57c47e79359174c0a24f72b1a8d509a6f4e

6 files changed, 13 insertions, 29 deletions

diff --git a/res/layout/app_details.xml b/res/layout/app_details.xml
index b3683700..b3683700 100755..100644
--- a/res/layout/app_details.xml
+++ b/res/layout/app_details.xml
diff --git a/res/layout/install_confirm.xml b/res/layout/install_confirm.xml
index a54b2ef0..f8d54b86 100755..100644
--- a/res/layout/install_confirm.xml
+++ b/res/layout/install_confirm.xml
@@ -74,11 +74,9 @@
     <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:minHeight="54dip"
             android:orientation="vertical"
             android:divider="?android:attr/dividerHorizontal"
             android:showDividers="beginning"
-            android:dividerPadding="16dip"
             android:paddingTop="16dip">
 
         <LinearLayout
@@ -86,8 +84,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                android:paddingLeft="2dip"
-                android:paddingRight="2dip"
                 android:measureWithLargestChild="true">
 
             <LinearLayout android:id="@+id/leftSpacer"
@@ -97,23 +93,23 @@
                     android:orientation="horizontal"
                     android:visibility="gone" />
 
-            <Button android:id="@+id/ok_button"
+            <Button android:id="@+id/cancel_button"
                     android:layout_width="0dip"
                     android:layout_height="wrap_content"
                     android:layout_gravity="left"
                     android:layout_weight="1"
-                    android:text="@string/install"
+                    android:text="@string/cancel"
                     android:maxLines="2"
-                    android:filterTouchesWhenObscured="true"
                     style="?android:attr/buttonBarButtonStyle" />
 
-            <Button android:id="@+id/cancel_button"
+            <Button android:id="@+id/ok_button"
                     android:layout_width="0dip"
                     android:layout_height="wrap_content"
                     android:layout_gravity="right"
                     android:layout_weight="1"
-                    android:text="@string/cancel"
+                    android:text="@string/install"
                     android:maxLines="2"
+                    android:filterTouchesWhenObscured="true"
                     style="?android:attr/buttonBarButtonStyle" />
 
             <LinearLayout android:id="@+id/rightSpacer"
diff --git a/res/layout/install_start.xml b/res/layout/install_start.xml
index 5e0f9579..5e0f9579 100755..100644
--- a/res/layout/install_start.xml
+++ b/res/layout/install_start.xml
diff --git a/res/layout/op_progress.xml b/res/layout/op_progress.xml
index dde1e82e..6d41c00e 100755..100644
--- a/res/layout/op_progress.xml
+++ b/res/layout/op_progress.xml
@@ -23,11 +23,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:minHeight="54dip"
             android:orientation="vertical"
             android:divider="?android:attr/dividerHorizontal"
             android:showDividers="beginning"
-            android:dividerPadding="16dip"
             android:paddingTop="16dip">
 
         <LinearLayout
@@ -35,8 +33,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                android:paddingLeft="2dip"
-                android:paddingRight="2dip"
                 android:measureWithLargestChild="true">
 
             <LinearLayout android:id="@+id/leftSpacer"
@@ -46,21 +42,21 @@
                     android:orientation="horizontal"
                     android:visibility="gone" />
 
-            <Button android:id="@+id/launch_button"
+            <Button android:id="@+id/done_button"
                     android:layout_width="0dip"
                     android:layout_height="wrap_content"
                     android:layout_gravity="left"
                     android:layout_weight="1"
-                    android:text="@string/launch"
+                    android:text="@string/done"
                     android:maxLines="2"
                     style="?android:attr/buttonBarButtonStyle" />
 
-            <Button android:id="@+id/done_button"
+            <Button android:id="@+id/launch_button"
                     android:layout_width="0dip"
                     android:layout_height="wrap_content"
                     android:layout_gravity="right"
                     android:layout_weight="1"
-                    android:text="@string/done"
+                    android:text="@string/launch"
                     android:maxLines="2"
                     style="?android:attr/buttonBarButtonStyle" />
 
diff --git a/res/layout/uninstall_confirm.xml b/res/layout/uninstall_confirm.xml
index 6e0d94d1..bd8afecc 100755..100644
--- a/res/layout/uninstall_confirm.xml
+++ b/res/layout/uninstall_confirm.xml
@@ -66,11 +66,9 @@
     <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:minHeight="54dip"
             android:orientation="vertical"
             android:divider="?android:attr/dividerHorizontal"
             android:showDividers="beginning"
-            android:dividerPadding="16dip"
             android:paddingTop="16dip">
 
         <LinearLayout
@@ -78,8 +76,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                android:paddingLeft="2dip"
-                android:paddingRight="2dip"
                 android:measureWithLargestChild="true">
 
             <LinearLayout android:id="@+id/leftSpacer"
@@ -89,21 +85,21 @@
                 android:orientation="horizontal"
                 android:visibility="gone" />
 
-            <Button android:id="@+id/ok_button"
+            <Button android:id="@+id/cancel_button"
                 android:layout_width="0dip"
                 android:layout_height="wrap_content"
                 android:layout_gravity="left"
                 android:layout_weight="1"
-                android:text="@string/ok"
+                android:text="@string/cancel"
                 android:maxLines="2"
                 style="?android:attr/buttonBarButtonStyle" />
 
-            <Button android:id="@+id/cancel_button"
+            <Button android:id="@+id/ok_button"
                 android:layout_width="0dip"
                 android:layout_height="wrap_content"
                 android:layout_gravity="right"
                 android:layout_weight="1"
-                android:text="@string/cancel"
+                android:text="@string/ok"
                 android:maxLines="2"
                 style="?android:attr/buttonBarButtonStyle" />
 
diff --git a/res/layout/uninstall_progress.xml b/res/layout/uninstall_progress.xml
index 9cf69612..76c657a6 100755..100644
--- a/res/layout/uninstall_progress.xml
+++ b/res/layout/uninstall_progress.xml
@@ -24,11 +24,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:minHeight="54dip"
             android:orientation="vertical"
             android:divider="?android:attr/dividerHorizontal"
             android:showDividers="beginning"
-            android:dividerPadding="16dip"
             android:paddingTop="16dip">
 
         <LinearLayout
@@ -36,8 +34,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                android:paddingLeft="2dip"
-                android:paddingRight="2dip"
                 android:measureWithLargestChild="true">
 
             <LinearLayout android:id="@+id/leftSpacer"