Commit Graph

21079 Commits

Author SHA1 Message Date
Tony Wickham bc42d64c85 Fix testQuickSwitchFromApp
Instead of starting getAppPackageName() and relying on it being our Test
Pin Item activity, instead launch our own test activities with the
FLAG_ACTIVITY_MULTIPLE_TASK and FLAG_ACTIVITY_NEW_DOCUMENT flags.

Test:
- Locally run testQuickSwitchFromApp() from Android Studio
- flake -oop -t com.android.quickstep.TaplTestsQuickstep#testQuickSwitchFromApp

Bug: 140252765
Change-Id: Ie137261ce65bfd3dd39df78d57784854a026e967
2019-10-23 23:42:19 +00:00
TreeHugger Robot 7caa519140 Merge "Step 4 from the plan below:" into ub-launcher3-master 2019-10-23 17:54:19 +00:00
Sunny Goyal c78308a9a7 Merge "Subclassing Launcher instead of using UiFactory" into ub-launcher3-master 2019-10-22 19:21:11 +00:00
James O'Leary bd83aead35 Merge "QuickCaptureInputConsumer -> OverscrollInputConsumer + plugin" into ub-launcher3-master 2019-10-22 18:40:49 +00:00
James O'Leary 9e57e74005 QuickCaptureInputConsumer -> OverscrollInputConsumer + plugin
Test: Implemented plugin interface in Compose studiow build in
google_experimental, verified plugin shows up appropriately in
Launcher's home settings screen, verified gesture works if Compose
plugin enabled, and doesn't work if Compose plugin disabled.
Bug: n/a

Change-Id: Ica24ee8fe814ee02a1497a1bfbe7c7a24489b71e
2019-10-22 13:04:20 -04:00
TreeHugger Robot 3b78d08109 Merge "Restoring 10-sec wait for model initialization" into ub-launcher3-master 2019-10-22 15:59:46 +00:00
Sunny Goyal 210e174c9c Subclassing Launcher instead of using UiFactory
Allows us to override only the required methods, instead of providing
a proxy method for everything

Change-Id: I816dcdb2a8d5432496050118ded0f2bbe7122cf7
2019-10-21 11:10:21 -07:00
TreeHugger Robot d78d80beca Merge "Skip updating launcher state if it's already destroyed" into ub-launcher3-master 2019-10-19 00:26:52 +00:00
vadimt b648e02d06 Fixing activity leak on config change
am: 7fcbd2379b

Change-Id: I33a78825552b3a050ee95b42fa0699d9b063c281
2019-10-18 13:31:27 -07:00
vadimt 3a13366e00 Restoring 10-sec wait for model initialization
Will see if ag/9573576 fixed long model loading

Bug: 136278866
Bug: 142514365
Change-Id: If0dc61faff00683cf3248c127a64ff5b065f9ae4
2019-10-18 12:43:10 -07:00
vadimt 7fcbd2379b Fixing activity leak on config change
If attachTo happens before the view is attached to window,
ViewOnDrawExecutor hooks to the tree observer twice (second time from
onViewAttachedToWindow). It only unhooks once.

Since tree observer is global, this leads to leaking the activity, and
besides, all old activities getting the events from the tree observer.

Bug: 139137636
Change-Id: Ie2641b8f3614545052fe34ad6588b070c3b82a33
(cherry picked from commit ebb5c75344)
2019-10-18 19:36:26 +00:00
Vadim Tryshev 47ed07d708 Merge "Fixing activity leak on config change" into ub-launcher3-master 2019-10-18 19:26:56 +00:00
Winson Chung 94302570e6 Skip updating launcher state if it's already destroyed
- Prior to ag/9526193, there were a mixture of getCreatedActivity() and
  passed in Activity calls. In the cases where we used the passed in
  activity, it would happily make the call even if the activity is already
  destroyed, but since we migrated to using the unified getCreatedActivity()
  call, it results in an NPE. Since it's unnecessary to update the destroyed
  activity, we can simply skip this work.

  Long term, we should consider baking the activity associated with the
  call into the activity interface, and ensure that the interface itself
  is updated whenever the activity is recreated.

