From 3a46ce3bb19a3a1b745a945f8c346236d751c39c Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Mon, 22 Jun 2015 14:47:48 -0400
Subject: Use vertically stacked buttons when we don't have space

Bug: 21997648
Change-Id: I72a9952f0f6d4134cacb18d1cef92701770e6c9d
---
 res/layout/grant_permissions.xml | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'res/layout/grant_permissions.xml')

diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml
index 93703053..87b51d2b 100644
--- a/res/layout/grant_permissions.xml
+++ b/res/layout/grant_permissions.xml
@@ -47,9 +47,9 @@
             android:visibility="gone">
         </CheckBox>
 
-        <LinearLayout
+        <com.android.internal.widget.ButtonBarLayout
             android:id="@+id/button_group"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:paddingStart="2dip"
@@ -59,30 +59,38 @@
                 android:id="@+id/current_page_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:paddingTop="4dp"
+                android:paddingBottom="4dp"
+                android:paddingEnd="12dp"
+                android:singleLine="true"
                 style="@android:style/TextAppearance.Material.Body2"
                 android:textColor="@color/grant_permissions_progress_color"
                 android:visibility="invisible">
             </TextView>
 
+            <Space
+                android:id="@*android:id/spacer"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:visibility="invisible" />
+
             <Button
                 android:id="@+id/permission_deny_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="?android:attr/buttonBarButtonStyle"
-                android:text="@string/grant_dialog_button_deny"
-                android:layout_marginEnd="8dip">
-            </Button>
+                android:text="@string/grant_dialog_button_deny" />
 
             <Button
                 android:id="@+id/permission_allow_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="?android:attr/buttonBarButtonStyle"
-                android:text="@string/grant_dialog_button_allow">
-            </Button>
+                android:layout_marginStart="8dip"
+                android:text="@string/grant_dialog_button_allow" />
 
-        </LinearLayout>
+        </com.android.internal.widget.ButtonBarLayout>
 
     </LinearLayout>
 </com.android.packageinstaller.permission.ui.ManualLayoutFrame>
-- 
cgit v1.2.3