diff options
author | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:24:23 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:24:23 -0800 |
commit | e002f536cba85cb90655e44e15497054c1a5651a (patch) | |
tree | 82ced13a5969a87673836a935a0f67d3cf16d5b5 /res/layout/grant_permissions.xml | |
parent | cb079ef38ce9881687ab9c89e1c321ded722c1b3 (diff) | |
parent | b145bb2c34c495a51b83bf755e560d7b931ea8f7 (diff) | |
download | android_packages_apps_PackageInstaller-e002f536cba85cb90655e44e15497054c1a5651a.tar.gz android_packages_apps_PackageInstaller-e002f536cba85cb90655e44e15497054c1a5651a.tar.bz2 android_packages_apps_PackageInstaller-e002f536cba85cb90655e44e15497054c1a5651a.zip |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/PackageInstaller into cm-13.0staging/cm-13.0+r22
Android 6.0.1 release 22
Diffstat (limited to 'res/layout/grant_permissions.xml')
-rw-r--r-- | res/layout/grant_permissions.xml | 48 |
1 files changed, 31 insertions, 17 deletions
diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml index b3565240..463f0ccd 100644 --- a/res/layout/grant_permissions.xml +++ b/res/layout/grant_permissions.xml @@ -18,6 +18,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" > + <LinearLayout android:id="@+id/dialog_container" android:layout_width="fill_parent" @@ -46,10 +47,10 @@ android:visibility="gone"> </CheckBox> - <com.android.internal.widget.ButtonBarLayout + <com.android.packageinstaller.permission.ui.ButtonBarLayout android:id="@+id/button_group" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:orientation="horizontal" android:paddingStart="2dip" android:paddingTop="16dip"> @@ -58,12 +59,13 @@ android:id="@+id/current_page_text" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="start|bottom" 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" + style="?android:attr/textAppearanceSmall" + android:textColor="?android:attr/textColorSecondary" android:visibility="invisible"> </TextView> @@ -72,24 +74,36 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_weight="1" - android:visibility="invisible" /> + android:visibility="invisible" > + </Space> - <Button - android:id="@+id/permission_deny_button" + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - style="?android:attr/buttonBarButtonStyle" - android:text="@string/grant_dialog_button_deny" /> + android:layout_gravity="end" + android:orientation="horizontal" > - <Button - android:id="@+id/permission_allow_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - style="?android:attr/buttonBarButtonStyle" - android:layout_marginStart="8dip" - android:text="@string/grant_dialog_button_allow" /> + <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" > + </Button> - </com.android.internal.widget.ButtonBarLayout> + <Button + android:id="@+id/permission_allow_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="?android:attr/buttonBarButtonStyle" + android:layout_marginStart="8dip" + android:text="@string/grant_dialog_button_allow" > + </Button> + + </LinearLayout> + + </com.android.packageinstaller.permission.ui.ButtonBarLayout> </LinearLayout> + </com.android.packageinstaller.permission.ui.ManualLayoutFrame> |