summaryrefslogtreecommitdiff
path: root/core/java/android/view/Window.java
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-08-24 14:18:10 -0700
committerAdam Powell <adamp@google.com>2010-08-24 14:18:10 -0700
commitf4a6ec4e9398c1beb019e1c208272bf56401f925 (patch)
tree162fd050fa96d371f0adc3577e597c598d113d55 /core/java/android/view/Window.java
parent0a5699654f33fc41a9baed26abb9b867ba439399 (diff)
Disable FEATURE_ACTION_BAR on windows with incompatible feature sets.
Change-Id: I70c860c72eb9e1f1f123764202334ab714f4f830
Diffstat (limited to 'core/java/android/view/Window.java')
-rw-r--r--core/java/android/view/Window.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java
index 705af0f7f8e8..6633367fddb5 100644
--- a/core/java/android/view/Window.java
+++ b/core/java/android/view/Window.java
@@ -771,6 +771,15 @@ public abstract class Window {
return (mFeatures&flag) != 0;
}
+ /**
+ * @hide Used internally to help resolve conflicting features.
+ */
+ protected void removeFeature(int featureId) {
+ final int flag = 1<<featureId;
+ mFeatures &= ~flag;
+ mLocalFeatures &= ~(mContainer != null ? (flag&~mContainer.mFeatures) : flag);
+ }
+
public final void makeActive() {
if (mContainer != null) {
if (mContainer.mActiveChild != null) {