Xin Li
7d8d41ac47
[automerger skipped] Merge Android 12 QPR 3 am: 5e36e2607b -s ours
...
am skip reason: Merged-In I540ce3429cb4b1b86b8554a08677679c932b05e5 with SHA-1 bf8a2429ea is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2125776
Change-Id: I701c3c0ddb6afd4c6e472b4fc43b80c5e0e67a73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 19:57:03 +00:00
Xin Li
250f92bbe0
Merge "Merge Android 12 QPR 3"
2022-06-16 18:51:54 +00:00
Sebastián Franco
2c102c3b73
Merge "Adding a case when there is only 1 system shortcut on the Popup Container" into tm-qpr-dev am: 2545f45a1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18284907
Change-Id: Icc4848f780ae139a3a39fe747e383c00be25d94e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 17:22:25 +00:00
Sebastián Franco
2545f45a1f
Merge "Adding a case when there is only 1 system shortcut on the Popup Container" into tm-qpr-dev
2022-06-16 17:01:10 +00:00
Luca Zuccarini
c703f3a3e0
Unify the source of truth for NORMAL <> ALL_APPS transitions.
...
Bug: 231682175
Bug: 234812580
Test: manual
Change-Id: I5b66735474915d7a59bda337f67df37ff397908a
2022-06-16 16:40:26 +00:00
Tony Wickham
a4acb2276a
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am: 9d5f64adf1 am: ca544c5a1b am: 45c6b165bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18914942
Change-Id: I37f013932cae2c8f20e2de3dd644e87cfb28e210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 15:53:27 +00:00
Tony Wickham
1dc22b725c
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am: 9d5f64adf1 am: 1cba5f9d47 am: d8439e7f80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18914942
Change-Id: I60dc035e17584da539296b667aef1fbfd0aeeef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 15:53:19 +00:00
Tony Wickham
d19ab05376
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am: 9d5f64adf1 am: 1cba5f9d47 am: d100f6825f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18914942
Change-Id: I519d08a2682a9177090b1436525eadd845e6f1a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 15:52:50 +00:00
Tony Wickham
45c6b165bf
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am: 9d5f64adf1 am: ca544c5a1b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18914942
Change-Id: I3f37750d704d964aea35f7c31b0369da63799870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 15:28:12 +00:00
Tony Wickham
d8439e7f80
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am: 9d5f64adf1 am: 1cba5f9d47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18914942
Change-Id: Id0004e65570042b3953d94c3e9c1633b745e8a6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 15:28:05 +00:00
Tony Wickham
d100f6825f
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am: 9d5f64adf1 am: 1cba5f9d47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18914942
Change-Id: Ib76e6458f71282ebb7753db8c4ea9b671fb0fa19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 15:28:03 +00:00
Tony Wickham
1cba5f9d47
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am: 9d5f64adf1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18914942
Change-Id: I4c55e85b233eec4a6bca1d46590270b71ecbc4a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 15:10:12 +00:00
Tony Wickham
ca544c5a1b
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev am: 9d5f64adf1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18914942
Change-Id: Id802a0ac9cea65b662afd3e35582e0b7014f489b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 15:08:40 +00:00
Tony Wickham
9d5f64adf1
Merge "Clear MotionPauseDetector onRecentsAnimationCanceled()" into tm-dev
2022-06-16 14:55:48 +00:00
Alex Chau
5180f06252
Merge "Detect force visible nav bar based on kids mode." into tm-qpr-dev am: ccc55f1668
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18910230
Change-Id: I77bba64ee7931a8ea32499a7421b991b5a42df2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 14:27:08 +00:00
Alex Chau
ccc55f1668
Merge "Detect force visible nav bar based on kids mode." into tm-qpr-dev
2022-06-16 13:55:14 +00:00
Thales Lima
d4b0c446b4
Merge "Fix QSB alignment" into tm-qpr-dev am: 85e52e2f9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18910227
Change-Id: I6326575904727e1cce2a76f755d4167cdd641775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 12:35:04 +00:00
Thales Lima
85e52e2f9d
Merge "Fix QSB alignment" into tm-qpr-dev
2022-06-16 12:19:45 +00:00
Alex Chau
7e77cda9d6
Merge "Animate inline QSB between home and apps" into tm-qpr-dev am: a5ae4c2e57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18799573
Change-Id: I189fa4adfad99c21a9edbb88c34682b1f3c52d84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-16 08:20:50 +00:00
Alex Chau
a5ae4c2e57
Merge "Animate inline QSB between home and apps" into tm-qpr-dev
2022-06-16 08:00:51 +00:00
Android Build Coastguard Worker
3356668290
Snap for 8731319 from 34958f4bdf to tm-qpr1-release
...
Change-Id: I66a791487bb40fb9d20aef5647ff15f8b5f7df98
2022-06-16 01:25:36 +00:00
Android Build Coastguard Worker
c44e85cc2f
Snap for 8730838 from 5d57e3d651 to tm-release
...
Change-Id: I07913027890716e22b84394beafd40864b6a832d
2022-06-15 23:24:40 +00:00
Ling WO
9a8964b122
Cherrypick needed for merge conflict with ag/18875278
...
Support move to a specific location on workspace for all workspaceDragSource, so other workspaceDragSource such as HomeAppIconMenuItem can be moved to a fixed location during testing to avoid ui-diff flakiess
Design doc:
https://docs.google.com/document/d/1tZWbfsv86O6UAKtHJrDBGecu-x3ac51qmWvARDg057M
Test: atest
Bug: 216189838
Change-Id: Ia6ef7338beb257d0313be17a53a9fc59ae39fdb6
(cherry picked from commit fe8fb4d137 )
2022-06-15 22:38:04 +00:00
Brandon Dayauon
d7450579f3
Merge "Fix work toggle button to be placed where it should be." into tm-qpr-dev am: 111473315d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18841742
Change-Id: I5aad39dcdadf270c45255edbedfcf32a512285aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 22:25:46 +00:00
Brandon Dayauon
111473315d
Merge "Fix work toggle button to be placed where it should be." into tm-qpr-dev
2022-06-15 22:05:49 +00:00
Schneider Victor-tulias
e164995f9e
Fix taskbar unstash animation delay when launching a split task.
...
Fixes: 232033354
Test: switched between split and unsplit tasks using 3 button nav and gesture nav
Change-Id: I9a4e2eb08e9970540093e3dc60b64a372be2052f
2022-06-15 14:55:37 -07:00
TreeHugger Robot
b67104fadb
Merge "Fix folder preview animation when adding or removing icons." into tm-qpr-dev am: 34958f4bdf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18568370
Change-Id: I189846b43af30c3c5166f4495e3184695daa96e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 21:39:15 +00:00
TreeHugger Robot
34958f4bdf
Merge "Fix folder preview animation when adding or removing icons." into tm-qpr-dev
2022-06-15 21:20:55 +00:00
Alex Chau
c1d26448c5
Animate inline QSB between home and apps
...
- Added a QSB to taskbar to be animated between inline QSB and taskbar
- Passed endValue of taskbar animator to TaskbarController to have aniamtion variation between home -> app and app -> home
- Tuned duartion of taskbar animation and also stagger animation when taskbar is present
- Disabled scaling down of taskbar and inline QSB for home -> app
- Disabled stagger animation of taskbar and inline QSB for app -> home
Bug: 220733187
Test: manual
Change-Id: I4aac0bbc343b992a0472298595770e2bf2a55990
2022-06-15 22:12:29 +01:00
Vinit Nayak
d18304ca15
Close all open views for 1P and 3P launchers
...
* Previously TaskView was closing task menu view, but
that got removed since launcher was doing that on
state transition.
* Only 1P launcher was doing that and not 3P launcher,
moved call to remove open views to parent class
Test: Invoking split on 3P launcher doesn't result in a crash
Bug: 199342537
Change-Id: I6afbe7640ede362a677e15a33409a7cabdb8cca9
2022-06-15 14:09:49 -07:00
Pinyao Ting
e5dbb75acd
Cache and reuses LauncherAppWidgetHostView when launcher resumes
...
Currently by design when launcher enters the background, it stops
listening to updates in widgets. This eventually causes the dilemma
for launcher when it resumes, before the update can be returned from
the system process via IPC, launcher could do one of the following
to fill the gap:
1. show a deferred widget view -- a placeholder that renders the shape
of the widget -- to let the user know widget is being reloaded.
2. show whichever widget view that was previously displayed to the
user that may now contain stale content.
There is a descrepancy here since in some edge cases we are showing the
former while in most other cases we are showing the later. This CL added
a short-term fix to address the descrepancy and favors the later where
possible.
Bug: 218067434
Test: manual
Change-Id: I6cd2cd704186267227e2ec47f2581843fd526fa0
2022-06-15 13:23:31 -07:00
Tony Wickham
bed0d636fe
Proper fix for gesture nav flicker using runOnPageScrollsInitialized()
...
I root caused the two areas causing the flicker:
A. If page scrolls aren't initialized when we get onActivityInit(), the first scroll even after linkRecentsViewScroll() will jump based on min scroll (due to Clear all button). Fix is to defer linking until page scrolls are initialized.
B. If page scrolls aren't initialized when the gesture starts, RecentsView can jump to the min scroll when calling showCurrentTask(), since that calls setCurrentPage(getRunningTaskIndex()) which might be out of bounds. Fix is to defer that setCurrentPage() until page scrolls are initialized.
Test: open a random app that hasn't been opened in a while, touch down
on nav handle and see if RecentsView scrolls partially or fully
offscreen; repeat 20 times to be sure
Fixes: 233112195
Change-Id: I000960775f8735920d97c87942065a430c9dce0c
2022-06-15 19:08:32 +00:00
Tony Wickham
a379435d04
Clear MotionPauseDetector onRecentsAnimationCanceled()
...
Fixes: 234022857
Test: Open ImCapture and swipe up to home; repeat 20 times and ensure never see empty overview tasks over launcher
Change-Id: Icef6d7a54000e1e21453feeae7e207679077b772
2022-06-15 11:59:59 -07:00
Pat Manning
c773d7cdc8
Detect force visible nav bar based on kids mode.
...
WM was changed to use NAV_BAR_KIDS_MODE instead of NAV_BAR_FORCE_VISIBLE, this needs to update to match.
Fix: 229580780
Test: manual.
Change-Id: I38fb23dcc85676593a3f8f0851676bc526802d2e
2022-06-15 15:03:52 +01:00
Thales Lima
616e0102a4
Fix QSB alignment
...
Fix: 232908328
Test: manual
Change-Id: If5516be6b8f7142577257f5ec5b5dfa8feca445d
2022-06-15 11:40:58 +01:00
Hyunyoung Song
63fed12a67
Merge "Remove hideKeyboard exception in the log" into tm-dev am: 5d57e3d651 am: 0f27de35c8 am: e983ceaba9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18869544
Change-Id: Ic82b311344c5ff50ca2387083addfb0a98b776ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 07:08:01 +00:00
Hyunyoung Song
181bb37071
Merge "Remove hideKeyboard exception in the log" into tm-dev am: 5d57e3d651 am: 76e688b7c1 am: 5b59dde8c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18869544
Change-Id: I4d495928c27b51d826e3308f145680a5fe50e2b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 07:07:53 +00:00
Hyunyoung Song
a5551d3b20
Merge "Remove hideKeyboard exception in the log" into tm-dev am: 5d57e3d651 am: 76e688b7c1 am: b751033f30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18869544
Change-Id: I859c7eab27749320377c86af9ea882476e9d758b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:54:49 +00:00
Hyunyoung Song
e983ceaba9
Merge "Remove hideKeyboard exception in the log" into tm-dev am: 5d57e3d651 am: 0f27de35c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18869544
Change-Id: I48fe8e7b510c065db91484165f497beda58cc67e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:41:10 +00:00
Hyunyoung Song
5b59dde8c4
Merge "Remove hideKeyboard exception in the log" into tm-dev am: 5d57e3d651 am: 76e688b7c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18869544
Change-Id: I76e8e845783e2e50f056d7cf8395241c126fc9cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:39:15 +00:00
Hyunyoung Song
b751033f30
Merge "Remove hideKeyboard exception in the log" into tm-dev am: 5d57e3d651 am: 76e688b7c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18869544
Change-Id: I2131e1676c613f0df96d9989876632d5fa282e4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:39:06 +00:00
Hyunyoung Song
0f27de35c8
Merge "Remove hideKeyboard exception in the log" into tm-dev am: 5d57e3d651
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18869544
Change-Id: I7255de82c3c00b6d74f45fcd70e603a82f312dc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:18:28 +00:00
Hyunyoung Song
76e688b7c1
Merge "Remove hideKeyboard exception in the log" into tm-dev am: 5d57e3d651
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18869544
Change-Id: I8c89746b3ee084b68664c0153dd6351c3f4fad75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 06:18:10 +00:00
Hyunyoung Song
5d57e3d651
Merge "Remove hideKeyboard exception in the log" into tm-dev
2022-06-15 05:38:16 +00:00
Automerger Merge Worker
78b795708d
Merge "Merge "Snap to running task if it's offscreen when back is invoked" into tm-dev am: 7d54b06c29 am: c8a05f37ba" into tm-d1-dev-plus-aosp am: 1603c025fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18897728
Change-Id: I84bd145c43322a89b81c2346214f7461811231d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 04:40:15 +00:00
Winson Chung
b42b4b9c7f
Merge "Snap to running task if it's offscreen when back is invoked" into tm-dev am: 7d54b06c29 am: 43f3398d25 am: 99b41628b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18897728
Change-Id: Ib82def1e624461b39424a3a5428e2f44549d4659
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 04:40:06 +00:00
Winson Chung
3a22bcb180
Merge "Snap to running task if it's offscreen when back is invoked" into tm-dev am: 7d54b06c29 am: 43f3398d25 am: 4d5ce7c16c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18897728
Change-Id: I37b7618386077a8dc3e11873239883a357b1555a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 04:39:48 +00:00
Automerger Merge Worker
1603c025fe
Merge "Merge "Snap to running task if it's offscreen when back is invoked" into tm-dev am: 7d54b06c29 am: c8a05f37ba" into tm-d1-dev-plus-aosp
2022-06-15 04:24:01 +00:00
Winson Chung
57729bf9b1
Merge "Snap to running task if it's offscreen when back is invoked" into tm-dev am: 7d54b06c29 am: c8a05f37ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18897728
Change-Id: I4d6fa90c91b17ff655181a27e62eee33e11a8629
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 04:23:55 +00:00
Winson Chung
99b41628b5
Merge "Snap to running task if it's offscreen when back is invoked" into tm-dev am: 7d54b06c29 am: 43f3398d25
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18897728
Change-Id: Ifcc07538f2c8b42fe0fa6f1846056b41da3fd3c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 04:23:52 +00:00