summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2015-12-10 19:54:14 (GMT)
committerandroid-build-merger <android-build-merger@google.com>2015-12-10 19:54:14 (GMT)
commitd0a1dda30d94e7c0ecfbd47c5a8d82c3adf30bbd (patch)
tree59b82543e590a33de92944549b9225529a5f7a60
parentcfc6b97c7d4dbaf7a50433a0f459ee4e25725e82 (diff)
parent587374a996e14a7d0bd278e7c6b0a755e1d7112c (diff)
downloadandroid_packages_apps_PackageInstaller-d0a1dda30d94e7c0ecfbd47c5a8d82c3adf30bbd.zip
android_packages_apps_PackageInstaller-d0a1dda30d94e7c0ecfbd47c5a8d82c3adf30bbd.tar.gz
android_packages_apps_PackageInstaller-d0a1dda30d94e7c0ecfbd47c5a8d82c3adf30bbd.tar.bz2
Fix some UI glitches in PackageInstaller am: 42af15b6d9
am: 587374a996 * commit '587374a996e14a7d0bd278e7c6b0a755e1d7112c': Fix some UI glitches in PackageInstaller
-rw-r--r--res/drawable/ic_info.xml3
-rw-r--r--res/layout/grant_permissions.xml37
-rw-r--r--res/layout/permission_description.xml1
3 files changed, 26 insertions, 15 deletions
diff --git a/res/drawable/ic_info.xml b/res/drawable/ic_info.xml
index f80a41c..029ff1b 100644
--- a/res/drawable/ic_info.xml
+++ b/res/drawable/ic_info.xml
@@ -17,7 +17,8 @@ Copyright (C) 2015 The Android Open Source Project
android:width="24.0dp"
android:height="24.0dp"
android:viewportWidth="24.0"
- android:viewportHeight="24.0">
+ android:viewportHeight="24.0"
+ android:tint="?attr/colorControlNormal">
<path
android:pathData="M0 0h24v24H0z"
android:fillColor="#00000000"/>
diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml
index 086a541..463f0cc 100644
--- a/res/layout/grant_permissions.xml
+++ b/res/layout/grant_permissions.xml
@@ -50,7 +50,7 @@
<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">
@@ -59,6 +59,7 @@
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"
@@ -76,22 +77,30 @@
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" >
- </Button>
+ 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>
+ <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>
+
+ <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>
diff --git a/res/layout/permission_description.xml b/res/layout/permission_description.xml
index c9b60d6..2a00e9b 100644
--- a/res/layout/permission_description.xml
+++ b/res/layout/permission_description.xml
@@ -34,6 +34,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/permission_icon"
+ android:layout_marginTop="3dp"
android:paddingStart="16dip"
android:paddingEnd="8dip"
style="?android:attr/textAppearanceMedium">