Commit Graph

47938 Commits

Author SHA1 Message Date
Bill Yi 7021004a6f Merge changes from topic "presubmit-am-dd3c36e3866a44d6b7f93a76c12cd46d" into sc-dev-plus-aosp am: 4d3edb5d91 am: 9b1030e65c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15595229

Change-Id: Iee82afae7530025dd0cde54cd5c84c9d4868de09
2021-08-17 22:45:04 +00:00
Bill Yi a3c8b87e55 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cea66b3a81 am: 049c6cb59f -s ours am: 5d0627e910 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iffb6199da69a62e1343eae96c2001b9e36286b18
2021-08-17 22:45:03 +00:00
Bill Yi 6c1d6c3e4e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3b8415e58a -s ours am: e0b69a2ae5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id8a19e8cd2181723262b473a92f882c6faaad808
2021-08-17 22:36:47 +00:00
Bill Yi 008f2fea1e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3b8415e58a -s ours am: e0b69a2ae5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2c716517dde4f73a071c4b31d63b6913e368069d
2021-08-17 22:36:06 +00:00
Bill Yi 565616ae6e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cea66b3a81 -s ours am: 0610d4c802 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I903c572336a7c80f35c3619a12ef40a0b17a9cb1
2021-08-17 22:35:47 +00:00
Bill Yi 4240e33c67 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cea66b3a81 -s ours am: 0610d4c802 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If238951540c2360d56edbc2bb98e1ed410692f01
2021-08-17 22:35:42 +00:00
Bill Yi 4b7e273ca8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3b8415e58a -s ours am: 816ba91b21 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifad8ab912e8da2e607b86766b88a0fb8133dc279
2021-08-17 22:30:47 +00:00
Bill Yi 8b31baa6d9 Merge changes from topic "presubmit-am-7e1940cadd2a43ad94282dd8aef456b4" into sc-dev-plus-aosp am: 3939db651c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15595326

Change-Id: Iab1b7554770776dbf71484770d4572df9b5c1acb
2021-08-17 22:29:40 +00:00
Bill Yi 0484ab6cb7 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c864f6c50e am: b40b16f35c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia4c91bc6bdedbc97771a439ca2791cabd18dce84
2021-08-17 22:29:39 +00:00
Bill Yi 9b1030e65c Merge changes from topic "presubmit-am-dd3c36e3866a44d6b7f93a76c12cd46d" into sc-dev-plus-aosp am: 4d3edb5d91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15595229

Change-Id: I5463f5dbd916b3140ff97e7d1c43d283d14fd463
2021-08-17 22:28:10 +00:00
Bill Yi 5d0627e910 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cea66b3a81 am: 049c6cb59f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8e0e3f9dc0044f34d283c14c3e5f8457053d8bd6
2021-08-17 22:28:09 +00:00
Bill Yi e0b69a2ae5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3b8415e58a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9d66bd5008a21418a1e061329c1dcb20ea0c91ed
2021-08-17 22:23:00 +00:00
Bill Yi 0610d4c802 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cea66b3a81 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If74688fff1cbeb04de75f0da8908642d485c4186
2021-08-17 22:22:24 +00:00
Bill Yi a595fef63b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3b8415e58a -s ours am: 57d2756d3c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9d8ec7f4ef1c8dd5f9161ccfc3bccb1f0eee995c
2021-08-17 22:21:31 +00:00
Bill Yi 2166a52f2c Merge changes from topic "presubmit-am-7e1940cadd2a43ad94282dd8aef456b4" into sc-mainline-prod am: c1fbe420d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15595326

Change-Id: I2fd2fffb563aad8aa9c79087e8bdb42849e05093
2021-08-17 22:20:41 +00:00
Bill Yi 816ba91b21 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3b8415e58a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia76ff98206d855cf4c90b74879aabe6f4f656204
2021-08-17 22:20:27 +00:00
Bill Yi 57d2756d3c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3b8415e58a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I262db3d8bbbe7a5391d83e679de9ec030c551c36
2021-08-17 22:20:19 +00:00
Tony Wickham 3974edc46a Don't draw taskbar background during gestures
In this case, the ScrimView for BackgroundAppState will handle drawing behind the whole screen, and prevents taskbar from drawing the rounded corners on top of TaskViews.

