Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcd8c81b authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Propagate systemUiVisibility changes to window manager" into jb-mr1-dev

parents 79d45660 7eac0f55

core/java/android/view/View.java

+2 −1
Original line number Diff line number Diff line
@@ -7436,7 +7436,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 














    void needGlobalAttributesUpdate(boolean force) {















        final AttachInfo ai = mAttachInfo;













        if (ai != null) {













        if (ai != null && !ai.mRecomputeGlobalAttributes) {















            if (force || ai.mKeepScreenOn || (ai.mSystemUiVisibility != 0)















                    || ai.mHasSystemUiListeners) {















                ai.mRecomputeGlobalAttributes = true;










@@ -11719,6 +11719,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













            // If nobody has evaluated the drawable state yet, then do it now.















            refreshDrawableState();















        }













        needGlobalAttributesUpdate(false);















    }





























    void dispatchDetachedFromWindow() {

































core/java/android/view/ViewRootImpl.java



+3
−5




























Original line number
Diff line number
Diff line








@@ -1007,17 +1007,15 @@ public final class ViewRootImpl implements ViewParent,













            //Log.i(TAG, "Computing view hierarchy attributes!");















            attachInfo.mRecomputeGlobalAttributes = false;















            boolean oldScreenOn = attachInfo.mKeepScreenOn;













            int oldVis = attachInfo.mSystemUiVisibility;













            boolean oldHasSystemUiListeners = attachInfo.mHasSystemUiListeners;















            attachInfo.mKeepScreenOn = false;















            attachInfo.mSystemUiVisibility = 0;















            attachInfo.mHasSystemUiListeners = false;















            mView.dispatchCollectViewAttributes(attachInfo, 0);















            attachInfo.mSystemUiVisibility &= ~attachInfo.mDisabledSystemUiVisibility;













            if (attachInfo.mKeepScreenOn != oldScreenOn













                    || attachInfo.mSystemUiVisibility != oldVis













                    || attachInfo.mHasSystemUiListeners != oldHasSystemUiListeners) {















            WindowManager.LayoutParams params = mWindowAttributes;













            if (attachInfo.mKeepScreenOn != oldScreenOn













                    || attachInfo.mSystemUiVisibility != params.subtreeSystemUiVisibility













                    || attachInfo.mHasSystemUiListeners != params.hasSystemUiListeners) {















                applyKeepScreenOnFlag(params);















                params.subtreeSystemUiVisibility = attachInfo.mSystemUiVisibility;















                params.hasSystemUiListeners = attachInfo.mHasSystemUiListeners;