diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-01-18 18:40:22 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-18 18:40:22 -0800 |
| commit | fe86e9793ce62c6a1aa34e5712f16b45800efdd0 (patch) | |
| tree | 90c0c207569cafcc71fd5f789ca7bc4996abdee4 /policy | |
| parent | b28c5eccabff5192d94fd59594123e8f9d450c1c (diff) | |
| parent | 661b6cfb2bcecdd335540db7059e5d8e22c2e79a (diff) | |
| download | frameworks_base-fe86e9793ce62c6a1aa34e5712f16b45800efdd0.zip frameworks_base-fe86e9793ce62c6a1aa34e5712f16b45800efdd0.tar.gz frameworks_base-fe86e9793ce62c6a1aa34e5712f16b45800efdd0.tar.bz2 | |
am 661b6cfb: Merge "Okay, new plan for dialogs." into honeycomb
* commit '661b6cfb2bcecdd335540db7059e5d8e22c2e79a':
Okay, new plan for dialogs.
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index 1d0b633..c313713 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -2331,12 +2331,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 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); - } + if (a.getBoolean( + com.android.internal.R.styleable.Window_windowCloseOnTouchOutside, + false)) { + setCloseOnTouchOutsideIfNotSet(true); } } |