aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 18:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-12 00:12:08 +00:00
committed by Android (Google) Code Review
parent 070866931b 8f9cf2f38f
commit c1fa3abd2e
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java
View File

@@ -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;

3
src/com/android/launcher3/LauncherStateManager.java
View File

@@ -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() {

2
src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
View File

@@ -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);
}
}