summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuchi Amalapurapu <asuchitra@google.com>2009-10-07 11:54:37 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-07 11:54:37 -0700
commit1fce3011ed2f1300bdd1adaf672288719a3e5d55 (patch)
treee8515f3c94a45570d92d2da62444e0a0af53f07f
parent12a71058ea27d636076b2750dc49b4ef6b3ed328 (diff)
parent2ae789b2bda885c393acca504ad663946ea38789 (diff)
downloadandroid_packages_apps_PackageInstaller-1fce3011ed2f1300bdd1adaf672288719a3e5d55.tar.gz
android_packages_apps_PackageInstaller-1fce3011ed2f1300bdd1adaf672288719a3e5d55.tar.bz2
android_packages_apps_PackageInstaller-1fce3011ed2f1300bdd1adaf672288719a3e5d55.zip
am 2ae789b2: The scroll view listing permissions is given a weight of 1 so that the ok and cancel buttons appear at the bottom of the screen. If the permission list doesn\'t fillup the screen aka has very few permissions, the buttons don\'t appear at the buttom. so just
Merge commit '2ae789b2bda885c393acca504ad663946ea38789' into eclair-plus-aosp * commit '2ae789b2bda885c393acca504ad663946ea38789': The scroll view listing permissions is given a weight of 1 so that the ok and cancel buttons appear at the bottom of the screen. If the permission list doesn't fillup the screen aka has very few permissions, the buttons don't appear at the buttom. so just increate the layout weight of the parent as well to fix this issue.
-rwxr-xr-xres/layout/install_confirm.xml1
-rw-r--r--src/com/android/packageinstaller/PackageInstallerActivity.java2
2 files changed, 2 insertions, 1 deletions
diff --git a/res/layout/install_confirm.xml b/res/layout/install_confirm.xml
index 524a468f..96340988 100755
--- a/res/layout/install_confirm.xml
+++ b/res/layout/install_confirm.xml
@@ -24,6 +24,7 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
+ android:layout_weight="1"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java
index 3b429d94..8f681bb0 100644
--- a/src/com/android/packageinstaller/PackageInstallerActivity.java
+++ b/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -126,7 +126,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen
}
}
if(!permVisible){
- securityList.setVisibility(View.INVISIBLE);
+ permsSection.setVisibility(View.INVISIBLE);
}
mInstallConfirm.setVisibility(View.VISIBLE);
mOk = (Button)findViewById(R.id.ok_button);