Tracy Zhou
aeebfe7db2
Merge "Revert "[Live Tile] App surface is above launcher even after reaching Overview"" into sc-v2-dev am: 5b92dccc5e am: 8a1eaa6735
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16167967
Change-Id: I53b523eef88a2eeed9562c9f46fb6eec59aee3ec
2021-11-03 22:16:58 +00:00
Tracy Zhou
8a1eaa6735
Merge "Revert "[Live Tile] App surface is above launcher even after reaching Overview"" into sc-v2-dev am: 5b92dccc5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16167967
Change-Id: I1d544daf428d134695190cd1b2ea32266bd120cb
2021-11-03 22:05:23 +00:00
Tracy Zhou
5b92dccc5e
Merge "Revert "[Live Tile] App surface is above launcher even after reaching Overview"" into sc-v2-dev
2021-11-03 21:49:41 +00:00
Evan Rosky
f7e8eca08b
Merge "Provide app-process tokens to remote transitions so they can be boosted" into sc-v2-dev am: a3defa4d39 am: ef590ff147
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15633306
Change-Id: I53b2d45e3c3b93d171792be8267b592b0d402324
2021-11-03 21:28:03 +00:00
Evan Rosky
767d4ac50e
Merge "Provide app-process tokens to remote transitions so they can be boosted" into sc-v2-dev am: a3defa4d39 am: 53f6ec366d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15633306
Change-Id: I5a9746b8af9f3bb7f25f29b51dd8fa1234ad45d4
2021-11-03 21:12:04 +00:00
Evan Rosky
53f6ec366d
Merge "Provide app-process tokens to remote transitions so they can be boosted" into sc-v2-dev am: a3defa4d39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15633306
Change-Id: I5484bb00f11d9dfde24e5291dfbc12285b9d9006
2021-11-03 21:11:28 +00:00
Evan Rosky
ef590ff147
Merge "Provide app-process tokens to remote transitions so they can be boosted" into sc-v2-dev am: a3defa4d39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15633306
Change-Id: I496f45b2c087e2b531fdc3e1035c64c46aa39fca
2021-11-03 21:11:03 +00:00
Evan Rosky
a3defa4d39
Merge "Provide app-process tokens to remote transitions so they can be boosted" into sc-v2-dev
2021-11-03 20:59:08 +00:00
Bill Yi
87deb6335a
[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 6fcd0f86c5 -s ours am: fb65043bca -s ours am: 3055b9c88e -s ours am: d157b46720 -s ours am: dead62bfc8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1878971
Change-Id: I89d69409897c38c6a4cb63b5fd9745eb674d4a34
2021-11-03 19:25:25 +00:00
Bill Yi
dead62bfc8
[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 6fcd0f86c5 -s ours am: fb65043bca -s ours am: 3055b9c88e -s ours am: d157b46720 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1878971
Change-Id: I3185d31ce0419da24dab0bd95f45ab695ec58daf
2021-11-03 19:06:45 +00:00
Bill Yi
d157b46720
[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 6fcd0f86c5 -s ours am: fb65043bca -s ours am: 3055b9c88e -s ours
...
am skip reason: Merged-In Id6156b3469ffc23b171415d792cf48c9db9634c2 with SHA-1 526386b255 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1878971
Change-Id: Icc5b608cf8a564fc27d665cf135472a0f1e2c0e4
2021-11-03 18:46:15 +00:00
Bill Yi
3055b9c88e
[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 6fcd0f86c5 -s ours am: fb65043bca -s ours
...
am skip reason: Merged-In Id6156b3469ffc23b171415d792cf48c9db9634c2 with SHA-1 526386b255 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1878971
Change-Id: I74989ad40a61eab284c33a295f8ef372680d0131
2021-11-03 18:25:46 +00:00
Bill Yi
fb65043bca
[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 6fcd0f86c5 -s ours
...
am skip reason: Merged-In Id6156b3469ffc23b171415d792cf48c9db9634c2 with SHA-1 526386b255 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1878971
Change-Id: I0326842ee7088786e0b5b267f7a9fe199f42a18b
2021-11-03 18:08:27 +00:00
Winson Chung
409313345e
[automerger skipped] Merge "Revert "DO NOT MERGE Fix the cutout of magnification border"" into sc-v2-dev am: d9db871f79 am: eb1626bc08 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16182773
Change-Id: I5a699551502b6a29d68f760c12157fdf32edf5fd
2021-11-03 18:06:46 +00:00
Alex Chau
76d6d2ee35
[automerger skipped] Revert "DO NOT MERGE Fix the cutout of magnification border" am: c91a43e110 am: 2705be5666 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16182773
Change-Id: Ifc72f7ef7e566285ccc332a63a2d5697ef5591f9
2021-11-03 18:06:44 +00:00
Winson Chung
a481eddd40
[automerger skipped] Merge "Revert "DO NOT MERGE Fix the cutout of magnification border"" into sc-v2-dev am: d9db871f79 am: daae3f11e2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16182773
Change-Id: I391c0d48eff29cca22e0ee5edea4961125ef35f1
2021-11-03 18:03:02 +00:00
Alex Chau
b0970ab373
[automerger skipped] Revert "DO NOT MERGE Fix the cutout of magnification border" am: c91a43e110 am: e7cd85204e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16182773
Change-Id: I3b3ca5a02dea3f27b958670f02efa8313ef52da4
2021-11-03 18:03:00 +00:00
Bill Yi
6fcd0f86c5
Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE"
2021-11-03 17:50:39 +00:00
Winson Chung
daae3f11e2
Merge "Revert "DO NOT MERGE Fix the cutout of magnification border"" into sc-v2-dev am: d9db871f79
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16182773
Change-Id: Ib3cba27e15ae349cad41d34833b800b3541a0600
2021-11-03 17:07:31 +00:00
Alex Chau
e7cd85204e
Revert "DO NOT MERGE Fix the cutout of magnification border" am: c91a43e110
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16182773
Change-Id: Id4077d5b7050fa3403379f57f40a61365e9158a1
2021-11-03 17:07:29 +00:00
Winson Chung
eb1626bc08
Merge "Revert "DO NOT MERGE Fix the cutout of magnification border"" into sc-v2-dev am: d9db871f79
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16182773
Change-Id: Id8e956aac5ff0c1492e1e568a430b35986ba72a8
2021-11-03 17:07:11 +00:00
Alex Chau
2705be5666
Revert "DO NOT MERGE Fix the cutout of magnification border" am: c91a43e110
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16182773
Change-Id: I333af6ef9a8d29385e0cd5e08b4c3c3887f2b801
2021-11-03 17:07:09 +00:00
Winson Chung
d9db871f79
Merge "Revert "DO NOT MERGE Fix the cutout of magnification border"" into sc-v2-dev
2021-11-03 16:49:07 +00:00
Alex Chau
c91a43e110
Revert "DO NOT MERGE Fix the cutout of magnification border"
...
Revert "Do NOT MERGE Fix magnification border includes taskbar"
Revert submission 16003793-magnification_border
Bug: 196510717
Reason for revert: Caused NexusLauncherTests and NexusLauncherOutOfProcTests to stop running
Reverted Changes:
Ibbc9c51ea:Do NOT MERGE Fix magnification border includes tas...
Ida2bb5bf1:DO NOT MERGE Fix the cutout of magnification borde...
Change-Id: I6b2123aedd2a2f23142a34f158d2d9ab71948a18
2021-11-03 14:19:23 +00:00
Benno Lin
3aa1a807dc
Merge "Implement pressing back button and swiping back" into sc-v2-dev am: 97d749833c am: 4c818e40b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16013509
Change-Id: Ie7e6b573de7b75786eb3852d81f88292009ab5b6
2021-11-03 06:33:29 +00:00
Benno Lin
1d9d303185
Merge "Implement pressing back button and swiping back" into sc-v2-dev am: 97d749833c am: 1cfa05ad08
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16013509
Change-Id: I087ff9a5482c88f9034b1c51227d73c2412c89c7
2021-11-03 06:32:51 +00:00
Benno Lin
4c818e40b5
Merge "Implement pressing back button and swiping back" into sc-v2-dev am: 97d749833c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16013509
Change-Id: Ia234ca6bfecc272f19c20b711adfd950556cbcd0
2021-11-03 06:21:01 +00:00
Benno Lin
1cfa05ad08
Merge "Implement pressing back button and swiping back" into sc-v2-dev am: 97d749833c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16013509
Change-Id: I4b60b6e1fa2c7a14d837ef74cd2d3f4c0f6f9f25
2021-11-03 06:20:17 +00:00
Benno Lin
97d749833c
Merge "Implement pressing back button and swiping back" into sc-v2-dev
2021-11-03 06:03:49 +00:00
Ryan Lin
4694ecec71
[automerger skipped] Merge "DO NOT MERGE Fix the cutout of magnification border" into sc-v2-dev am: 0ee6940bd0 am: 6f505d67e2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16003757
Change-Id: Ieb9ab627dac270b4f5cee3666efa7d9b028de368
2021-11-03 05:54:28 +00:00
ryanlwlin
e755ec08fa
[automerger skipped] DO NOT MERGE Fix the cutout of magnification border am: 571df892f7 am: 45a20421f6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16003757
Change-Id: I5b7a268d59b00cbda65472365e16582535ebde0d
2021-11-03 05:54:27 +00:00
Ryan Lin
8e8ba34fe9
[automerger skipped] Merge "DO NOT MERGE Fix the cutout of magnification border" into sc-v2-dev am: 0ee6940bd0 am: b54963e2b2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16003757
Change-Id: I1d9a57c96170fc8d2b5f3d073ce59fb752ddcbfe
2021-11-03 05:53:53 +00:00
ryanlwlin
babcce25d5
[automerger skipped] DO NOT MERGE Fix the cutout of magnification border am: 571df892f7 am: 20dc41372d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16003757
Change-Id: I98c9321828173393f3d3d21dd89395b73c78f43e
2021-11-03 05:53:51 +00:00
Ryan Lin
6f505d67e2
Merge "DO NOT MERGE Fix the cutout of magnification border" into sc-v2-dev am: 0ee6940bd0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16003757
Change-Id: Ib04fe2c82d9ddd02dbd3025e1a7983d61fa264ce
2021-11-03 05:42:16 +00:00
ryanlwlin
45a20421f6
DO NOT MERGE Fix the cutout of magnification border am: 571df892f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16003757
Change-Id: I110f15d4c315218ace1e1939b5c77d790d48538e
2021-11-03 05:42:15 +00:00
Ryan Lin
b54963e2b2
Merge "DO NOT MERGE Fix the cutout of magnification border" into sc-v2-dev am: 0ee6940bd0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16003757
Change-Id: I4b239406e4d91211caf4c9092c86bbb1db75da5d
2021-11-03 05:41:44 +00:00
ryanlwlin
20dc41372d
DO NOT MERGE Fix the cutout of magnification border am: 571df892f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16003757
Change-Id: I2ea490bc2334a57b6edaa458f1313f91b22ffacc
2021-11-03 05:41:41 +00:00
Vinit Nayak
aa2a2215a5
Merge "Revert "Align OverviewActionsView for 3 button taskbar"" into sc-v2-dev am: 874ea446c9 am: 9f77b30259
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16177161
Change-Id: I4b590cdb7bdd958dfdba5ef694238d0945135ae7
2021-11-03 05:30:01 +00:00
Vinit Nayak
1bdae2753d
Merge "Revert "Align OverviewActionsView for 3 button taskbar"" into sc-v2-dev am: 874ea446c9 am: 2535db410c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16177161
Change-Id: Ic36f941b1436137c6eb82a0613c9612e61352a47
2021-11-03 05:29:26 +00:00
Ryan Lin
0ee6940bd0
Merge "DO NOT MERGE Fix the cutout of magnification border" into sc-v2-dev
2021-11-03 05:24:27 +00:00
Vinit Nayak
9f77b30259
Merge "Revert "Align OverviewActionsView for 3 button taskbar"" into sc-v2-dev am: 874ea446c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16177161
Change-Id: I7943a055038e4c41d5434b4c04dacbbb4deeb8b5
2021-11-03 05:18:55 +00:00
Vinit Nayak
2535db410c
Merge "Revert "Align OverviewActionsView for 3 button taskbar"" into sc-v2-dev am: 874ea446c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16177161
Change-Id: Ie1f5611e4c4e0826eb687acb95dd157f641341d4
2021-11-03 05:18:12 +00:00
Vinit Nayak
874ea446c9
Merge "Revert "Align OverviewActionsView for 3 button taskbar"" into sc-v2-dev
2021-11-03 05:04:32 +00:00
Bill Yi
b9ffa5b002
Merge SP1A.211105.004 to aosp-master - DO NOT MERGE
...
Merged-In: Id6156b3469ffc23b171415d792cf48c9db9634c2
Merged-In: I92ba4bd46f2671c0bc33a71631ce1b0290198c67
Change-Id: I58ae017dde7870b2c97e1eaca0ce12d5d887bb8b
2021-11-02 21:07:54 -07:00
Benno Lin
3e49432ec6
Merge "Update TAPL to operate on folder icons." into sc-v2-dev am: 8f083ccce3 am: a5e417feab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15757342
Change-Id: Ib0685a76ff43c8c88360e0455b87d4287b3d6bf1
2021-11-03 02:52:15 +00:00
Benno Lin
413a663096
Merge "Update TAPL to operate on folder icons." into sc-v2-dev am: 8f083ccce3 am: 062300e0eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15757342
Change-Id: Ia3d6ef0cb11913fe4f81933be5a34cea1746f06e
2021-11-03 02:51:41 +00:00
ryanlwlin
571df892f7
DO NOT MERGE Fix the cutout of magnification border
...
If the window is unmagnifiable, it might cause the cutout of
magnification region.
To fix it, we set the flag when the touchable region is not the
entier window frame.
Bug: 196510717
Test: manual test on gestural and 3-button navigation
Change-Id: Ida2bb5bf120038ac9153e12790b93bdec195adbc
2021-11-03 10:50:09 +08:00
Benno Lin
a5e417feab
Merge "Update TAPL to operate on folder icons." into sc-v2-dev am: 8f083ccce3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15757342
Change-Id: Iebd2ca9f88a1975cf533df28aa4a988e3818e098
2021-11-03 02:36:35 +00:00
Benno Lin
062300e0eb
Merge "Update TAPL to operate on folder icons." into sc-v2-dev am: 8f083ccce3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15757342
Change-Id: I3ab0a08a826188a794b5d76ecbb13b0e07b2c496
2021-11-03 02:35:54 +00:00
Benno Lin
6c00386c2b
Implement pressing back button and swiping back
...
This CL implements a pressBack function to press back button or swiping
back in gesture navigation mode.
Bug: 199120092
Test: atest -c Launcher3Tests:com.android.launcher3.ui.TaplTestsLauncher3#testPressBack &&
atest -c NexusLauncherTests:com.android.quickstep.TaplTestsQuickstep#testPressBack
Change-Id: I001cea17d09ae1ab7952d04ee394a2afa5bf1e67
2021-11-03 02:28:37 +00:00