Commit Graph

35611 Commits

Author SHA1 Message Date
Vinit Nayak d0b4d10f0e Merge "Use all targets passed back for recents animation" into sc-v2-dev 2021-12-21 17:10:00 +00:00
Vinit Nayak f421ad2ef8 Use all targets passed back for recents animation
* Previously we were removing all targets except for
the app that was to be animated. That caused issues
because we look for the home app to determine if the
app leashes need to be drawn underneath or not.
* Now (assuming at most two non-home app leashes will
be sent) we add all the non-home targets along with
the desired app target by excluding 1 of the 2 non-home
apps

Bug: 199936292
Merged-In: I252d6c663e9ca145ef394ac08d9a32da02d4a03b
Change-Id: I252d6c663e9ca145ef394ac08d9a32da02d4a03b
2021-12-21 05:45:00 +00:00
Tony Wickham e064f51642 Merge "Update hotseat alpha in TaskbarLauncherStateController#init()" into sc-v2-dev 2021-12-21 00:30:12 +00:00
Winson Chung a46d36240b Add logs for null task list
Bug: 206648922
Test: Adding logs
Change-Id: I23b8a9fadd1e555f1c3f7a75940bd7faa56b777b
2021-12-20 22:49:10 +00:00
Winson Chung 75867ae0ba Merge "Fix some small related to back button alpha" into sc-v2-dev 2021-12-16 21:59:27 +00:00
Winson Chung 361f82b237 Temporarily disable SUW specific insets logic
Bug: 204384193
Test: Check that SUW is inset

