diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-01-18 22:00:21 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-18 22:00:21 -0800 |
| commit | 310ae9b39c10f6b43c885e458eb8d135a3ba6b71 (patch) | |
| tree | 5f45c34383ff8b7ca31b1b5c2b56160306f93b5c /policy | |
| parent | 2b25dcc09d3ff8895fd070e49c74c0758c3c7938 (diff) | |
| parent | fe86e9793ce62c6a1aa34e5712f16b45800efdd0 (diff) | |
| download | frameworks_base-310ae9b39c10f6b43c885e458eb8d135a3ba6b71.zip frameworks_base-310ae9b39c10f6b43c885e458eb8d135a3ba6b71.tar.gz frameworks_base-310ae9b39c10f6b43c885e458eb8d135a3ba6b71.tar.bz2 | |
am fe86e979: am 661b6cfb: Merge "Okay, new plan for dialogs." into honeycomb
* commit 'fe86e9793ce62c6a1aa34e5712f16b45800efdd0':
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 3cb6f75..546c7c3 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -2347,12 +2347,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); } } |