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

Commit 4ce7ea5e authored by Evan Rosky's avatar Evan Rosky Committed by android-build-merger
Browse files

Merge "Use client-side version of inTouchMode" into pi-dev am: 3ec4b8cc 

am: bdc641a6

Change-Id: Ib27e46386c015acdd060de8e566b0b82c0a12943
parents 47beaf40 bdc641a6

core/java/android/view/ViewRootImpl.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -3719,7 +3719,7 @@ public final class ViewRootImpl implements ViewParent, 
        checkThread();

        checkThread();

        if (mView != null) {

        if (mView != null) {

            if (!mView.hasFocus()) {

            if (!mView.hasFocus()) {

                if (sAlwaysAssignFocus || !isInTouchMode()) {

                if (sAlwaysAssignFocus || !mAttachInfo.mInTouchMode) {

                    v.requestFocus();

                    v.requestFocus();

                }

                }

            } else {

            } else {