Commit Graph

2483 Commits

Author SHA1 Message Date
Xin Li
2b87be68b8 Merge SP2A.220305.012
Bug: 219523960
Merged-In: I748fdd49626acaa0e986a9d8038039cada6faa60
Change-Id: I67693156d705f2488fe18149d2dd02d529f009ff
2022-02-14 20:06:38 +00:00
Xin Li
5ad6db7742 Merge sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: I8cfa435bb6233818adb9cc99dadeeb06a03443d5
Change-Id: Ib93992d88fd1704179009a3872798b9e7b83a6d1
2022-02-11 07:25:43 +00:00
Mady Mellor
6843c124e0 DO NOT MERGE Fix issue with bubble stack & bubble data expanded bit being out of sync
If onBackPressed was used while the stack was expanded, it was calling
setExpanded on BubbleStackView (BSV) and NOT BubbleData. This results in
BSV and BubbleData being out of sync which can lead to incorrect behavior.
(e.g. using individual bubble dismiss method instead of the stack dismiss
method).

Test: atest BubblesTest NewNotifPipelineTest
Fixes: 217361258
Change-Id: I748fdd49626acaa0e986a9d8038039cada6faa60
Merged-In: I748fdd49626acaa0e986a9d8038039cada6faa60
(cherry picked from commit 8f368c5358)
Merged-In:I748fdd49626acaa0e986a9d8038039cada6faa60
2022-02-10 00:41:55 +00:00
Ben Lin
c03eca68e2 PiP: Disable enterSplit for now.
Bug: 206645013
Test: Enter split button no longer appears
Change-Id: I6237dd1c88f50733ab24e45806c413d5777032e9
(cherry picked from commit eab029ce8d)
Merged-In:I6237dd1c88f50733ab24e45806c413d5777032e9
2022-01-21 01:28:24 +00:00
Nataniel Borges
4e4babec1a Create owner test files for subpackages
Now failures can be automatically directed to the correct buganizer components and forwarded directly to the correct assignees, instead of being all created into the Winscope for further triage

Test: check owners file
Change-Id: I6876a702b4f46443328aab027f7fee994b2bb819
2022-01-20 10:21:40 +00:00
Bill Yi
c8a4f437c8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iaf42323ce36547d1209961307cdc93c65a64066e
2022-01-14 02:14:50 +00:00
Mariia Sandrikova
a274e1a7d4 DO NOT MERGE Revert "[2/n] Camera Compat UI: Add interfaces for client-server..." am: 7617679a61
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16571392

Change-Id: I0adf2bf45c5f7d7349e9c0f180aea9d10f70645d
2022-01-13 22:55:51 +00:00
Mariia Sandrikova
04ce06bb79 Merge changes from topic "revert-16468379-CXJTAENUWN" into sc-v2-dev
* changes:
  DO NOT MERGE Revert "[2/n] Camera Compat UI: Add interfaces for client-server..."
  DO NOT MERGE Revert "[3/n] Camera Compat UI: Add a camera compat control."
  DO NOT MERGE Revert "Log the CameraCompatControlEventReported atom."
2022-01-13 22:41:22 +00:00
Mariia Sandrikova
7617679a61 DO NOT MERGE Revert "[2/n] Camera Compat UI: Add interfaces for client-server..."
Revert submission 16468379

Reason for revert: Feature development is moving to T.

Reverted Changes:
Id9b9a8930:[3/n] Camera Compat UI: Add a camera compat contro...
Id6be4a954:Enable a camera app compat control on Large screen...
I083aa6718:[2/n] Camera Compat UI: Add interfaces for client-...

Bug: 206602997

Change-Id: I9ad876043fd61f708a8f468fffd1ef371bfa0866
2022-01-13 15:21:38 +00:00
Aurimas Liutikas
aec26c4f68 DO NOT MERGE Revert "[3/n] Camera Compat UI: Add a camera compat control."
Revert submission 16468379

Reason for revert: Feature development is moving to T.

Reverted Changes:
Id9b9a8930:[3/n] Camera Compat UI: Add a camera compat contro...
Id6be4a954:Enable a camera app compat control on Large screen...
I083aa6718:[2/n] Camera Compat UI: Add interfaces for client-...

Bug: 206602997

Change-Id: I318b89b87cd3b05a3f3dcd428e3d80fe81465011
2022-01-13 15:16:51 +00:00
Winson Chung
bab740d0b4 Merge "Return non-null empty list if the controller is already invalidated" into sc-v2-dev am: a76e46ee03
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16615270

Change-Id: I9f09acee30f935206973774fcb143d58f470b9b2
2022-01-13 01:57:27 +00:00
Winson Chung
a76e46ee03 Merge "Return non-null empty list if the controller is already invalidated" into sc-v2-dev 2022-01-13 01:42:19 +00:00
Tony Huang
1343931512 Merge "Avoid NPE while drag divider bar" into sc-v2-dev am: fcfa227cf7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16602936