Change-Id: Id00f10f51b52ef8ec375f650fd44bb2c6eb31e09
2021-12-16 18:45:25 +00:00
Tony Wickham bf07660f9e Update hotseat alpha in TaskbarLauncherStateController#init()
Technically the consumer should do that already, but the consumer isn't called if the value isn't changed (in this case, it's going from 1 to 1). So explicitly call the consumer once in init().

Test: Open an app, toggle dark theme from quick settings, go home and ensure hotseat isn't visible during the transition
Fixes: 211002647
Change-Id: I5a9680282b3982d9b6f982833cd671b224767518
2021-12-16 18:29:41 +00:00
Winson Chung e62a1996b7 Fix some small related to back button alpha
- Skip updating nav button dark intensity if we're setting it manually
  while SUW is running
- There should only be one alpha StatePropertyHolder for the same view
  otherwise when updating the properties it can clobber a previous state

Bug: 204384193
Test: Disable dark mode on SUW and verify nav buttons show
Change-Id: I450c3a5697954d9b464bdd622847beb2d01f3802
2021-12-16 17:47:53 +00:00
TreeHugger Robot 3ffaf3c71f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 649325ad1a -s ours am: 4d6831e2b9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027

Change-Id: Ie8afdf5787284f711960ea7edb124641edbaceb5
2021-12-16 16:11:57 +00:00
TreeHugger Robot 011e9314e6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: d1841de078 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474031

Change-Id: I70958dc746e53154b9d9c58ee72c59a995ca7439
2021-12-16 16:11:32 +00:00
TreeHugger Robot 63d5fd85e6 Merge changes from topic "presubmit-am-299ca4020ed94d05b0ac27bbf6752f7a" into sc-qpr1-dev am: cd30824c99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027

Change-Id: I1e7e38f0fbaac4c1ac90ff2f040c2eadfc362f42
2021-12-16 16:11:14 +00:00
Bill Yi 964665a000 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 189f1ce908 am: a0cf7967db -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027

Change-Id: Ic4fac6992b03a6d95684e48d2c4c5233085d47f1
2021-12-16 16:11:09 +00:00
TreeHugger Robot e2e3340998 Merge changes from topic "presubmit-am-2f8e16fe33c44e5196ee3ee1963fafb2" into sc-qpr1-dev am: 04162f05d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474030

Change-Id: Ia18da606589470e86ed75583ba30250f04237750
2021-12-16 16:10:07 +00:00
Bill Yi 2d4d5863b7 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 384c30fa4c am: 439705b5a3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474030

Change-Id: Iab2bf266a7d1626fec28b44727d42500285a9fa7
2021-12-16 16:10:07 +00:00
Bill Yi 0a77ac2558 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8942bc90bf -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474028

Change-Id: I4bf9a47db20f8bb7c00ad18162bb3c32375f25d9
2021-12-16 16:06:48 +00:00
TreeHugger Robot 4d6831e2b9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 649325ad1a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027

Change-Id: Ic4119cd526e6601167751700d0107a788b25aecb
2021-12-16 16:06:23 +00:00
TreeHugger Robot d1841de078 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-12-16 15:50:25 +00:00
TreeHugger Robot 9be15e2b85 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-12-16 15:50:09 +00:00
TreeHugger Robot 2cce776dc4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-12-16 15:45:57 +00:00
TreeHugger Robot 649325ad1a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-12-16 15:44:44 +00:00
TreeHugger Robot cd30824c99 Merge changes from topic "presubmit-am-299ca4020ed94d05b0ac27bbf6752f7a" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 189f1ce908
  Import translations. DO NOT MERGE ANYWHERE
2021-12-16 15:44:44 +00:00
TreeHugger Robot 04162f05d7 Merge changes from topic "presubmit-am-2f8e16fe33c44e5196ee3ee1963fafb2" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 384c30fa4c
  Import translations. DO NOT MERGE ANYWHERE
2021-12-16 15:44:27 +00:00
TreeHugger Robot 8d25a0a363 Merge "Show Digital Wellbeing Banners for split tasks" into sc-v2-dev 2021-12-16 11:13:10 +00:00
Vinit Nayak ebf2cdd0f1 Show Digital Wellbeing Banners for split tasks
Fixes: 199936292
Change-Id: I38743d58f53a65ef717b1babc21ad1df2dc840a4
2021-12-15 22:19:02 -08:00
Vinit Nayak 20102c3dd7 Merge "Save multiple RunningTaskInfo in GestureState" into sc-v2-dev 2021-12-16 00:03:20 +00:00
TreeHugger Robot f9f90d6dc2 Merge "Set navBarDarkIntensity based on dark theme in SUW" into sc-v2-dev 2021-12-15 23:42:06 +00:00
Tony Wickham 70d237d8f3 Set navBarDarkIntensity based on dark theme in SUW
- Also remove old tinting based on textColorPrimary, as it's no longer necessary with dark intensity tinting.

Test: Run SetupWizardTestActivity in both dark and light theme, ensure back button visible
Fixes: 204384193
Change-Id: I2dc2e94bc0318ded62419b9ae0eed719db289d7f
2021-12-15 21:37:15 +00:00
Vinit Nayak dcd7ac4011 Save multiple RunningTaskInfo in GestureState
* With new split screen running two active tasks for
a given gesture, we need to get all running task
infos instead of the single most recent used one
* TODO(b/210903248) for proper refactoring for
GestureState

Fixes: 205675364
Test: Swiping up on overview no longer crashes
Change-Id: Iea1f193149657182311a97f46007b4d43e8ad549
2021-12-15 13:11:11 -08:00
Jon Miranda 80aa8da7e3 Merge "Scale, crop, and translate window when swiping back to home." into sc-v2-dev 2021-12-15 20:29:59 +00:00
Winson Chung 2ecf688de6 Merge "Wait for the Launcher activity to bind to TIS before animating" into sc-v2-dev 2021-12-15 19:44:26 +00:00
Bill Yi 2a599f3eea Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0dfd8609046378398394e3eff496d783ade48a41
2021-12-15 06:58:05 +00:00
Bill Yi e115a8a46f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iec90da5709f6fbee61798d61b6c6d0d50185220e
2021-12-15 06:57:23 +00:00
Bill Yi 439705b5a3 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 384c30fa4c
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474030

Change-Id: I712a3fb9b233fb15846cbafc48e6970b3b659b96
2021-12-15 06:56:57 +00:00
Bill Yi 384c30fa4c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I195d5d5f10c8e93e1b26d58b2cdcf194fc3474f4
2021-12-15 06:56:43 +00:00
Bill Yi 0558d6a646 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3cbff24108a4dac5b307095322c5aa7e716c7575
2021-12-15 06:54:30 +00:00
Bill Yi 8942bc90bf Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia316d18fcb30161ddb2d288919c9aa4698d3d3af
2021-12-15 06:53:54 +00:00
Bill Yi a0cf7967db [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 189f1ce908
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027

Change-Id: I46c505232b99fbe4b15fdb74acbae5658df23753
2021-12-15 06:53:38 +00:00
Bill Yi 189f1ce908 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibdb9619f0643f4a1f3c32252e712248556c352a6
2021-12-15 06:53:19 +00:00
Tony Wickham f540e5caa2 Fix testStressSwipeToOverview
- Finish recents controller to app rather than to launcher, to ensure taskbar state uses in-app configuration
- Also fix an issue when a gesture completes before onLauncherStart, which happens in 3 button mode. The error I saw in the test was:
java.lang.AssertionError: http://go/tapl test failure: Failed to receive an event for the state change: expected [Overview], actual: [Background, Normal];
Context: want to switch from background to overview, clicking Recents button; now visible state is Background
(This also accurately describes what I saw on the device, where the LauncherState went to Normal but the task was still running in the live tile)

Test: testStressSwipeToOverview
Fixes: 203577620
Change-Id: I19616f7921c9821f1b45a90a3e4bec4fb3b8a9d3
Merged-In: I19616f7921c9821f1b45a90a3e4bec4fb3b8a9d3
(cherry picked from commit ce6bf7dd7f)
2021-12-15 05:45:43 +00:00
Tony Wickham ee24e46a61 Fix issues with starting new recents animation before previous onRecentsAnimationStart
- Fix logic for canceling animation for continued quick switch, so that this case (starting a new gesture before onRecentsAnimationStart() of the previous gesture) instead goes to the STATE_FINISH_WITH_NO_END flow.
- Update the end target so that we go to that state instead of always overview state if swipe was past the halfway threshold when we call endLauncherTransitionController(). This is specifically so we don't use OverviewInputConsumer on the second gesture, given the first one was canceled and didn't actually go to overview.
- GestureState#isRecentsAnimationRunning() now checks for STATE_RECENTS_ANIMATION_STARTED rather than _INITIALIZED, to be consistent with its javadoc and TaskAnimationManager#isRecentsAnimationRunning(). This also ensures we can correctly calculate continued quick switch (see above).
- Call cleanUpRecentsAnimation() before creating a new one in TaskAnimationManager. This ensures that the previous listener doesn't immediately cleanup the new gesture when it gets onRecentsAnimationCanceled() due to the new recents animation starting.

Test: swipe to home twice from the app, locally ignoring the onRecentsAnimationStart() from the first one, and ensure the second one responds normally
Bug: 193851085
Change-Id: I76e27c96b54293805546c0d6c82e77f975c69d7a
Merged-In: I76e27c96b54293805546c0d6c82e77f975c69d7a
(cherry picked from commit 66ed0ff23e)
2021-12-15 05:44:27 +00:00
Jon Miranda 32ec4d52e1 Scale, crop, and translate window when swiping back to home.
This makes the animation consistent with what happens
when swiping up to home.

Bug: 208292857
Test: open app, swipe back to close, test on portrait and landscape
Change-Id: I096b20fe3d3398001e442d41981350e7b0321a46
2021-12-15 01:34:12 +00:00
Vinit Nayak 8581dfc218 Wait for the Launcher activity to bind to TIS before animating
- Mainly a test issue where we destroy the activity and immediately
  enter overview without preloading launcher.  In this case, the task
  bar does not animate due to the delayed cycled of activity create
  -> bind service -> service connected -> taskbar ui controller init.
  As a result, the bar can occlude content from Launcher preventing
  the test from finding the overview actions.

  Instead, in cases where we need to animate with launcher, we wait
  for Launcher to be created (generally already the case) and the
  service has bound before proceeding.

Bug: 189807374
Bug: 204891006
Test: atest NexusLauncherTests:com.android.quickstep.StartLauncherViaGestureTests
Change-Id: I2cfccae67ac0e5a591639c6c99df032451dae16d
2021-12-15 00:53:54 +00:00
TreeHugger Robot 9b3b2b9c7e Merge "Ensure some taskbar states are initialized correctly" into sc-v2-dev 2021-12-14 22:49:50 +00:00
Winson Chung 7f5e4ca06c Ensure some taskbar states are initialized correctly
- Update FLAG_IN_APP to account for setup state to ensure that the
  stashed state is correct. This needs to be done in the stash
  controller since SUW is the home activity on startup and the
  launcher state controller will not be initialized until after
  SUW finishes
- Initialize the launcher state and resumed flags in case Launcher
  restarts while another app is resumed

Bug: 204384193
Test: Run through SUW, ensure the background is not visible
Change-Id: I5ce061ad16e79226c8428339ccd0b5ac55c07205
2021-12-14 19:08:55 +00:00
Tony Wickham 36e5f812d5 Merge "Don't clobber in progress page transition in applyLoadPlan()" into sc-v2-dev 2021-12-14 16:18:39 +00:00
Ling Wo 361d8286cc Merge "delete appIcon from workspace via TAPL" into sc-v2-dev 2021-12-14 02:10:59 +00:00
Tony Wickham db34fba43f Don't clobber in progress page transition in applyLoadPlan()
Also only reloadIfNeeded() instead of always reloading in showCurrentTask(), which is called twice as the gesture starts and could contribute to jank.

Test: quickly quick switch from app A to B, ensure no jumpcut back to A
Bug: 205499708
Change-Id: I516020551d3f76eb4025df848bf4c88adf5499b7
2021-12-14 00:25:08 +00:00
TreeHugger Robot ed6cbbc9a6 Merge "Set default value for rank field in launcher logs to ItemInfo.rank." into sc-v2-dev 2021-12-13 18:48:09 +00:00
Siarhei Vishniakou 81ff81227e Add ALLOW_SLIPPERY_TOUCHES to make StatusBarTouchController slippery
LauncherActivity uses FLAG_SLIPPERY for certain interactions. For
example, when home screen is shown, and the user pulls down from not the
top of the screen, and notification shade is getting displayed, then the
touch should be getting transferred to the NotificationShade using
FLAG_SLIPPERY.

The newly introduced permission is added to launcher in order for this
flag to be applied to the window.

Bug: 206188649
Bug: 157929241
Test: reviewed logs, ensure that NexusLauncherActivity has FLAG_SLIPPERY
Test: re-ran the performance regression test
Change-Id: I8d05fa3663687b5382a59b0d47cdac404844c3b7
2021-12-12 06:22:08 +00:00
Ling WO 85336c23fb delete appIcon from workspace via TAPL
1. Create a new class for DropBar icon.
2. Implement function to delete appIcon from workspace.
3. Add testDeleteFromWorkspace to TaplTestsLauncher3.

Bug: 205593009
Test: Launcher3Tests:com.android.launcher3.ui.TaplTestsLauncher3#testDeleteFromWorkspace

Change-Id: I259b909aebcdcc1c73af63a9970db43dab3e86eb
2021-12-10 18:14:41 -08:00