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

Commit 60e5898b authored by Cosmin Băieș's avatar Cosmin Băieș Committed by Android (Google) Code Review
Browse files

Merge "Deprecate ImeTracker phase disabled user animation" into main

parents d3df201b 60e5c8e5

core/java/android/view/InsetsController.java

+3 −3
Original line number Diff line number Diff line
@@ -1283,7 +1283,6 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation 
            @AnimationType int animationType,

            @LayoutInsetsDuringAnimation int layoutInsetsDuringAnimation,

            boolean useInsetsAnimationThread, @Nullable ImeTracker.Token statsToken) {

        ImeTracker.forLogging().onProgress(statsToken, ImeTracker.PHASE_CLIENT_CONTROL_ANIMATION);

        if ((types & mTypesBeingCancelled) != 0) {

            final boolean monitoredAnimation =

                    animationType == ANIMATION_TYPE_SHOW || animationType == ANIMATION_TYPE_HIDE;
@@ -1295,12 +1294,15 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation 
                    ImeTracker.forLatency().onHideCancelled(statsToken,

                            PHASE_CLIENT_ANIMATION_CANCEL, ActivityThread::currentApplication);

                }

                ImeTracker.forLogging().onCancelled(statsToken,

                        ImeTracker.PHASE_CLIENT_CONTROL_ANIMATION);

            }

            throw new IllegalStateException("Cannot start a new insets animation of "

                    + Type.toString(types)

                    + " while an existing " + Type.toString(mTypesBeingCancelled)

                    + " is being cancelled.");

        }

        ImeTracker.forLogging().onProgress(statsToken, ImeTracker.PHASE_CLIENT_CONTROL_ANIMATION);

        if (types == 0) {

            // nothing to animate.

            listener.onCancelled(null);
@@ -1309,8 +1311,6 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation 
            Trace.asyncTraceEnd(TRACE_TAG_VIEW, "IC.showRequestFromApiToImeReady", 0);

            return;

        }

        ImeTracker.forLogging().onProgress(statsToken,

                ImeTracker.PHASE_CLIENT_DISABLED_USER_ANIMATION);

        if (DEBUG) Log.d(TAG, "controlAnimation types: " + types);

        mLastStartedAnimTypes |= types;

core/java/android/view/inputmethod/ImeTracker.java

+0 −4
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ public interface ImeTracker { 
            PHASE_CLIENT_HANDLE_HIDE_INSETS,

            PHASE_CLIENT_APPLY_ANIMATION,

            PHASE_CLIENT_CONTROL_ANIMATION,

            PHASE_CLIENT_DISABLED_USER_ANIMATION,

            PHASE_CLIENT_COLLECT_SOURCE_CONTROLS,

            PHASE_CLIENT_INSETS_CONSUMER_REQUEST_SHOW,

            PHASE_CLIENT_REQUEST_IME_SHOW,
@@ -292,9 +291,6 @@ public interface ImeTracker { 
    /** Started the IME window insets show animation. */

    int PHASE_CLIENT_CONTROL_ANIMATION = ImeProtoEnums.PHASE_CLIENT_CONTROL_ANIMATION;



    /** Checked that the IME is controllable. */

    int PHASE_CLIENT_DISABLED_USER_ANIMATION = ImeProtoEnums.PHASE_CLIENT_DISABLED_USER_ANIMATION;



    /** Collecting insets source controls. */

    int PHASE_CLIENT_COLLECT_SOURCE_CONTROLS = ImeProtoEnums.PHASE_CLIENT_COLLECT_SOURCE_CONTROLS;