diff options
-rw-r--r-- | res/layout/grant_permissions.xml | 26 | ||||
-rw-r--r-- | src/com/android/packageinstaller/permission/ui/GrantPermissionsDefaultViewHandler.java | 5 |
2 files changed, 22 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> diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsDefaultViewHandler.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsDefaultViewHandler.java index 1f95352d..bb3ee356 100644 --- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsDefaultViewHandler.java +++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsDefaultViewHandler.java @@ -20,6 +20,7 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ObjectAnimator; import android.content.Context; +import android.content.res.Resources; import android.graphics.drawable.Icon; import android.os.Bundle; import android.util.SparseArray; @@ -38,6 +39,7 @@ import android.widget.CheckBox; import android.widget.ImageView; import android.widget.TextView; +import com.android.internal.widget.ButtonBarLayout; import com.android.packageinstaller.R; import java.util.ArrayList; @@ -291,6 +293,9 @@ final class GrantPermissionsDefaultViewHandler public View createView() { mRootView = (ManualLayoutFrame) LayoutInflater.from(mContext) .inflate(R.layout.grant_permissions, null); + ((ButtonBarLayout) mRootView.findViewById(R.id.button_group)).setAllowStacking( + Resources.getSystem().getBoolean( + com.android.internal.R.bool.allow_stacked_button_bar)); mDialogContainer = (ViewGroup) mRootView.findViewById(R.id.dialog_container); mMessageView = (TextView) mRootView.findViewById(R.id.permission_message); |