Commit Graph
78507 Commits
Author SHA1 Message Date
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
Android Build Coastguard Worker d24a68f535 Snap for 7513903 from efa5e9f5ea to sc-v2-release
Change-Id: Ib1234abfc3074ad8ea08ac330a36f13f7469d66f
2021-07-02 01:11:56 +00:00
Android Build Coastguard Worker 09306280d0 Snap for 7514518 from e54f789de9 to sc-release
Change-Id: I79d6876f65628f815896d798db915d21f3474fa5
2021-07-02 01:10:48 +00:00
Alex Chau 00fee3a523 Merge "Restore previous currentPage in applyLoadPlan in case task is re-ordered" into sc-dev am: 679f8bb9ca am: e526fd6a00 am: 43e40493fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15175270

Change-Id: I577eb80d9d0f7412cb48c6ed46fc35737c882192
2021-07-01 23:03:18 +00: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 35d8b03a97 Merge "Restore previous currentPage in applyLoadPlan in case task is re-ordered" into sc-dev am: 679f8bb9ca am: 66b5af2ac2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15175270

Change-Id: I016cc95e7d86f145ef7dde642c811099c4049d1f
2021-07-01 22:36:55 +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 4eabe23108 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: I409622ab04cc934290013203281329987e0ae5ec
2021-07-01 22:27:33 +00:00
Alex Chau 66b5af2ac2 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: Icaebfb0b8ea2de3109030f140b3dabbc139e1aa2
2021-07-01 22:27:22 +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 2ca69163c6 [automerger skipped] Merge "Do not switch to screenshot and finish recents animation for menu options that already do so" into sc-dev am: e54f789de9 am: 1fcb289e9b -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: Ic1f23f4f4548861648a5b543ca64b59c0b9b9aa0
2021-07-01 21:22:41 +00:00
Tracy Zhou 846ebfe859 [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: f50e8c82e0 -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: I08521fc98e3dbcec30f935e7c87f29ba10c18856
2021-07-01 20:39:14 +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 ec5c2ea87e Merge "Do not switch to screenshot and finish recents animation for menu options that already do so" into sc-dev am: e54f789de9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15176734

Change-Id: I6e980151382b7ce10fb4d206d86295a41e938b8f
2021-07-01 19:45:18 +00:00
Tracy Zhou 1fcb289e9b Merge "Do not switch to screenshot and finish recents animation for menu options that already do so" into sc-dev am: e54f789de9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15176734

Change-Id: I7b570013c9600d32a76c72f2a0ba8847ea04a069
2021-07-01 19:45:17 +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 509bd84762 Merge "Fix bug where app icon is gone for first frame on cold start." into sc-dev am: 3334c32120 am: e6f0509d1d am: 8e7c617775
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15164770

Change-Id: I901b13bc7e3805865b244296557ed2892b14da5e
2021-07-01 19:09:19 +00:00
Jonathan Miranda 24c23cdc5a Merge "Cancel existing preview item animation during non-animated update." into sc-dev am: 81501a563c am: aa560506ba am: 4e021bcc56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15164771

Change-Id: I05579c93945b4f119bf247f6b2e505c5d18d8249
2021-07-01 19:09:12 +00:00
Sunny Goyal b6b7491e41 Merge "Fixing some dimentions in AllSet activity" into sc-dev am: f3d3dcf4a1 am: 2e5176e51f am: cac11af5a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15160037

Change-Id: I5a1efd1b2c1d520fb11aa7e6571852b981e44ff8
2021-07-01 19:08:42 +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 35bcb6f40d Merge "Fix bug where app icon is gone for first frame on cold start." into sc-dev am: 3334c32120 am: 1376feeb22
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15164770

Change-Id: I2af5ce38052ad6eaf8234bfff93603e52f7e0e2d
2021-07-01 18:48:18 +00:00
Jonathan Miranda 0382ba2d27 Merge "Cancel existing preview item animation during non-animated update." into sc-dev am: 81501a563c am: b018ea34fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15164771

Change-Id: I87c9e1863a9bd7097b419bdeedbddc3c3b8beb04
2021-07-01 18:48:12 +00:00
Sunny Goyal 835dce9cde Merge "Fixing some dimentions in AllSet activity" into sc-dev am: f3d3dcf4a1 am: ebd8b75a9e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15160037

Change-Id: Ide88a388dc866aef38e2bf4d7ceb7cff179a7799
2021-07-01 18:48:04 +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 1376feeb22 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: Ib47cb13c6af50c0c9d5c6ec285beca09e88f2d41
2021-07-01 18:35:36 +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 b018ea34fe 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: I2315f7c54cb98c32f2318ded19f7563f3709cb42
2021-07-01 18:35:27 +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 ebd8b75a9e 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: I33bdf5f8dbacef076c6441a2309c308252143370
2021-07-01 18:31:07 +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
Winson Chung 6a51172270 Merge "Defer cleaning up screenshot until after we actually switch to screenshot" into sc-dev am: eb0a38c5f2 am: 2ae6a3e3c9 am: 927059c8be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15160033

Change-Id: I2659b9716d6392bc5c471d4ad42577050380c6cc
2021-07-01 18:09:23 +00:00
Cyrus Boadway 44d42d228a Merge "Use nullable field and boolean rather than optional" into sc-dev am: 048a858575 am: 270a9c734f am: e6bd0f1e3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15171711

Change-Id: I558a9a2995cd92fc3d7ca87b5e516a70bb1a8ba0
2021-07-01 18:06:17 +00:00
Winson Chung d9cff07959 Merge "Remove unused logs" into sc-v2-dev am: efa5e9f5ea am: a717b7b45a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15167125

Change-Id: I36a13d6621db04060c6d26c9bbc86a907b35f50f
2021-07-01 18:05:23 +00:00
Samuel Fufa cb4a33b7b5 Merge "Polish changes for work tab" into sc-dev am: 9010e773e4 am: 1d7a4410e3 am: 8ab6e371c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15157942

Change-Id: Ie91bb7112b4b2c0c058d3ac52170a4e05f7e5d8b
2021-07-01 18:03:16 +00:00
Alina Zaidi 056c4e8e1c Merge "Reduce margin for DropTargetBar to avoid buttons to be truncated." into sc-dev am: eefccccb19 am: f03b1aeeb6 am: f273be1019
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15155531

Change-Id: Ife4e91f79708eff4cdf5f5628a9809db1fc1eef2
2021-07-01 18:03:08 +00:00
Steven Ng 056ada4037 [automerger skipped] Merge "Fix widget animation truncated at drop if a widget is resized" into sc-dev am: d9128413cc -s ours am: 5dce7fef9b -s ours am: 3dfd83fc23 -s ours
am skip reason: Merged-In I901743f8ba392de37f3ef69ca386c4b36bfebd7f with SHA-1 39a87fda17 is already in history

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

Change-Id: Ia60726ffa89ad3452bcf0dfd5296e708c48812d7
2021-07-01 18:03:02 +00:00
Pierre Barbier de Reuille 37154fc347 [automerger skipped] Merge "resolve merge conflicts of 25e37a85ae to sc-v2-dev" into sc-v2-dev am: 2fa6e35341 am: c30fcad112 -s ours
am skip reason: Merged-In If573641e4bb5a98ed6b5008e00f70f4bbe492c24 with SHA-1 2881801c7b is already in history

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

Change-Id: I66879d0e393dc1861a9da2af564e7a5bf7d5395c
2021-07-01 18:02:56 +00:00
Steven Ng 54b836c65a [automerger skipped] Fix widget animation truncated at drop if a widget is resized am: 39a87fda17 am: c3a5df6188 -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/+/15171710

Change-Id: I8b579a9f1db795b2533a3ea8df4103498eada9ac
2021-07-01 18:02:51 +00:00
Tracy Zhou 4986376828 Merge "[Live Tile] App surface is above launcher even after reaching Overview" into sc-v2-dev am: d25ee3294c am: 89f8d0763d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15158868

Change-Id: I09acf90f0b002e801c9706d8cd88bf9dbf9d853d
2021-07-01 18:02:45 +00:00
Vadim Tryshev 6f42d6f4f0 Merge "Converting some TAPL sequence mismatches to human-readable diags." into sc-dev am: eead98d493 am: 36b0ba3a98 am: 145e5d915d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15150391

Change-Id: I376d28f37ca9e9f67d2d16b1306096cf618926e3
2021-07-01 18:02:40 +00:00
Vadim Tryshev 08764fc1eb Merge "Converting some TAPL sequence mismatches to human-readable diags." into sc-dev am: eead98d493 am: 93eac82376 am: 8aac22d68e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15150391

Change-Id: Ib9842fcc586c91a89bdbb8a4e5f429d4f745d015
2021-07-01 18:02:34 +00:00
Vadim Tryshev 98d5af6114 Merge "Verifying success of setting default Launcher in tests" into sc-dev am: ba302e8a6a am: 0b1eeaed4f am: 90c056a560
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15158349

Change-Id: I2ec006e4e3eb11efc9b7373e62c7afe82a26e233
2021-07-01 17:56:34 +00:00