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

Commit c1fa3abd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Calling sendStateEventToTest() from a place guaranteed to be called"... 

Merge "Calling sendStateEventToTest() from a place guaranteed to be called" into ub-launcher3-qt-dev
parents 07086693 8f9cf2f3

quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java

+0 −3
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ import com.android.launcher3.allapps.DiscoveryBounce; 
import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.anim.AnimatorSetBuilder;

import com.android.launcher3.anim.SpringObjectAnimator;

import com.android.launcher3.compat.AccessibilityManagerCompat;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.userevent.nano.LauncherLogProto;

import com.android.launcher3.views.FloatingIconView;
@@ -216,8 +215,6 @@ public final class LauncherActivityControllerHelper implements ActivityControlHe 
        // Optimization, hide the all apps view to prevent layout while initializing

        activity.getAppsView().getContentView().setVisibility(View.GONE);



        AccessibilityManagerCompat.sendStateEventToTest(activity, fromState.ordinal);



        return new AnimationFactory() {

            private Animator mShelfAnim;

            private ShelfAnimState mShelfState;

src/com/android/launcher3/LauncherStateManager.java

+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import com.android.launcher3.anim.AnimatorPlaybackController; 
import com.android.launcher3.anim.AnimatorSetBuilder;

import com.android.launcher3.anim.PropertySetter;

import com.android.launcher3.anim.PropertySetter.AnimatedPropertySetter;

import com.android.launcher3.compat.AccessibilityManagerCompat;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.uioverrides.UiFactory;
@@ -496,6 +497,8 @@ public class LauncherStateManager { 
        for (int i = mListeners.size() - 1; i >= 0; i--) {

            mListeners.get(i).onStateTransitionComplete(state);

        }



        AccessibilityManagerCompat.sendStateEventToTest(mLauncher, state.ordinal);

    }



    public void onWindowFocusChanged() {

src/com/android/launcher3/touch/AbstractStateChangeTouchController.java

+0 −2
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import com.android.launcher3.Utilities; 
import com.android.launcher3.anim.AnimationSuccessListener;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.anim.AnimatorSetBuilder;

import com.android.launcher3.compat.AccessibilityManagerCompat;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.userevent.nano.LauncherLogProto;

import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
@@ -541,7 +540,6 @@ public abstract class AbstractStateChangeTouchController 
                android.util.Log.e(

                        TestProtocol.NO_ALLAPPS_EVENT_TAG, "onSwipeInteractionCompleted 2");

            }

            AccessibilityManagerCompat.sendStateEventToTest(mLauncher, targetState.ordinal);

        }

    }