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

Commit 94794af6 authored by Daniel Koulomzin's avatar Daniel Koulomzin Committed by android-build-merger
Browse files

Merge "Making ViewRootImpl drop input events when the Activity is in ambient... 

Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev am: cbef517d
am: 898e330a

* commit '898e330a':
  Making ViewRootImpl drop input events when the Activity is in ambient mode.
parents 2ce61fb6 898e330a

core/java/android/view/ViewRootImpl.java

+11 −1
Original line number Diff line number Diff line
@@ -174,6 +174,10 @@ public final class ViewRootImpl implements ViewParent, 
    // so the window should no longer be active.

    boolean mStopped = false;



    // Set to true if the owner of this window is in ambient mode,

    // which means it won't receive input events.

    boolean mIsAmbientMode = false;



    // Set to true to stop input during an Activity Transition.

    boolean mPausedForTransition = false;
@@ -990,6 +994,10 @@ public final class ViewRootImpl implements ViewParent, 
        }

    }



    public void setIsAmbientMode(boolean ambient) {

        mIsAmbientMode = ambient;

    }



    void setWindowStopped(boolean stopped) {

        if (mStopped != stopped) {

            mStopped = stopped;
@@ -3704,7 +3712,7 @@ public final class ViewRootImpl implements ViewParent, 
                return true;

            } else if ((!mAttachInfo.mHasWindowFocus

                    && !q.mEvent.isFromSource(InputDevice.SOURCE_CLASS_POINTER)) || mStopped

                    || (mPausedForTransition && !isBack(q.mEvent))) {

                    || mIsAmbientMode || (mPausedForTransition && !isBack(q.mEvent))) {

                // This is a focus event and the window doesn't currently have input focus or

                // has stopped. This could be an event that came back from the previous stage

                // but the window has lost focus or stopped in the meantime.
@@ -5514,6 +5522,8 @@ public final class ViewRootImpl implements ViewParent, 
                writer.println(mProcessInputEventsScheduled);

        writer.print(innerPrefix); writer.print("mTraversalScheduled=");

                writer.print(mTraversalScheduled);

        writer.print(innerPrefix); writer.print("mIsAmbientMode=");

                writer.print(mIsAmbientMode);

        if (mTraversalScheduled) {

            writer.print(" (barrier="); writer.print(mTraversalBarrier); writer.println(")");

        } else {