From 03347bac6c91b8a8371b05783f6b23ef883b8c9a Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Thu, 11 Oct 2012 15:36:32 -0700 Subject: Fix issue #7323256: permission dialog has bad layout Change-Id: I3fc9f9bf492178ba064a4579826f49f252d41a20 --- .../packageinstaller/PackageInstallerActivity.java | 23 +++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'src/com') diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java index d0c50fc9..4a6db210 100644 --- a/src/com/android/packageinstaller/PackageInstallerActivity.java +++ b/src/com/android/packageinstaller/PackageInstallerActivity.java @@ -284,19 +284,20 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen } } if (!permVisible) { - if (msg == 0) { - if (mAppInfo != null) { - // This is an update to an application, but there are no - // permissions at all. - msg = (mAppInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0 - ? R.string.install_confirm_question_update_system_no_perms - : R.string.install_confirm_question_update_no_perms; - } else { - // This is a new application with no permissions. - msg = R.string.install_confirm_question_no_perms; - } + if (mAppInfo != null) { + // This is an update to an application, but there are no + // permissions at all. + msg = (mAppInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0 + ? R.string.install_confirm_question_update_system_no_perms + : R.string.install_confirm_question_update_no_perms; + } else { + // This is a new application with no permissions. + msg = R.string.install_confirm_question_no_perms; } tabHost.setVisibility(View.GONE); + findViewById(R.id.filler).setVisibility(View.VISIBLE); + findViewById(R.id.divider).setVisibility(View.GONE); + mScrollView = null; } if (msg != 0) { ((TextView)findViewById(R.id.install_confirm_question)).setText(msg); -- cgit v1.2.3