diff options
| author | Adam Powell <adamp@google.com> | 2011-01-16 20:00:17 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-16 20:00:17 -0800 |
| commit | 4ba7f35e0f9cfdf59ed6e8f9092992893da46d4a (patch) | |
| tree | 46f5af8f33ff29330db852ea514e9324c00a4032 /policy | |
| parent | 0a654ae398a84858ed00326c75b8ca15516db880 (diff) | |
| parent | 92cd4d0296cc8936fcccd97cdbc7a13b724efab4 (diff) | |
| download | frameworks_base-4ba7f35e0f9cfdf59ed6e8f9092992893da46d4a.zip frameworks_base-4ba7f35e0f9cfdf59ed6e8f9092992893da46d4a.tar.gz frameworks_base-4ba7f35e0f9cfdf59ed6e8f9092992893da46d4a.tar.bz2 | |
am 92cd4d02: Merge "Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist." into honeycomb
* commit '92cd4d0296cc8936fcccd97cdbc7a13b724efab4':
Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist.
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index d6b7366..68c1453 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -197,7 +197,8 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { /* Another feature is enabled and the user is trying to enable the custom title feature */ throw new AndroidRuntimeException("You cannot combine custom titles with other title features"); } - if (((features & (1 << FEATURE_CUSTOM_TITLE)) != 0) && (featureId != FEATURE_CUSTOM_TITLE)) { + if (((features & (1 << FEATURE_CUSTOM_TITLE)) != 0) && + (featureId != FEATURE_CUSTOM_TITLE) && (featureId != FEATURE_ACTION_MODE_OVERLAY)) { /* Custom title feature is enabled and the user is trying to enable another feature */ throw new AndroidRuntimeException("You cannot combine custom titles with other title features"); |