Added a hack to defer resuming last task by a frame to ensure taskbar is drawing first.

Test: Quick switch to an app, ensure it isn't covered by the taskbar's rounded corner
Bug: 196257194
Change-Id: Ibc81d80bc3bf1d908e6912b179cbcafbdcc56c0f
2021-08-17 15:07:50 -07:00
Tony Wickham 157d3b950d Draw rounded corners above the taskbar
- Increase height of taskbar window, but not contentInsets
- Draw the inverted corners as part of TaskbarDragLayer#dispatchDraw() (which handles the background already)

Test: visual

Bug: 196257194
Change-Id: I51d992078579e877c85a1d71ee4c00d85fd9db2e
2021-08-17 15:06:18 -07:00
Bill Yi 3b8415e58a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-17 22:05:47 +00:00
Bill Yi 3939db651c Merge changes from topic "presubmit-am-7e1940cadd2a43ad94282dd8aef456b4" into sc-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c864f6c50e
  Import translations. DO NOT MERGE ANYWHERE
2021-08-17 22:05:47 +00:00
Bill Yi d890b858e4 Merge changes from topic "presubmit-am-7e1940cadd2a43ad94282dd8aef456b4"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c864f6c50e 2p: cc78c86459
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c864f6c50e
  Import translations. DO NOT MERGE ANYWHERE
2021-08-17 22:05:47 +00:00
Bill Yi c1fbe420d0 Merge changes from topic "presubmit-am-7e1940cadd2a43ad94282dd8aef456b4" into sc-mainline-prod
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c864f6c50e
  Import translations. DO NOT MERGE ANYWHERE
2021-08-17 22:05:47 +00:00
Bill Yi 4d3edb5d91 Merge changes from topic "presubmit-am-dd3c36e3866a44d6b7f93a76c12cd46d" into sc-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cea66b3a81
  Import translations. DO NOT MERGE ANYWHERE
2021-08-17 22:04:02 +00:00
Bill Yi 2c4948fb30 Merge changes from topic "presubmit-am-dd3c36e3866a44d6b7f93a76c12cd46d"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cea66b3a81 2p: b03a16f3c6
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cea66b3a81
  Import translations. DO NOT MERGE ANYWHERE
2021-08-17 22:04:02 +00:00
TreeHugger Robot 4b6a402e40 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-08-17 21:34:22 +00:00
TreeHugger Robot 25b2ff077e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 5baa4e8c45 -s ours am: 94398a0461 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia7e67a9dab30bd6154cb39cbfa408ba8e9694966
2021-08-17 20:48:12 +00:00
Bill Yi 92817cb2a6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af65b6d3d2 -s ours am: df27435106 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8868a8949751fa7be9abad00603938896919b8b4
2021-08-17 20:47:18 +00:00
Vinit Nayak 17c4b33db6 Add GroupedTaskView for gestures in staged split.
* Currently only works for portrait 50/50 split
* Have gesture swipe animation flow use multiple
TaskViewSimulators, one for each app in split
* Added new APIs in shell to query for actively running
tasks to determine if we're in split screen
* Lots of UI polish needed during gesture
* Launching into staged split after live tile ends
not implemented yet.

