diff options
| author | John Spurlock <jspurlock@google.com> | 2014-03-04 20:36:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-04 20:36:56 +0000 |
| commit | 76ee9b727a0ec0105a0aafa79f163f70b9533430 (patch) | |
| tree | c2384633bff73cbea85e475282a87744262929d2 /core/java/android | |
| parent | a12c0bf8944ab7fc5dbed1934f1bf03d242b8c6a (diff) | |
| parent | 3b86923854069fa1b3bcabc8643a5e2db40d7b10 (diff) | |
am 3b869238: am c6ecac77: am 38f81ccc: am fee6f69e: Merge "Volume panel should not clear system ui flags." into klp-dev
* commit '3b86923854069fa1b3bcabc8643a5e2db40d7b10':
Volume panel should not clear system ui flags.
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/VolumePanel.java | 1 | ||||
| -rw-r--r-- | core/java/android/view/WindowManager.java | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/core/java/android/view/VolumePanel.java b/core/java/android/view/VolumePanel.java index f0e6677d016b..52f9c0b480ca 100644 --- a/core/java/android/view/VolumePanel.java +++ b/core/java/android/view/VolumePanel.java @@ -311,7 +311,6 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie lp.type = LayoutParams.TYPE_VOLUME_OVERLAY; lp.width = LayoutParams.WRAP_CONTENT; lp.height = LayoutParams.WRAP_CONTENT; - lp.privateFlags |= LayoutParams.PRIVATE_FLAG_FORCE_SHOW_NAV_BAR; window.setAttributes(lp); window.addFlags(LayoutParams.FLAG_NOT_FOCUSABLE | LayoutParams.FLAG_NOT_TOUCH_MODAL | LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH); diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 0ce4da5c4dc5..53a4c0d0df51 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -1063,13 +1063,6 @@ public interface WindowManager extends ViewManager { public static final int PRIVATE_FLAG_SHOW_FOR_ALL_USERS = 0x00000010; /** - * Special flag for the volume overlay: force the window manager out of "hide nav bar" - * mode while the window is on screen. - * - * {@hide} */ - public static final int PRIVATE_FLAG_FORCE_SHOW_NAV_BAR = 0x00000020; - - /** * Never animate position changes of the window. * * {@hide} */ |