Jonathan Miranda
75c40f2c84
Merge "Fix bug where app icon is gone for first frame on cold start." into sc-dev am: 3334c32120 am: d156f372f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15164770
Change-Id: I30f768e44bd50a06a8f6c74fa44b7ca069abd94b
2021-07-02 09:14:11 +00:00
Jonathan Miranda
b1ceab102e
Merge "Cancel existing preview item animation during non-animated update." into sc-dev am: 81501a563c am: a47a2017e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15164771
Change-Id: Icb78fe5b9b24f8a7753cb56ab9d9d0ab456e3448
2021-07-02 09:14:06 +00:00
Sunny Goyal
75c953f1d2
Merge "Fixing some dimentions in AllSet activity" into sc-dev am: f3d3dcf4a1 am: 08fa7008b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15160037
Change-Id: Id708fae5c4006a541998bcc4c4fc87107f0b084c
2021-07-02 09:13:58 +00:00
Winson Chung
6e137295f7
Merge "Defer cleaning up screenshot until after we actually switch to screenshot" into sc-dev am: eb0a38c5f2 am: 277e9c83c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15160033
Change-Id: I5a712ae0761c2e2ba79d73a6e3c7f043f9b9e335
2021-07-02 09:13:49 +00:00
Cyrus Boadway
1fa71a10e6
Merge "Use nullable field and boolean rather than optional" into sc-dev am: 048a858575 am: c857d45d97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15171711
Change-Id: Ifa4e8f09e5c088da79514db8c789226010d2b019
2021-07-02 09:13:35 +00:00
Samuel Fufa
d66d5c7b89
Merge "Polish changes for work tab" into sc-dev am: 9010e773e4 am: 4ace63d141
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15157942
Change-Id: Ibf00cbd81b531a68da76aefef9b1aacb43713402
2021-07-02 09:13:25 +00:00
Alina Zaidi
2891944a4f
Merge "Reduce margin for DropTargetBar to avoid buttons to be truncated." into sc-dev am: eefccccb19 am: c1565463bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15155531
Change-Id: Iecc95592f1bba5833f18e9c3e005b0c15bc8981e
2021-07-02 09:13:19 +00:00
Steven Ng
e13333c5bf
[automerger skipped] Merge "Fix widget animation truncated at drop if a widget is resized" into sc-dev am: d9128413cc am: 0fcbd49f2a -s ours
...
am skip reason: Merged-In I901743f8ba392de37f3ef69ca386c4b36bfebd7f with SHA-1 12b0dfb826 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15159890
Change-Id: Ib61a5d61891697468b2063dce007755c1d50c23d
2021-07-02 09:13:14 +00:00
TreeHugger Robot
91948fc3d1
[automerger skipped] Merge "Correct color extraction on App Widget drop." into sc-dev am: 25e37a85ae am: 9cfbc67b70 -s ours
...
am skip reason: skipped by user pbdr
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15121736
Change-Id: I97a001eeef267a8b6ea1aee2d9535bca788885fe
2021-07-02 09:13:04 +00:00
Tracy Zhou
7bbaffbcb5
[automerger skipped] Enable live tile in 3 button mode am: 1fe5fda3d8 -s ours am: 3022d5f9f3 -s ours
...
am skip reason: Merged-In Iffaea18afb2179b5bb7dadda49e56efefa5658bc with SHA-1 d09ebe660f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14254546
Change-Id: Idb3827453ad55161f210b919dc1f89dd30826d1b
2021-07-02 07:09:37 +00:00
Tracy Zhou
3022d5f9f3
[automerger skipped] Enable live tile in 3 button mode am: 1fe5fda3d8 -s ours
...
am skip reason: Merged-In Iffaea18afb2179b5bb7dadda49e56efefa5658bc with SHA-1 d09ebe660f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14254546
Change-Id: I1c104b0ff71d9a9571a3be3da019d600e948fab7
2021-07-02 06:52:37 +00:00
Tracy Zhou
740b2381c4
Enable live tile in 3 button mode am: d09ebe660f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15133050
Change-Id: I779ad9e03302864b1a2f59a8da7092917c0f72ad
2021-07-02 05:21:57 +00:00
Tracy Zhou
1fe5fda3d8
Enable live tile in 3 button mode
...
- Previously we rely on whether launcher is resumed as a signal to see what "toggle" means. This no longer works since launcher is not resumed in Overview. Instead, we need to check the live tile signals.
- Use screenshot doesn't propagate after setting a new current task. So followed the logic around mRunningTaskIconScaledDown to work it out.
- Get rid of NavigationModeFeatureFlag, pending on 3rd party launcher change ag/14409355
Fixes: 185934639
Test: (1) Toggle overview from home screen and toggle back to fullscreen. (2) Toggle overview from app and keep toggling.
Change-Id: Iffaea18afb2179b5bb7dadda49e56efefa5658bc
Merged-In: Iffaea18afb2179b5bb7dadda49e56efefa5658bc
2021-07-02 05:19:32 +00:00
Tracy Zhou
d09ebe660f
Enable live tile in 3 button mode
...
- Previously we rely on whether launcher is resumed as a signal to see what "toggle" means. This no longer works since launcher is not resumed in Overview. Instead, we need to check the live tile signals.
- Use screenshot doesn't propagate after setting a new current task. So followed the logic around mRunningTaskIconScaledDown to work it out.
- Get rid of NavigationModeFeatureFlag, pending on 3rd party launcher change ag/14409355
Fixes: 185934639
Test: (1) Toggle overview from home screen and toggle back to fullscreen. (2) Toggle overview from app and keep toggling.
Change-Id: Iffaea18afb2179b5bb7dadda49e56efefa5658bc
2021-07-01 18:40:56 -07:00
Alex Chau
43e40493fa
Merge "Restore previous currentPage in applyLoadPlan in case task is re-ordered" into sc-dev am: 679f8bb9ca am: e526fd6a00
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15175270
Change-Id: I25d921c104e5285fa163124d2b0863cda5a9bc45
2021-07-01 22:49:27 +00:00
Alex Chau
e526fd6a00
Merge "Restore previous currentPage in applyLoadPlan in case task is re-ordered" into sc-dev am: 679f8bb9ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15175270
Change-Id: I4cc43374c577299c7be3d63bb8a7393a90447231
2021-07-01 22:28:30 +00:00
Alex Chau
679f8bb9ca
Merge "Restore previous currentPage in applyLoadPlan in case task is re-ordered" into sc-dev
2021-07-01 22:12:54 +00:00
Tracy Zhou
f50e8c82e0
[automerger skipped] Merge "Do not switch to screenshot and finish recents animation for menu options that already do so" into sc-dev am: e54f789de9 -s ours am: 1dd0ca7bec -s ours
...
am skip reason: skipped by user tracyzhou
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15176734
Change-Id: I790cc2e91bc976cb38cfc86f0d61107c3b84777a
2021-07-01 20:24:59 +00:00
Tracy Zhou
1dd0ca7bec
[automerger skipped] Merge "Do not switch to screenshot and finish recents animation for menu options that already do so" into sc-dev am: e54f789de9 -s ours
...
am skip reason: skipped by user tracyzhou
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15176734
Change-Id: Ic5c12013c702c683417ab706c06d6c71b26ecb4f
2021-07-01 20:15:54 +00:00
Tracy Zhou
e54f789de9
Merge "Do not switch to screenshot and finish recents animation for menu options that already do so" into sc-dev
2021-07-01 19:32:39 +00:00
Jonathan Miranda
8e7c617775
Merge "Fix bug where app icon is gone for first frame on cold start." into sc-dev am: 3334c32120 am: e6f0509d1d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15164770
Change-Id: I9b3d03c8050ac47e0368161dba58110b0e047605
2021-07-01 18:48:39 +00:00
Jonathan Miranda
4e021bcc56
Merge "Cancel existing preview item animation during non-animated update." into sc-dev am: 81501a563c am: aa560506ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15164771
Change-Id: I89d96ed914f33f0803cf943d2b74a9482d4e6dcb
2021-07-01 18:48:34 +00:00
Sunny Goyal
cac11af5a1
Merge "Fixing some dimentions in AllSet activity" into sc-dev am: f3d3dcf4a1 am: 2e5176e51f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15160037
Change-Id: Ie2e2042efc2048e9d2d66a5fea40b5470b771359
2021-07-01 18:48:29 +00:00
Jonathan Miranda
e6f0509d1d
Merge "Fix bug where app icon is gone for first frame on cold start." into sc-dev am: 3334c32120
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15164770
Change-Id: I38ace4adec4591e9259a8859ed547e1b951b922c
2021-07-01 18:36:20 +00:00
Jonathan Miranda
aa560506ba
Merge "Cancel existing preview item animation during non-animated update." into sc-dev am: 81501a563c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15164771
Change-Id: I667763f65219cf259b8cf0db929d7dc0c848163e
2021-07-01 18:36:16 +00:00
Jonathan Miranda
d156f372f5
Merge "Fix bug where app icon is gone for first frame on cold start." into sc-dev am: 3334c32120
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15164770
Change-Id: I3680615723b0ef5edf175db01fd44ed068f2147f
2021-07-01 18:35:30 +00:00
Jonathan Miranda
a47a2017e4
Merge "Cancel existing preview item animation during non-animated update." into sc-dev am: 81501a563c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15164771
Change-Id: I2f4175a5b0b232184d2b8cd2200b3e2926903555
2021-07-01 18:35:25 +00:00
Jonathan Miranda
3334c32120
Merge "Fix bug where app icon is gone for first frame on cold start." into sc-dev
2021-07-01 18:34:47 +00:00
Jonathan Miranda
81501a563c
Merge "Cancel existing preview item animation during non-animated update." into sc-dev
2021-07-01 18:32:49 +00:00
Sunny Goyal
2e5176e51f
Merge "Fixing some dimentions in AllSet activity" into sc-dev am: f3d3dcf4a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15160037
Change-Id: I3e8d01451a9ad4b14128bf90a9d758e922d04f4e
2021-07-01 18:32:02 +00:00
Sunny Goyal
08fa7008b0
Merge "Fixing some dimentions in AllSet activity" into sc-dev am: f3d3dcf4a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15160037
Change-Id: I8f187fe98130bc8c35864a97b21fc31fb1161e30
2021-07-01 18:31:02 +00:00
Sunny Goyal
f3d3dcf4a1
Merge "Fixing some dimentions in AllSet activity" into sc-dev
2021-07-01 18:16:45 +00:00
Tracy Zhou
99adef95b3
Do not switch to screenshot and finish recents animation for menu options that already do so
...
The issue is that in landscape mode we add overview shortcuts (e.g. screenshot) to the task view menu, where we switch to screenshot and finish recents animation before executing the shortcut action. However for shortcut actions like screenshot, we do the same, resulting in two chained "switch to screenshot and finish". This is a temporary fix for S given it's late in the cycle and we don't want to introduce unwanted regressions.
Fixes: 192272546
Test: manual
Change-Id: I7ef596e8bce6c15aa4a27163197beac12359b691
2021-07-01 17:46:44 +00:00
Alex Chau
e0fcee01b3
Restore previous currentPage in applyLoadPlan in case task is re-ordered
...
Fix: 186537288
Test: Repeatededly launch task from home and swipe to home, animation is correct
Test: Quick switch, launch task then swipe up, there is no jump
Change-Id: I9fd7416d9811ce4e54a1c6d20374d89d00417cd5
2021-07-01 18:43:20 +01:00
Winson Chung
927059c8be
Merge "Defer cleaning up screenshot until after we actually switch to screenshot" into sc-dev am: eb0a38c5f2 am: 2ae6a3e3c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15160033
Change-Id: I717210002017b6ed71bfa49a90171f4e32a7532f
2021-07-01 17:16:24 +00:00
Cyrus Boadway
e6bd0f1e3c
Merge "Use nullable field and boolean rather than optional" into sc-dev am: 048a858575 am: 270a9c734f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15171711
Change-Id: I4d1c78c6e3de0e0778996548196d2f20756c8ae3
2021-07-01 17:16:21 +00:00
Winson Chung
2ae6a3e3c9
Merge "Defer cleaning up screenshot until after we actually switch to screenshot" into sc-dev am: eb0a38c5f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15160033
Change-Id: I4183018dbe6ad644824f842cae259ab0786c9657
2021-07-01 17:15:48 +00:00
Cyrus Boadway
270a9c734f
Merge "Use nullable field and boolean rather than optional" into sc-dev am: 048a858575
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15171711
Change-Id: I6b6b6bf2ecb367f81fdb82321c7e7bb3cd8a228a
2021-07-01 17:15:38 +00:00
Winson Chung
a717b7b45a
Merge "Remove unused logs" into sc-v2-dev am: efa5e9f5ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15167125
Change-Id: I12a6c3dd689fdeda918809b6848772b97bd9b376
2021-07-01 17:15:29 +00:00
Winson Chung
277e9c83c7
Merge "Defer cleaning up screenshot until after we actually switch to screenshot" into sc-dev am: eb0a38c5f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15160033
Change-Id: I4ed3c6d9009dcff282b08e6597fecd9dcfdecd0e
2021-07-01 17:14:51 +00:00
Cyrus Boadway
c857d45d97
Merge "Use nullable field and boolean rather than optional" into sc-dev am: 048a858575
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15171711
Change-Id: I33e41f1886bc0ce57b291acc60b2e8d3b5d65d7b
2021-07-01 17:14:46 +00:00
Winson Chung
eb0a38c5f2
Merge "Defer cleaning up screenshot until after we actually switch to screenshot" into sc-dev
2021-07-01 17:11:35 +00:00
Winson Chung
efa5e9f5ea
Merge "Remove unused logs" into sc-v2-dev
2021-07-01 17:09:22 +00:00
Samuel Fufa
8ab6e371c5
Merge "Polish changes for work tab" into sc-dev am: 9010e773e4 am: 1d7a4410e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15157942
Change-Id: I98615d6ff79d692dbbb7a66aa394a4f0b40fa1f3
2021-07-01 17:09:13 +00:00
Cyrus Boadway
048a858575
Merge "Use nullable field and boolean rather than optional" into sc-dev
2021-07-01 16:57:24 +00:00
Samuel Fufa
1d7a4410e3
Merge "Polish changes for work tab" into sc-dev am: 9010e773e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15157942
Change-Id: Ic3aa2d63e943b41eb65517d2f25154128edb0432
2021-07-01 16:43:29 +00:00
Samuel Fufa
4ace63d141
Merge "Polish changes for work tab" into sc-dev am: 9010e773e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15157942
Change-Id: I4a49c0e8c8418d6e1f9c4c128541e8d32717cd1e
2021-07-01 16:42:34 +00:00
Samuel Fufa
9010e773e4
Merge "Polish changes for work tab" into sc-dev
2021-07-01 16:30:39 +00:00
Cyrus Boadway
551b4297ed
Use nullable field and boolean rather than optional
...
Optional won't hold null parameters, so use a boolean flag and
colorschange fields to represent the value and whether changes are
present.
Bug: 190818220
Test: manual
Change-Id: I794507340345864e73f04039f12a035c8053fd96
2021-07-01 15:05:43 +00:00
Alina Zaidi
f273be1019
Merge "Reduce margin for DropTargetBar to avoid buttons to be truncated." into sc-dev am: eefccccb19 am: f03b1aeeb6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15155531
Change-Id: Ie4a995b2fdfb197acce85ad5830d241ec4fc2770
2021-07-01 12:07:25 +00:00