diff options
| author | Jason Monk <jmonk@google.com> | 2015-06-22 19:52:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-22 19:52:59 +0000 |
| commit | 5eddce8d5eb0d50cb2c5c6c80cd4dc27ce32531c (patch) | |
| tree | 4cb1a8640ea4a8f6e6ceda28e7219ace1cf4f76c /res | |
| parent | 51cb4381023d0f95e3e9bf203c4df6bd223955b3 (diff) | |
| parent | 3a46ce3bb19a3a1b745a945f8c346236d751c39c (diff) | |
| download | android_packages_apps_PackageInstaller-5eddce8d5eb0d50cb2c5c6c80cd4dc27ce32531c.tar.gz android_packages_apps_PackageInstaller-5eddce8d5eb0d50cb2c5c6c80cd4dc27ce32531c.tar.bz2 android_packages_apps_PackageInstaller-5eddce8d5eb0d50cb2c5c6c80cd4dc27ce32531c.zip | |
Merge "Use vertically stacked buttons when we don't have space" into mnc-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/grant_permissions.xml | 26 |
1 files changed, 17 insertions, 9 deletions
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> |