diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2016-01-21 03:52:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-01-21 03:52:17 +0000 |
| commit | 5f8a527f98bfcd0607953499c549effae7029ffd (patch) | |
| tree | d6d16337aff9b71ae363153e1b00adbfdba0015c /res | |
| parent | c5d417ddddfce0dad55268199da760187cb60712 (diff) | |
| parent | 235ebab3432dcad91192ee8757bb74db882bac29 (diff) | |
| download | android_packages_apps_PackageInstaller-5f8a527f98bfcd0607953499c549effae7029ffd.tar.gz android_packages_apps_PackageInstaller-5f8a527f98bfcd0607953499c549effae7029ffd.tar.bz2 android_packages_apps_PackageInstaller-5f8a527f98bfcd0607953499c549effae7029ffd.zip | |
Merge "resolve merge conflicts of 9199155a7f to master."
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/grant_permissions.xml | 105 | ||||
| -rw-r--r-- | res/values/themes.xml | 3 |
2 files changed, 57 insertions, 51 deletions
diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml index 463f0ccd..185bade5 100644 --- a/res/layout/grant_permissions.xml +++ b/res/layout/grant_permissions.xml @@ -17,71 +17,74 @@ <com.android.packageinstaller.permission.ui.ManualLayoutFrame xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" - android:layout_height="fill_parent" > + android:layout_height="fill_parent" + android:clipChildren="false"> <LinearLayout android:id="@+id/dialog_container" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:paddingTop="24dip" - android:paddingBottom="8dip" - android:paddingStart="22dip" - android:paddingEnd="16dip" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:orientation="vertical"> <FrameLayout android:id="@+id/desc_container" android:layout_width="match_parent" - android:layout_height="wrap_content" > + android:layout_height="wrap_content" + android:paddingTop="24dip" + android:paddingStart="22dip" + android:paddingEnd="16dip" + android:background="?android:attr/colorBackgroundFloating"> <include layout="@layout/permission_description" /> </FrameLayout> - <CheckBox - android:id="@+id/do_not_ask_checkbox" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginTop="16dip" - android:text="@string/never_ask_again" - style="?android:attr/textAppearanceSmall" - android:visibility="gone"> - </CheckBox> - - <com.android.packageinstaller.permission.ui.ButtonBarLayout - android:id="@+id/button_group" + <LinearLayout android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="horizontal" - android:paddingStart="2dip" - android:paddingTop="16dip"> - - <TextView - android:id="@+id/current_page_text" - android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingBottom="8dip" + android:paddingStart="22dip" + android:paddingEnd="16dip" + android:background="?android:attr/colorBackgroundFloating"> + + <CheckBox + android:id="@+id/do_not_ask_checkbox" + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_gravity="start|bottom" - android:paddingTop="4dp" - android:paddingBottom="4dp" - android:paddingEnd="12dp" - android:singleLine="true" + android:layout_marginTop="16dip" + android:text="@string/never_ask_again" style="?android:attr/textAppearanceSmall" - android:textColor="?android:attr/textColorSecondary" - 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" > - </Space> - - <LinearLayout - android:layout_width="wrap_content" + android:visibility="gone"> + </CheckBox> + + <com.android.packageinstaller.permission.ui.ButtonBarLayout + android:id="@+id/button_group" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="end" - android:orientation="horizontal" > + android:orientation="horizontal" + android:paddingStart="2dip" + android:paddingTop="16dip"> + + <TextView + android:id="@+id/current_page_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingTop="4dp" + android:paddingBottom="4dp" + android:paddingEnd="12dp" + android:singleLine="true" + style="?android:attr/textAppearanceSmall" + android:textColor="?android:attr/textColorSecondary" + 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" > + </Space> <Button android:id="@+id/permission_deny_button" @@ -100,9 +103,9 @@ android:text="@string/grant_dialog_button_allow" > </Button> - </LinearLayout> + </com.android.packageinstaller.permission.ui.ButtonBarLayout> - </com.android.packageinstaller.permission.ui.ButtonBarLayout> + </LinearLayout> </LinearLayout> diff --git a/res/values/themes.xml b/res/values/themes.xml index 6f325d2b..db4b744e 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -28,6 +28,9 @@ <style name="GrantPermissions" parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar"> + <item name="*android:windowFixedHeightMajor">100%</item> + <item name="*android:windowFixedHeightMinor">100%</item> + <item name="android:windowBackground">@android:color/transparent</item> </style> </resources> |