Bug: 141886704

Change-Id: I4f043e455d8d0d1c1b86362cc72618018bfbd900
Signed-off-by: Winson Chung <winsonc@google.com>
2019-10-18 12:15:12 -07:00
vadimt ebb5c75344 Fixing activity leak on config change
If attachTo happens before the view is attached to window,
ViewOnDrawExecutor hooks to the tree observer twice (second time from
onViewAttachedToWindow). It only unhooks once.

Since tree observer is global, this leads to leaking the activity, and
besides, all old activities getting the events from the tree observer.

Bug: 139137636
Change-Id: Ie2641b8f3614545052fe34ad6588b070c3b82a33
2019-10-18 11:34:21 -07:00
Winson Chung bb39993b64 Merge "Skip waiting for idle if the message queue is already idle" into ub-launcher3-master 2019-10-18 17:16:11 +00:00
Winson Chung cebfec6245 Skip waiting for idle if the message queue is already idle
Bug: 142514365
Change-Id: I22eb94c234766a40eac4c8dcc33d204b2417c2d6
2019-10-17 22:51:40 -07:00
vadimt ad81b816f0 Step 4 from the plan below:
1. Skip all tests that fail in inproc mode on CF (this CL)
2. Observe postsubmit and make sure no inproc tests are failing or too
flaky on CF
3. Enable presubmit
4. Switch to skipping tests from step 1 only for inproc presubmit;
they'll start failing in postsubmit
5. Gradually make all tests pass and not flaky and enable them back on
presubmit

Bug: 142828227
Change-Id: I0092d6b92b0358866f8cbf9e00dbe3fabe23703d
2019-10-17 17:52:29 -07:00
TreeHugger Robot 8625d0d8e7 Merge "Fix regression from ag/9518396" into ub-launcher3-master 2019-10-17 23:51:11 +00:00
Sreyas Rangaraju 5a6eb2d5df Merge "Alpha correction. mContentAlpha sometimes equals 0, changing to 1 ensures recents card always shows when supposed to" into ub-launcher3-master 2019-10-17 23:25:00 +00:00
Winson Chung dfd8b5e07d Fix regression from ag/9518396
- Previously, we would only cancel the current animation if
  sharedState.canBeContinued which was only set when mGestureEndTarget
  was set, which is only calculated when the swipe gesture ends,
  and is only true if the end target is not Launcher.

  In ag//9518396 the check for the null end target was moved into
  isRunningAnimationToLauncher(), but that call actually bakes in two
  checks together, which means that even when tapping the home button
  (where there is no gesture and no end target), it would return false.
  Instead, we should ensure that the gesture target is set before trying
  to cancel the animation.
- Also fix an existing issue where if the consumer is cleaned up after
  the start callback is registered, but not before the callback has
  returned, that we may incorrectly set the wrong launcher state since
  the callback is made to the old gesture handler which tries to prepare
  the recents UI (this manifests as a blank launcher screen).

Bug: 141886704
Change-Id: I642f20d631924730e98d10bb2123bd9448793fc6
2019-10-17 16:20:15 -07:00
Sreyas 3f18cc444d Alpha correction.
mContentAlpha sometimes equals 0, changing to 1 ensures recents card always shows when supposed to

Change-Id: I27eda97b72b75263c0aac09e2355bca72daecc27
2019-10-17 14:35:04 -07:00
TreeHugger Robot 221823c337 Merge "Fixing nulpointer exception in AOSP quickstep builds" into ub-launcher3-master 2019-10-17 21:03:15 +00:00
Vadim Tryshev b1905bdfad Merge "More preparation for enabling inproc presubmits" into ub-launcher3-master 2019-10-17 19:51:45 +00:00
Sunny Goyal be336e0195 Fixing nulpointer exception in AOSP quickstep builds
Change-Id: I37e16b3c238f03306841713d0535eae5882b534d
2019-10-17 12:08:01 -07:00
vadimt af317c7821 More preparation for enabling inproc presubmits
Bug: 136278866
Change-Id: Icc4a0d935acf76950197bc184f8dba5d07ee85c5
2019-10-17 12:07:10 -07:00
Winson Chung 89eb36405d Skip setting the deferred launch callback if activity is already destroyed
Bug: 141886704
Change-Id: Iaa151335e5a3994a46406df399f2d159afe2c75e
2019-10-17 12:01:58 -07:00
TreeHugger Robot 35903d2cb2 Merge "Reducing the time for expected launcher initialization back to 10 sec" into ub-launcher3-master 2019-10-17 07:18:37 +00:00
TreeHugger Robot da6b9f7429 Merge "Preparing to enabling Inproc launcher tests as presubmit" into ub-launcher3-master 2019-10-17 06:45:13 +00:00
vadimt 6332b7d73c Reducing the time for expected launcher initialization back to 10 sec
It was temporarily raised to 60 sec.

