summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ng <petergng@google.com>2011-10-14 17:33:46 -0700
committerPeter Ng <petergng@google.com>2011-10-17 15:58:20 -0700
commitd157dbc1b55709209daa48a5bdbd6fe62835852d (patch)
tree0b6a4a9e1a076af00326c6276aa19f82d5f30686
parent11a65e67245a87dfccd10c3b84c0b715f59d4ef6 (diff)
downloadandroid_packages_apps_PackageInstaller-d157dbc1b55709209daa48a5bdbd6fe62835852d.tar.gz
android_packages_apps_PackageInstaller-d157dbc1b55709209daa48a5bdbd6fe62835852d.tar.bz2
android_packages_apps_PackageInstaller-d157dbc1b55709209daa48a5bdbd6fe62835852d.zip
layout fixes and asset updates to package installer
Bug: 5361373 Change-Id: I6e5e1271013130d3bb7e6fa3acd59db5eff2cc37
-rw-r--r--AndroidManifest.xml2
-rw-r--r--res/drawable-hdpi/button_indicator_finish.pngbin892 -> 672 bytes
-rw-r--r--[-rwxr-xr-x]res/drawable-mdpi/button_indicator_finish.pngbin617 -> 532 bytes
-rw-r--r--res/drawable-xhdpi/button_indicator_finish.pngbin0 -> 840 bytes
-rw-r--r--res/layout/app_details.xml29
-rw-r--r--res/layout/install_confirm.xml11
-rw-r--r--res/layout/op_progress.xml17
-rw-r--r--res/layout/uninstall_confirm.xml7
-rw-r--r--res/layout/uninstall_progress.xml19
9 files changed, 40 insertions, 45 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a0fc6cd6..af5fa762 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -11,7 +11,7 @@
<uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" />
<application android:label="@string/app_name"
android:allowBackup="false"
- android:theme="@android:style/Theme.Holo.DialogWhenLarge">
+ android:theme="@android:style/Theme.Holo.DialogWhenLarge.NoActionBar">
<activity android:name=".PackageInstallerActivity"
android:configChanges="orientation|keyboardHidden"
android:excludeFromRecents="true">
diff --git a/res/drawable-hdpi/button_indicator_finish.png b/res/drawable-hdpi/button_indicator_finish.png
index b1be556a..373c0b66 100644
--- a/res/drawable-hdpi/button_indicator_finish.png
+++ b/res/drawable-hdpi/button_indicator_finish.png
Binary files differ
diff --git a/res/drawable-mdpi/button_indicator_finish.png b/res/drawable-mdpi/button_indicator_finish.png
index 5a01bcc4..718c6fec 100755..100644
--- a/res/drawable-mdpi/button_indicator_finish.png
+++ b/res/drawable-mdpi/button_indicator_finish.png
Binary files differ
diff --git a/res/drawable-xhdpi/button_indicator_finish.png b/res/drawable-xhdpi/button_indicator_finish.png
new file mode 100644
index 00000000..8b86ba7b
--- /dev/null
+++ b/res/drawable-xhdpi/button_indicator_finish.png
Binary files differ
diff --git a/res/layout/app_details.xml b/res/layout/app_details.xml
index b3683700..7f35d729 100644
--- a/res/layout/app_details.xml
+++ b/res/layout/app_details.xml
@@ -24,30 +24,45 @@ installation screens
android:id="@+id/app_snippet"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="16dip"
- android:layout_marginLeft="16dip"
+ android:paddingLeft="16dip"
+ android:paddingRight="16dip"
+ android:paddingTop="24dip"
>
<ImageView android:id="@+id/app_icon"
- android:layout_width="54dip"
- android:layout_height="54dip"
+ android:layout_width="32dip"
+ android:layout_height="32dip"
+ android:layout_marginLeft="8dip"
android:background="@color/transparent"
android:layout_alignParentLeft="true"
android:gravity="left"
- android:scaleType="centerCrop"
- android:layout_marginLeft="8dip"/>
+ android:scaleType="centerCrop"/>
<TextView android:id="@+id/app_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:gravity="center"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="?android:attr/textColorPrimary"
android:shadowColor="@color/shadow"
android:shadowRadius="2"
android:layout_toRightOf="@id/app_icon"
android:singleLine="true"
- android:gravity="center"
android:layout_centerInParent="true"
android:paddingRight="16dip"
+ android:paddingTop="3dip"
android:paddingLeft="16dip"
android:ellipsize="end"/>
+ <FrameLayout
+ android:id="@+id/top_divider"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="4dip"
+ android:layout_below="@id/app_name">
+ <ProgressBar
+ android:id="@+id/progress_bar"
+ style="?android:attr/progressBarStyleHorizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+ </FrameLayout>
+
</RelativeLayout>
diff --git a/res/layout/install_confirm.xml b/res/layout/install_confirm.xml
index f8d54b86..0eb8ba6b 100644
--- a/res/layout/install_confirm.xml
+++ b/res/layout/install_confirm.xml
@@ -25,7 +25,9 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:paddingLeft="8dip"
+ android:paddingRight="8dip">
<TextView
android:id="@+id/install_confirm_question"
@@ -34,7 +36,7 @@
android:text="@string/install_confirm_question"
android:textAppearance="?android:attr/textAppearanceMedium"
style="@style/padded"
- android:paddingTop="16dip"
+ android:paddingTop="12dip"
android:paddingBottom="16dip"/>
<ScrollView
@@ -57,10 +59,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:paddingTop="20dip"
- android:paddingLeft="20dip"
- android:paddingBottom="20dip"/>
-
+ />
<LinearLayout
android:id="@+id/security_settings_list"
android:layout_width="match_parent"
diff --git a/res/layout/op_progress.xml b/res/layout/op_progress.xml
index 6d41c00e..6b269403 100644
--- a/res/layout/op_progress.xml
+++ b/res/layout/op_progress.xml
@@ -82,10 +82,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/app_snippet"
- android:gravity="center_horizontal"
+ android:gravity="left"
android:text="@string/installing"
android:paddingTop="16dip"
- android:paddingLeft="16dip"
+ android:paddingLeft="32dip"
+ android:paddingRight="32dip"
android:textAppearance="?android:attr/textAppearanceMedium" />
<!-- This explanation text is shown only after the progress bar below goes away. -->
@@ -106,18 +107,6 @@
android:textAppearance="?android:attr/textAppearanceSmall"/>
</ScrollView>
- <!-- This progress bar goes away when the explanation above is displayed. -->
- <ProgressBar
- android:id="@+id/progress_bar"
- style="?android:attr/progressBarStyleHorizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/center_text"
- android:paddingTop="24dip"
- android:paddingLeft="16dip"
- android:paddingRight="16dip"
- android:max="100" />
-
</RelativeLayout>
diff --git a/res/layout/uninstall_confirm.xml b/res/layout/uninstall_confirm.xml
index bd8afecc..29b23044 100644
--- a/res/layout/uninstall_confirm.xml
+++ b/res/layout/uninstall_confirm.xml
@@ -33,8 +33,8 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:orientation="vertical"
- android:paddingTop="6dip"
- android:paddingBottom="6dip">
+ android:paddingTop="8dip"
+ android:paddingBottom="8dip">
<!-- If an activity was specified, explains what package it's in. -->
<TextView
@@ -58,7 +58,8 @@
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorSecondary"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:padding="16dip" />
+ android:paddingLeft="24dip"
+ android:paddingRight="24dip" />
</LinearLayout>
diff --git a/res/layout/uninstall_progress.xml b/res/layout/uninstall_progress.xml
index 080d1785..bd1854b1 100644
--- a/res/layout/uninstall_progress.xml
+++ b/res/layout/uninstall_progress.xml
@@ -67,8 +67,6 @@
android:id="@+id/app_snippet"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:layout_marginTop="16dip"
- android:layout_marginLeft="16dip"
android:layout_alignParentTop="true" />
<LinearLayout
@@ -84,28 +82,21 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
- android:padding="16dip"
+ android:paddingLeft="24dip"
+ android:paddingRight="24dip"
+ android:paddingTop="8dip"
+ android:paddingBottom="8dip"
android:fillViewport="false">
<TextView
android:id="@+id/center_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="center_horizontal"
+ android:gravity="left"
android:text="@string/uninstalling"
android:textAppearance="?android:attr/textAppearanceMedium"/>
</ScrollView>
- <ProgressBar
- android:id="@+id/progress_bar"
- style="?android:attr/progressBarStyleHorizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="24dip"
- android:paddingLeft="16dip"
- android:paddingRight="16dip"
- android:max="100" />
-
<Button android:id="@+id/device_manager_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"