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

Commit df75f82b authored by Linus Tufvesson's avatar Linus Tufvesson Committed by Automerger Merge Worker
Browse files

Merge "Use isInTransition() to detect animations" into tm-dev am: b35f48c8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17034567

Change-Id: Iba659936b53c26718eec9e3c6fd24aa09d8384a1
parents 05847140 b35f48c8

services/core/java/com/android/server/wm/ActivityRecordInputSink.java

+1 −6
Original line number Diff line number Diff line
@@ -16,10 +16,6 @@ 


package com.android.server.wm;



import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION;

import static com.android.server.wm.WindowContainer.AnimationFlags.PARENTS;

import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION;



import android.app.compat.CompatChanges;

import android.compat.annotation.ChangeId;

import android.os.IBinder;
@@ -101,8 +97,7 @@ class ActivityRecordInputSink { 
            mToken = inputChannel.getToken();

            mInputEventReceiver = createInputEventReceiver(inputChannel);

        }

        if (mDisabled || !mIsCompatEnabled || mActivityRecord.isAnimating(TRANSITION | PARENTS,

                ANIMATION_TYPE_APP_TRANSITION)) {

        if (mDisabled || !mIsCompatEnabled || mActivityRecord.isInTransition()) {

            // TODO(b/208662670): Investigate if we can have feature active during animations.

            mInputWindowHandleWrapper.setToken(null);

        } else {