https://googleplex-android-review.git.corp.google.com/9563509
should've fixed some problems with loading time, but likely not all.

We need to observe whether this test starts flaking again.

testDragIcon will run only in Launcher postsubmit, and won't block
merges to platform if it fails.

Bug: 142514365
Change-Id: I2b9a9d043346ebda721221cefd6118a1a799501f
2019-10-16 17:49:29 -07:00
vadimt 3680357a67 Preparing to enabling Inproc launcher tests as presubmit
The plan:
1. Skip all tests that fail in inproc mode on CF (this CL)
2. Observe postsubmit and make sure no inproc tests are failing or too
flaky on CF
3. Enable presubmit
4. Switch to skipping tests from step 1 only for inproc presubmit;
they'll start failing in postsubmit
5. Gradually make all tests pass and not flaky and enable them back on
presubmit

Bug: 142828227
Change-Id: I6ea3d53771503e8fd968555bb2e4cb1be10d83ef
2019-10-16 17:35:18 -07:00
Winson Chung dd9d1ea1bf 12/ Clean up some ActivityInterface calls
- Require users of the activity interface to go through the interface to
  get the raw activity
- Remove calls that pass in the activity since the interface already can
  get the reference to it internally (and the interface always has the
  reference before the caller)

Bug: 141886704

Change-Id: I13e52caba593db918e8a7764c751044142fe7ece
Signed-off-by: Winson Chung <winsonc@google.com>
2019-10-16 17:18:12 -07:00
Winson Chung 981ef3a88a 11/ Update MultiStateCallbacks to support multiple callbacks
- Allow multiple callbacks to be set for the same state
- Expose method to set state on ui thread directly
- Ensure callbacks are made immediately if the state is already set
- Clarify that the one shot callbacks vs the state listeners

Bug: 141886704
Change-Id: I8ea0dcd2821ee18d071706eaddeb2852afa13f30
2019-10-16 17:18:11 -07:00
Winson Chung c80b3224aa 10/ Migrate shared state to the gesture state
- Instead of a shared state which is written into, gestures update their
  own gesture state and that state is passed to the next gesture.
- The existing shared state encoded the final end target (which is
  currently directly correlated with canGestureBeContinued). If we move
  the end target calculations to the GestureState, the handlers can listen
  for those changes and we can use the previous gesture state to decide
  which consumer to choose.  In addition, we move over the interrupted-
  finish-launch-task id.

Bug: 141886704

Change-Id: Icb6a3815c16b23692dbcde316114bd3cea06634e
Signed-off-by: Winson Chung <winsonc@google.com>
2019-10-16 17:17:34 -07:00
Winson Chung c9bf6d45ac 9/ Clean up swipe shared state
- Add TaskAnimationManager which keeps track of the animation state whose
  lifecycle can be longer than the gesture.  Move some of the logic related
  to cleaning up old animations into this class (called when the state is
  shared across gestures).
- Instead of calling into the shared state directly via UIFactory, add
  callback to cleanup the animation and shared state from Launcher

Bug: 141886704

Change-Id: Ib6140b37162f7460a20fa1046cfd4f4068e4a1c6
Signed-off-by: Winson Chung <winsonc@google.com>
2019-10-16 17:17:34 -07:00
Winson Chung 9196cb11a2 8.5/ Follow up to comments from previous CLs
Bug: 141886704
Change-Id: Ib583753e35e57eab3b1cc413a0f910cf10142e42
2019-10-16 17:17:34 -07:00
Jonathan Miranda 643598987b Merge "Have consistent All Apps UI between grid size changes." into ub-launcher3-qt-future-dev
am: c3a688a973

