TreeHugger Robot
9be15e2b85
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-12-16 15:50:09 +00:00
TreeHugger Robot
ac3d83d6ae
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-12-16 15:48:32 +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
1a534e5929
Merge changes from topic "presubmit-am-299ca4020ed94d05b0ac27bbf6752f7a"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 189f1ce908 2p: 0e2873b514
[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
365560199f
Merge "Show Digital Wellbeing Banners for split tasks" into sc-v2-dev am: 8d25a0a363 am: 510d9060a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16459079
Change-Id: If24107dc1d3e0d83557da8409a891471e25fc979
2021-12-16 11:49:47 +00:00
TreeHugger Robot
510d9060a7
Merge "Show Digital Wellbeing Banners for split tasks" into sc-v2-dev am: 8d25a0a363
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16459079
Change-Id: Ia65e7ce8eabc0a9caa5892a5a8de0e14f2b70b73
2021-12-16 11:33:17 +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
Android Build Coastguard Worker
4cabd83139
Snap for 8006021 from 78b12de4d2 to tm-release
...
Change-Id: Icb489e31ff69f4864eef77599dd8bd4a0b0c8cdf
2021-12-16 02:10:17 +00:00
Colin Cross
a1ca878a1c
[automerger skipped] Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" into stage-aosp-master am: b4bb645304 am: 3816453ca4 -s ours am: 985633b7c7 -s ours
...
am skip reason: Merged-In Ia2a677f3a3987751349bad951ff136b2d55f439f with SHA-1 12609edb72 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15854779
Change-Id: I644b49eabf3f2f8f3d20ec3c52e54341038930b6
2021-12-16 00:57:16 +00:00
Vinit Nayak
84292da6c2
Merge "Save multiple RunningTaskInfo in GestureState" into sc-v2-dev am: 20102c3dd7 am: a51f394504
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16482597
Change-Id: If69bd5e02de59bdfe05a8f7fcc03a4ff235d4c41
2021-12-16 00:54:45 +00:00
TreeHugger Robot
368eb46da5
Merge "Set navBarDarkIntensity based on dark theme in SUW" into sc-v2-dev am: f9f90d6dc2 am: 5ebda13e05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16482607
Change-Id: I8babe4bae067d8feab9d80c41b48994a33bf19df
2021-12-16 00:50:57 +00:00
Colin Cross
985633b7c7
[automerger skipped] Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" into stage-aosp-master am: b4bb645304 am: 3816453ca4 -s ours
...
am skip reason: Merged-In Ia2a677f3a3987751349bad951ff136b2d55f439f with SHA-1 12609edb72 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15854779
Change-Id: I99339ecb4faa457a2058f839d42502a98f5d1a8b
2021-12-16 00:50:17 +00:00
Vinit Nayak
a51f394504
Merge "Save multiple RunningTaskInfo in GestureState" into sc-v2-dev am: 20102c3dd7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16482597
Change-Id: I189ae54406b2a7dc6337e55fac648ed4f671f8bb
2021-12-16 00:36:17 +00:00
TreeHugger Robot
5ebda13e05
Merge "Set navBarDarkIntensity based on dark theme in SUW" into sc-v2-dev am: f9f90d6dc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16482607
Change-Id: I74b54c03261a46041407878337aadcf2dd62f8cc
2021-12-16 00:32:55 +00:00
Colin Cross
3816453ca4
Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" into stage-aosp-master am: b4bb645304
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15854779
Change-Id: I6b9efe278a1e6bb83f4a8f153a6a6da741d0e27f
2021-12-16 00:29:27 +00:00
Android Build Coastguard Worker
41b9029067
Snap for 8005451 from 80aa8da7e3 to sc-v2-release
...
Change-Id: Ib3f6f296403bdbbf72a3018961594145477de1db
2021-12-16 00:11:06 +00: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
Vadim Tryshev
9a6a47e351
Revert "Temporarily disable Launcher3 tests affected by fling changes"
...
This reverts commit bc4dc49c6c .
Reason for revert: RecyclerView bug is fixed
Change-Id: Ia2a677f3a3987751349bad951ff136b2d55f439f
Merged-In: Ia2a677f3a3987751349bad951ff136b2d55f439f
Test: presubmit
Bug: 197802324
(cherry picked from commit 8b4a6ee65b )
2021-12-15 14:38:04 -08:00
Colin Cross
b4bb645304
Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" into stage-aosp-master
2021-12-15 22:07:27 +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
78b12de4d2
Merge "Scale, crop, and translate window when swiping back to home." into sc-v2-dev am: 80aa8da7e3 am: e589eaded8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16470663
Change-Id: Id6d210fdcc9bda55a8666121bd5418a48da40c55
2021-12-15 20:35:18 +00:00
Brian Isganitis
c4a1e5d540
Merge "Add feature flag for All Apps in system Taskbar."
2021-12-15 20:34:22 +00:00
Winson Chung
1944ab39b9
Merge "Wait for the Launcher activity to bind to TIS before animating" into sc-v2-dev am: 2ecf688de6 am: 049a345cbe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16420662
Change-Id: I12d9cbe53afd42cfade93d1c957f3f9aa1be520a
2021-12-15 20:33:32 +00:00
Jon Miranda
e589eaded8
Merge "Scale, crop, and translate window when swiping back to home." into sc-v2-dev am: 80aa8da7e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16470663
Change-Id: I229d888f03692b575584c66b60eb6e16bcffb85e
2021-12-15 20:33:28 +00: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
049a345cbe
Merge "Wait for the Launcher activity to bind to TIS before animating" into sc-v2-dev am: 2ecf688de6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16420662
Change-Id: Ifdb1a25ea269ca38a7390c7367bb7a5876717c81
2021-12-15 20:17:59 +00:00
Brian Isganitis
3523b241cc
Merge "Include border spacing to align tasbar icons with hotseat."
2021-12-15 20:17:35 +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
TreeHugger Robot
923b6ce6d0
Merge "Avoid drawing the first frame in launcher before animation completes"
2021-12-15 19:38:35 +00:00
Shuming Hao
33e97f1ca4
Merge changes from topic "kingyo-new-buttons-master"
...
* changes:
Toggle notification panel when new buttons are clicked in taskbar
Add new buttons to taskbar
2021-12-15 16:49:19 +00:00
Bill Yi
3ca151d0e5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4dbad1ad6873defc9d66df8c89a05fa55800025f
2021-12-15 06:59:48 +00:00
Bill Yi
3405fe3831
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I51ee421c491ada82ab307a6470b46877a064cbba
2021-12-15 06:58:44 +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
02e4f4c947
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 189f1ce908 2p: 0e2873b514
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: I154f9be781c0f11fdb90f4b359e29c7537fd21ed
2021-12-15 06:54:03 +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
0e2873b514
[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: If9d583b529256cc30f9f62b3ebba376b0dff2e26
2021-12-15 06:53:37 +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