diff options
author | Dianne Hackborn <hackbod@google.com> | 2011-01-18 15:32:44 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-18 15:32:44 -0800 |
commit | 2ec5a7160b3d32887b2428edef7a751ee3700809 (patch) | |
tree | 7c5b8aeaee085134d028d2b1018138d33ff167d8 /policy | |
parent | 761a6b7fdbe2bcc6db4306af9705dcb22b036068 (diff) | |
parent | 36c84403ec07439d11ed284ac5f9a9db807fbf92 (diff) | |
download | frameworks_base-2ec5a7160b3d32887b2428edef7a751ee3700809.zip frameworks_base-2ec5a7160b3d32887b2428edef7a751ee3700809.tar.gz frameworks_base-2ec5a7160b3d32887b2428edef7a751ee3700809.tar.bz2 |
am 36c84403: Merge "Fix issue #3362484: Can\'t dismiss activity picker by tapping outside dialog" into honeycomb
* commit '36c84403ec07439d11ed284ac5f9a9db807fbf92':
Fix issue #3362484: Can't dismiss activity picker by tapping outside dialog
Diffstat (limited to 'policy')
-rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index 68c1453..fb20e81 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -166,6 +166,8 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { private int mTitleColor = 0; + private boolean mAlwaysReadCloseOnTouchAttr = false; + private ContextMenuBuilder mContextMenu; private MenuDialogHelper mContextMenuHelper; private ActionButtonSubmenu mActionButtonPopup; @@ -2326,6 +2328,17 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { addFlags(WindowManager.LayoutParams.FLAG_NEEDS_MENU_KEY); } + if (mAlwaysReadCloseOnTouchAttr || getContext().getApplicationInfo().targetSdkVersion + >= android.os.Build.VERSION_CODES.HONEYCOMB) { + if (!hasSetCloseOnTouchOutside()) { + if (a.getBoolean( + com.android.internal.R.styleable.Window_windowCloseOnTouchOutside, + false)) { + setCloseOnTouchOutside(true); + } + } + } + WindowManager.LayoutParams params = getAttributes(); if (!hasSoftInputMode()) { @@ -2479,6 +2492,11 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { return contentParent; } + /** @hide */ + public void alwaysReadCloseOnTouchAttr() { + mAlwaysReadCloseOnTouchAttr = true; + } + private void installDecor() { if (mDecor == null) { mDecor = generateDecor(); |