Bug: 181704764
Change-Id: Ib90e99e1e10b19121e8709385e1334b9380d6502
2021-08-17 13:46:43 -07:00
Xin Li dec70bc2cd [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: b252da0e67 -s ours am: 40df1d25c3 -s ours am: 5fc990a2e5 -s ours
am skip reason: Merged-In Ic51ea9d199e6a072168365aeb7553203cd2c43c6 with SHA-1 4b3c24d0d3 is already in history

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

Change-Id: I0c967217571a01b5284a36c1c7cfca9cd414b7c8
2021-08-17 20:32:07 +00:00
TreeHugger Robot 900c7dc9c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 5baa4e8c45 -s ours am: 0aa2549a2f -s ours am: 561ce77838 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0d905588da8facc69adfd797a012a32dc3f9e98d
2021-08-17 20:20:46 +00:00
Bill Yi 5ea7a83e94 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af65b6d3d2 -s ours am: 877d24ee45 -s ours am: a0232a1a4c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I42a4e3bfe7ee048c53a92329a8a209dfd824c322
2021-08-17 20:20:40 +00:00
TreeHugger Robot 30a62d835e Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-08-17 20:15:56 +00:00
TreeHugger Robot 561ce77838 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 5baa4e8c45 -s ours am: 0aa2549a2f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I48952541cdee8013e18aa7e7d16bd426ae988cf6
2021-08-17 20:07:35 +00:00
Bill Yi a0232a1a4c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af65b6d3d2 -s ours am: 877d24ee45 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I39e36e517eea445c03f793956632e37f0ca1025d
2021-08-17 20:07:25 +00:00
TreeHugger Robot 94398a0461 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 5baa4e8c45 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0ff62bbf969060b755adec45f31ac68e2688964a
2021-08-17 19:56:46 +00:00
TreeHugger Robot 0aa2549a2f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 5baa4e8c45 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6f2087aade15e5d863636819a70f442b5c725d35
2021-08-17 19:56:24 +00:00
Bill Yi df27435106 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af65b6d3d2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I66825264d5572d2e39064bc8e30e591c15202886
2021-08-17 19:56:13 +00:00
Bill Yi 877d24ee45 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af65b6d3d2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I08726275c50a21bcba9ee0457fc2c4b87a949ec0
2021-08-17 19:56:09 +00:00
TreeHugger Robot 9e829f5bdb Merge "Only add 2nd screen by default for split display" into sc-v2-dev am: cceef46f16 am: 42a79a3023
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15583057

Change-Id: Id04adff0053d16681aa4a9015fb70fc57ac52641
2021-08-17 19:55:33 +00:00
TreeHugger Robot cbd9071186 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 96273bf2ff -s ours am: 83ba961d8a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I42831fcaa69b4c20dcd002c3544c67c03d866cf1
2021-08-17 19:55:28 +00:00
TreeHugger Robot b041da7a0c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6a384092a3 -s ours am: 04c3b2e574 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4485f03b0b3031384705742e9ad2aa5b10427aea
2021-08-17 19:55:18 +00:00
TreeHugger Robot f8d92e0a48 Merge changes I2cc102d7,Ifba9aa59 into sc-v2-dev am: 54ce7e6cf8 am: 4079cdbb74
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15465222

Change-Id: I07e79c417528a08896ce07213e5476d771de545c
2021-08-17 19:55:01 +00:00
TreeHugger Robot 5baa4e8c45 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-08-17 19:54:28 +00:00
TreeHugger Robot 42a79a3023 Merge "Only add 2nd screen by default for split display" into sc-v2-dev am: cceef46f16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15583057

Change-Id: I394ab4a53ccd04da164580312c34e3ea54d36420
2021-08-17 19:49:40 +00:00
Xin Li 5fc990a2e5 [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: b252da0e67 -s ours am: 40df1d25c3 -s ours
am skip reason: Merged-In Ic51ea9d199e6a072168365aeb7553203cd2c43c6 with SHA-1 4b3c24d0d3 is already in history

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

Change-Id: I465d518b6da275162f31420b2a52f5cf038387e0
2021-08-17 19:46:03 +00:00
TreeHugger Robot cceef46f16 Merge "Only add 2nd screen by default for split display" into sc-v2-dev 2021-08-17 19:45:48 +00:00
TreeHugger Robot 83ba961d8a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 96273bf2ff -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5e5abfb2182bc98ec55ac2338c471839d3b87603
2021-08-17 19:39:25 +00:00
TreeHugger Robot 04c3b2e574 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6a384092a3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic324a8fd8d9bfcaa43dd1cd888003a12a80dbc32
2021-08-17 19:39:22 +00:00
TreeHugger Robot 4079cdbb74 Merge changes I2cc102d7,Ifba9aa59 into sc-v2-dev am: 54ce7e6cf8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15465222

Change-Id: I9de621c74f2a47f893d309031ea61e0b25763fcf
2021-08-17 19:39:18 +00:00