diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-06-12 00:12:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-12 00:12:08 +0000 |
| commit | c1fa3abd2e441d4acfdf6ca8d3ba628776f2ba6d (patch) | |
| tree | 8e4d35d7edef75858b77670f4951c9efcce5eacc /src | |
| parent | 070866931b1ea7b9f6035dfb497778ad261bf8b0 (diff) | |
| parent | 8f9cf2f38fb3ae3a6401e1a7a121f98a529a4c9a (diff) | |
| download | android_packages_apps_Trebuchet-c1fa3abd2e441d4acfdf6ca8d3ba628776f2ba6d.tar.gz android_packages_apps_Trebuchet-c1fa3abd2e441d4acfdf6ca8d3ba628776f2ba6d.tar.bz2 android_packages_apps_Trebuchet-c1fa3abd2e441d4acfdf6ca8d3ba628776f2ba6d.zip | |
Merge "Calling sendStateEventToTest() from a place guaranteed to be called" into ub-launcher3-qt-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/LauncherStateManager.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher3/touch/AbstractStateChangeTouchController.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java index fe6b52297..8b03691c8 100644 --- a/src/com/android/launcher3/LauncherStateManager.java +++ b/src/com/android/launcher3/LauncherStateManager.java @@ -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() { diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java index 4e5f7a59a..6f53140ea 100644 --- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java +++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java @@ -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); } } |