Change-Id: I3fe73e84b92c87ec6f009bc7b671d529a857820f
2022-01-12 01:41:24 +00:00
Tony Huang
fcfa227cf7 Merge "Avoid NPE while drag divider bar" into sc-v2-dev 2022-01-12 01:21:28 +00:00
Winson Chung
d0823fc830 Return non-null empty list if the controller is already invalidated
- In the off chance that the controller is already invalidated (due to
  service reconnection to launcher for example), then any calls through
  the previous binder should just return an empty task list.

Bug: 206648922
Test: Manual (haven't been able to repro)
Change-Id: Iff6193fa89c2baecc527e589f17ae41b82575a48
2022-01-11 19:57:26 +00:00
Mady Mellor
04b46aed49 Merge "Fix possible NPE" into sc-v2-dev am: d76f9c199c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16603090

Change-Id: I50140f087019333fc4ca5b3668cddc20a2ead3b9
2022-01-11 17:53:27 +00:00
Mady Mellor
d76f9c199c Merge "Fix possible NPE" into sc-v2-dev 2022-01-11 17:36:43 +00:00
Tony Huang
f0d69e7d47 Avoid NPE while drag divider bar
Task topActivityInfo is nullable, we should check it is null or
not before access it.

Bug: 213894166
Test: pass existing tests
Change-Id: Iedda57145586b6d5c2e151308ddca1e2e36035c0
2022-01-11 14:58:17 +08:00
Winson Chung
049cf6bb1e Merge "Ensure only single pip dismiss magnetized target exists" into sc-v2-dev am: f92999a5e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16602749

Change-Id: Ibe881d27475564731817bd7b868118e6333d9614
2022-01-11 06:21:52 +00:00
Winson Chung
f92999a5e1 Merge "Ensure only single pip dismiss magnetized target exists" into sc-v2-dev 2022-01-11 06:08:29 +00:00
Treehugger Robot
80a8bec986 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-01-11 00:50:18 +00:00
Winson Chung
b5e0878776 Ensure only single pip dismiss magnetized target exists
- If init() is called multiple times, the previous magnetized targets
  can cause the wrong target position to be calculated when trying (or
  not trying) to dismiss

Bug: 213348722
Test: Manual
Change-Id: Ic1f972cc60eafca2302ad168065c974c8a0ee924
2022-01-11 00:22:42 +00:00
Mady Mellor
0be1b45d64 Fix possible NPE
Test: manual - make sure dot works normally / no regression
Bug: 213027822
Change-Id: I819f73cb8c7d613796c3d3bb4b55b80b337c6126
2022-01-10 21:07:31 +00:00
Bill Yi
4c1a6f5c0c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I630367ef968c6c243fdfaf74c3454a5b2317c28f
2022-01-10 14:56:26 +00:00
Bill Yi
a3da5ba222 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibb329a7d407da9b8dc2bf002d706636c319a881f
2022-01-10 14:54:59 +00:00
TreeHugger Robot
581ad142f9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-01-09 05:21:03 +00:00
TreeHugger Robot
34171e053d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-01-09 05:20:12 +00:00
Bill Yi
9f612755b6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ifab08e6f5047b918b9d9eb318085f9e281b7fb4a
2022-01-08 05:06:10 +00:00
Bill Yi
301d5c5963 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I97d5ca669c13fda5f3c25b97f42ee359953fe172
2022-01-08 05:00:53 +00:00
Mariia Sandrikova
0cb2c45802 Merge "[5/n] Camera Compat UI: Unify margins logic for camera and size compat controls." into sc-v2-dev am: b6c52ec273
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16527687

Change-Id: Ib282c2fc1fd01d26841ee2003cd604d4150e569f
2022-01-07 11:02:56 +00:00
Mariia Sandrikova
b6c52ec273 Merge "[5/n] Camera Compat UI: Unify margins logic for camera and size compat controls." into sc-v2-dev 2022-01-07 10:49:20 +00:00
Bill Yi
6042a19c72 Merge sc-qpr1 to aosp-master - DO NOT MERGE
Merged-In: I90ca5ccbf686a975f479c2488ff34f82af12946a
Merged-In: I128f5ed6c1bad350ea449bba5da21123de3ea31b
Change-Id: Ib18c8042f735dceeee5e6ab9f1c963cf630913a6
2022-01-06 18:38:32 -08:00
Tony Huang
c015533563 Merge "Fix updateRecentTasksSplitPair unexpectly" into sc-v2-dev am: 588771a9de
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16564588

Change-Id: Iee0b86019c26a215834b0d34b9778083c38f3dec
2022-01-05 04:13:13 +00:00
Tony Huang
588771a9de Merge "Fix updateRecentTasksSplitPair unexpectly" into sc-v2-dev 2022-01-05 03:58:53 +00:00
Tony Huang
e74a59047b Merge "Fix toucn unresponsive after half fold in split" into sc-v2-dev am: 07a5dd0cb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16561464

Change-Id: I86e695dfb3d4c6d8cb3dee9770f7730cfe690e3d
2022-01-05 02:22:01 +00:00
Tony Huang
b5fe809adf Fix updateRecentTasksSplitPair unexpectly
While split pair switching, split remain as active so it might
record new bounds with old top task pair unexpectly.
Fix this by set flag to false on startTasksWithLegacyTransition
and reset to true after remote animation finished.

Fix: 213128767
Test: manual
Test: pass existing tests
Change-Id: I42b4c79558467dec23b789a3b5cc2f8f38cd1c36
Merged-In: I42b4c79558467dec23b789a3b5cc2f8f38cd1c36
2022-01-04 10:26:51 +00:00
Tony Huang
adae4870fb Fix toucn unresponsive after half fold in split
After fold animation finished, it will always set null bounds crop
to surface and cause root task surface bounds abnormal.
Fix by ignoring root task surface in StageTaskUnfoldController
because it would not effect animation.

Fix: 211132158
Test: manual
Test: pass existing tests
Change-Id: Iece8f7e7d437bdff1cf9e738df3acc075729b993
2022-01-03 19:03:02 +08:00
TreeHugger Robot
7e986248fa Merge "Adding additional log to track down crash" into sc-v2-dev am: a9831fcd24
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16551868

Change-Id: I85d29f3687c1a96f1f7ac9ca661640c0519bed5e
2021-12-30 22:54:39 +00:00
TreeHugger Robot
a9831fcd24 Merge "Adding additional log to track down crash" into sc-v2-dev 2021-12-30 22:47:08 +00:00
Winson Chung
b86d3723c9 Adding additional log to track down crash
Bug: 206648922
Test: Manual
Change-Id: If34dfc40183729a942e3c8433f3b5ee00ad8e079
2021-12-30 05:50:42 +00:00
Tony Huang
a36f06c8f8 Merge "Fix launcher crash and correct split behavior" into sc-v2-dev am: b017001ae0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16527653

Change-Id: I10ddbf8c29fda5e2bcbdf83145acdf5b20728091
2021-12-29 12:14:05 +00:00
Tony Huang
5289f17a80 Fix launcher crash and correct split behavior
Fix laucher crash while swipe up in split screen. This issue caused
by launcher will request 3 runningTaskInfos to do some action,
however, it cannot ensure 3 info actually include both splits because
only one got focused. Fix this by WA on RunningTasks, update the
adjacent task of the focus one too to make sure both split task
will be top two while calling getTasks.

Correct some split behavior while startTasksWithLegacyTransition
too.

Bug: 211716649
Test: pass existing tests.
Test: Make many split pair then swipe up
Change-Id: I2e6deb2ac607b454ca8fc760f0399135a1e8e901
Merged-In: I2e6deb2ac607b454ca8fc760f0399135a1e8e901
2021-12-29 11:57:37 +00:00
Mariia Sandrikova
d8cbcc46be [5/n] Camera Compat UI: Unify margins logic for camera and size compat controls.
Before this change, margin between a hint and a camera compat control was smaller than required 8 dp while for a size compat control it was bigger than 8dp (since ag/16420818). This change makes them consistent and also simplifies layout definition for the size compat button by declaring margings explicitly rather than including them in width and height implicitly.

Test: manual
Bug: 206602997
Change-Id: I09839e764d2c8904954a594433888bfdc21d56ba
2021-12-23 18:37:59 +00:00
TreeHugger Robot
e11f54565e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-12-23 18:24:14 +00:00
Tony Huang
88816106c2 Merge "Make sure launcher side can animate divider" into sc-v2-dev am: e1f575dee2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16236324

Change-Id: I9cabedb9360a29b8814d98daa89c09d4ee61375e
2021-12-22 03:00:10 +00:00
Tony Huang
e1f575dee2 Merge "Make sure launcher side can animate divider" into sc-v2-dev 2021-12-22 02:47:05 +00:00
Bill Yi
6eefdeebae Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2e74699a2c1affb6982cf1142cfaa1b199fc93c0
2021-12-22 01:02:17 +00:00
Winson Chung
0ef5032c45 Merge "Add debug logging for null task list" into sc-v2-dev am: cb1f78f054
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16486954

Change-Id: I36850a0f60ce0b8a09912f010499d4d67622aed0
2021-12-21 17:53:29 +00:00
Winson Chung
cb1f78f054 Merge "Add debug logging for null task list" into sc-v2-dev 2021-12-21 17:35:08 +00:00
Winson Chung
f4cc0faac1 Add debug logging for null task list
Bug: 206648922
Test: Adding logs
Change-Id: If2eec374eafd1287253404ba9d6af00612d9be5c
2021-12-21 06:09:57 +00:00