Change-Id: I6c9d825e85f55bd3160ab5e2a37e707f3f525459
2019-10-16 15:51:36 -07:00
Jonathan Miranda c3a688a973 Merge "Have consistent All Apps UI between grid size changes." into ub-launcher3-qt-future-dev 2019-10-16 22:36:17 +00:00
Pinyao Ting 7242db1a7c Revert "Revert "Revert "Revert "Revert "cache shourtcut image"""""
This reverts commit 28dc8de660.

Reason for revert: the code change introduces significant delay when saving deep shortcut icons in cache.

Change-Id: I5d67ac0c4c867a40e882b7a46be446f8f7f63ac7
2019-10-16 14:52:28 -07:00
TreeHugger Robot 55395ea8f6 Merge "Revert "fetch and update shortcut icons in background thread"" into ub-launcher3-master 2019-10-16 21:49:09 +00:00
Winson Chung 40f8756793 Merge "Fix a couple trace issues" into ub-launcher3-master 2019-10-16 20:54:43 +00:00
Pinyao Ting 01c80d7a00 Revert "fetch and update shortcut icons in background thread"
This reverts commit 4ec390e490.

Reason for revert: the code change introduces significant delay when saving deep shortcut icons in cache.

Bug: 142514365
Change-Id: If7a69844aba7f32690ff347f2db11f0a8041b9e4
2019-10-16 20:51:22 +00:00
Winson Chung 5cc62c7d0b Fix a couple trace issues
- Adding trace tokens since we can be starting/ending traces out of order
- Fixing issue with draw hitting twice causing the trace stack to be
  popped twice
- Fix issue with endFlagOverrides not removing from the stack

Bug: 142803200

Change-Id: I8649b94249910a352f00f2f2c2459c355d2bab00
2019-10-16 12:34:58 -07:00
Sunny Goyal 8409284b2c Merge "Cleaning up properly after RaceConditionReproducerTest" into ub-launcher3-master 2019-10-16 19:11:23 +00:00
Sunny Goyal bffbd7521d Cleaning up properly after RaceConditionReproducerTest
Change-Id: I43362fbc63789d3ce3468266a5189a9f9d209d00
2019-10-16 11:57:43 -07:00
Jon Miranda 64d7481597 Have consistent All Apps UI between grid size changes.
We build an IDP with no grid size override values. This
allows us to reference the profile measurements so that we can have a
consistent UI for areas that the grid size change should not affect.

Bug: 124967099
Change-Id: I6235862c95800d8f31dbf2de1d12b1fcf4dbd850
2019-10-16 11:21:36 -07:00
Tony Wickham 6b62f28ef9 Fix quick switch test gesture in landscape 2-button mode
am: a0f77c4449

Change-Id: I998081a53a94ff3b1559a7e77d4d470056cfab00
2019-10-15 21:20:24 -07:00
vadimt 36d7be7fc9 Implementing test stability attribute
Change-Id: I5d78a19039ab2bcdb217886fdaca29e3df412780
2019-10-15 18:40:53 -07:00
Tony Wickham a0f77c4449 Fix quick switch test gesture in landscape 2-button mode
It should swipe from the bottom right to top right when the nav bar is
on the right, rather than from the bottom left to bottom right.

For now, disable testQuickSwitchFromApp() because it seems to have
other failures as well.

Bug: 140252765
Change-Id: I1f4989f3ea5456c18bb9cbf42ea4b157cee500d7
2019-10-15 17:30:47 -07:00
Vadim Tryshev 984187b0a1 Merge "Increasing wait time for loading model to 60s" into ub-launcher3-master 2019-10-16 00:08:22 +00:00
vadimt 4565739fb7 Increasing wait time for loading model to 60s
Bug: 142514365
Change-Id: I15e0ff8e2a721f7ffdefdf2eb02e114212dded3b
2019-10-15 17:06:41 -07:00