diff options
author | vadimt <vadimt@google.com> | 2019-07-11 14:56:02 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-11 14:56:02 -0700 |
commit | 872dc2aa5e0d8e0bd885f74c85e38d66109dab6a (patch) | |
tree | dbe849c34c4489317d23d4ed6eeb8183b8719210 /quickstep | |
parent | 092c57cbd15dfa354e3d9bdd6b758ff738dac0f2 (diff) | |
parent | 7e15a184f52de2b2713100926ed1082c236af067 (diff) | |
download | android_packages_apps_Trebuchet-872dc2aa5e0d8e0bd885f74c85e38d66109dab6a.tar.gz android_packages_apps_Trebuchet-872dc2aa5e0d8e0bd885f74c85e38d66109dab6a.tar.bz2 android_packages_apps_Trebuchet-872dc2aa5e0d8e0bd885f74c85e38d66109dab6a.zip |
Merge "Correctly restarting Launcher from OOP tests" into ub-launcher3-qt-r1-dev
am: 7e15a184f5
Change-Id: Iba458b7b42f788ab92437d0644f31b116b865907
Diffstat (limited to 'quickstep')
-rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java | 7 | ||||
-rw-r--r-- | quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java | 9 |
2 files changed, 15 insertions, 1 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java index fafa4d34c..58d974a09 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java @@ -226,12 +226,17 @@ public class TouchInteractionService extends Service implements }; private static boolean sConnected = false; + private static boolean sInputMonitorInitialized = false; private static final SwipeSharedState sSwipeSharedState = new SwipeSharedState(); public static boolean isConnected() { return sConnected; } + public static boolean isInputMonitorInitialized() { + return sInputMonitorInitialized; + } + public static SwipeSharedState getSwipeSharedState() { return sSwipeSharedState; } @@ -330,6 +335,7 @@ public class TouchInteractionService extends Service implements mInputMonitorCompat.dispose(); mInputMonitorCompat = null; } + sInputMonitorInitialized = false; } private void initInputMonitor() { @@ -347,6 +353,7 @@ public class TouchInteractionService extends Service implements Log.e(TAG, "Unable to create input monitor", e); } initTouchBounds(); + sInputMonitorInitialized = true; } private int getNavbarSize(String resName) { diff --git a/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java b/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java index 89513634f..b59e13362 100644 --- a/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java +++ b/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java @@ -10,7 +10,8 @@ import com.android.quickstep.util.LayoutUtils; public class QuickstepTestInformationHandler extends TestInformationHandler { - public QuickstepTestInformationHandler(Context context) { } + public QuickstepTestInformationHandler(Context context) { + } @Override public Bundle call(String method) { @@ -29,6 +30,12 @@ public class QuickstepTestInformationHandler extends TestInformationHandler { response.putInt(TestProtocol.TEST_INFO_RESPONSE_FIELD, (int) swipeHeight); return response; } + + case TestProtocol.REQUEST_IS_LAUNCHER_INITIALIZED: { + response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD, + TouchInteractionService.isInputMonitorInitialized()); + break; + } } return super.call(method); |