diff options
author | vadimt <vadimt@google.com> | 2019-10-03 13:34:28 -0700 |
---|---|---|
committer | Vadim Tryshev <vadimt@google.com> | 2019-10-03 20:58:15 +0000 |
commit | 1ac98548a73e6c82876433c5ab0f037c6da688cd (patch) | |
tree | ac22e242e3e63404641268402d5f19ccdcfedd9c /quickstep | |
parent | 055c22e8e658dcb87447a9c11ec492c2b8e922e5 (diff) | |
parent | 08776ada1e37c4b424893306c058b1de9f85903f (diff) | |
download | packages_apps_Trebuchet-1ac98548a73e6c82876433c5ab0f037c6da688cd.tar.gz packages_apps_Trebuchet-1ac98548a73e6c82876433c5ab0f037c6da688cd.tar.bz2 packages_apps_Trebuchet-1ac98548a73e6c82876433c5ab0f037c6da688cd.zip |
resolve merge conflicts of 08776ada1e37c4b424893306c058b1de9f85903f to ub-launcher3-qt-future-dev
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9a3b0f67ee874b5ec4ad67f41a46ec7876d19082
Merged-in: I9a3b0f67ee874b5ec4ad67f41a46ec7876d19082
Diffstat (limited to 'quickstep')
-rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/QuickstepTestInformationHandler.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/QuickstepTestInformationHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/QuickstepTestInformationHandler.java index 72a14b58e..2161591bf 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/QuickstepTestInformationHandler.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/QuickstepTestInformationHandler.java @@ -37,12 +37,6 @@ public class QuickstepTestInformationHandler extends TestInformationHandler { return response; } - case TestProtocol.REQUEST_IS_LAUNCHER_INITIALIZED: { - response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD, - TouchInteractionService.isInitialized()); - return response; - } - case TestProtocol.REQUEST_HOTSEAT_TOP: { if (mLauncher == null) return null; @@ -81,4 +75,9 @@ public class QuickstepTestInformationHandler extends TestInformationHandler { return super.call(method); } + + @Override + protected boolean isLauncherInitialized() { + return super.isLauncherInitialized() && TouchInteractionService.isInitialized(); + } } |