diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/view/Window.java | 8 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 5 |
3 files changed, 14 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index f8d3e06aadce..68c830f7a95f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -23471,6 +23471,7 @@ package android.view { method public abstract void setTitleColor(int); method public void setType(int); method public void setUiOptions(int); + method public void setUiOptions(int, int); method public abstract void setVolumeControlStream(int); method public void setWindowAnimations(int); method public void setWindowManager(android.view.WindowManager, android.os.IBinder, java.lang.String); diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java index 6ac679ca88d5..e0e1a1a83b91 100644 --- a/core/java/android/view/Window.java +++ b/core/java/android/view/Window.java @@ -1219,4 +1219,12 @@ public abstract class Window { * @param uiOptions Flags specifying extra options for this window. */ public void setUiOptions(int uiOptions) { } + + /** + * Set extra options that will influence the UI for this window. + * Only the bits filtered by mask will be modified. + * @param uiOptions Flags specifying extra options for this window. + * @param mask Flags specifying which options should be modified. Others will remain unchanged. + */ + public void setUiOptions(int uiOptions, int mask) { } } diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index 3dcc297dde25..0ee6488c1816 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -235,6 +235,11 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { } @Override + public void setUiOptions(int uiOptions, int mask) { + mUiOptions = (mUiOptions & ~mask) | (uiOptions & mask); + } + + @Override public void setContentView(int layoutResID) { if (mContentParent == null) { installDecor(); |