Commit Graph

918629 Commits

Author SHA1 Message Date
Wei Sheng Shih
7e4e8ccde0 Merge "Update correct split task Id to RecentsTaskController..." into udc-dev am: d4464ea972 am: 33705ab79f am: 204fa35179
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23599961

Change-Id: Ie0b765cea70416e0b6c09d45fd0da90559038526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 13:40:44 +00:00
Wei Sheng Shih
204fa35179 Merge "Update correct split task Id to RecentsTaskController..." into udc-dev am: d4464ea972 am: 33705ab79f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23599961

Change-Id: Ia2226884a218f921067d879d7d2a521dc9aa0e2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 12:58:58 +00:00
Wei Sheng Shih
33705ab79f Merge "Update correct split task Id to RecentsTaskController..." into udc-dev am: d4464ea972
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23599961

Change-Id: If402483e63d8b3ef82f80742b5e6d3199386b02d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 12:21:21 +00:00
Wei Sheng Shih
d4464ea972 Merge "Update correct split task Id to RecentsTaskController..." into udc-dev 2023-06-12 11:53:58 +00:00
Treehugger Robot
ba68063bbc Merge "Add self as OWNER for wm" am: 82e6aa3bd8 am: 2b8308903f am: 91fc7cec9c am: 94ab6edb7a am: d57916cdb6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2618496

Change-Id: Iba4d358fac4f192fb503a0dcebaa761b14695845
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 11:14:24 +00:00
Treehugger Robot
d57916cdb6 Merge "Add self as OWNER for wm" am: 82e6aa3bd8 am: 2b8308903f am: 91fc7cec9c am: 94ab6edb7a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2618496

Change-Id: I605e19c92a26fa328926d5cefccfbfad8d9d6e74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 10:37:15 +00:00
Treehugger Robot
94ab6edb7a Merge "Add self as OWNER for wm" am: 82e6aa3bd8 am: 2b8308903f am: 91fc7cec9c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2618496

Change-Id: Ieda99dabee70487aea357f5bb5c51683505ad0ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 09:54:29 +00:00
Treehugger Robot
91fc7cec9c Merge "Add self as OWNER for wm" am: 82e6aa3bd8 am: 2b8308903f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2618496

Change-Id: Ib9a190709bed831e212206d1dffe6b5fec40e7bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 09:07:29 +00:00
Candice Lo
1358e7e04f Merge "Update default values for capability and mode" into udc-qpr-dev am: 7e0bed1b38
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23628540

Change-Id: If9168c29cbe877c1c3c9cba6200c808637c070a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 08:44:16 +00:00
Wesley Wang
ffd4223c11 Merge "Update battery saver haptics mode" into udc-d1-dev am: 9dcfdf8e68 am: a3fd661898
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23631877

Change-Id: I9cfc5a9480efd0b5db0e4a77de8bc113944128dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 08:43:52 +00:00
Tony Huang
fab6a4a7ec Merge "Fix surface didn't fade out when dismiss" into udc-dev am: 7e387fc706 am: f2c45d55e8 am: 83ef9b4c1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23597525

Change-Id: I4cfa2473a0f1155db0bce12aa2813d7168c23c1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 08:43:15 +00:00
Wesley Wang
9fbcdb924a Merge "Update battery saver haptics mode" into udc-d1-dev am: 9dcfdf8e68 am: e9e08812d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23631877

Change-Id: I1b096a02c640e6450a2945746b20e6202cf0ba5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 08:39:28 +00:00
Jean Chalard
88a2d1040a Merge changes from topic "cherrypicker-L35800000961165098:N58500001377174291" into udc-dev-plus-aosp am: 938f3aa94b am: 395a8f7ce8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23634234

Change-Id: If318d7fa4af2cf64e52e1202937e000cea1e841b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 08:38:53 +00:00
Chalard Jean
7030fb1672 Remove unused methods from NetworkManagementService. am: 03d91162fc am: bbd8e9a68b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23634233

Change-Id: I2ed174dd0a5bbcb58b93d0b15d7775e6b7e77dff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 08:38:41 +00:00
Tony Huang
b650abd2c0 Merge "Fix surface didn't fade out when dismiss" into udc-dev am: 7e387fc706 am: 883d3d5534 am: 5961cc369c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23597525

Change-Id: Icf276a1bb64ca5da765097f1a53b8ff2b021a9b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 08:37:58 +00:00
Tony Huang
c283178901 Merge "Fix surface didn't fade out when dismiss" into udc-dev am: 7e387fc706 am: f2c45d55e8 am: 12868e4c4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23597525

Change-Id: Iedd113d0cd93b6507e935e51a1d58cf892e42a3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 08:37:45 +00:00
Treehugger Robot
2b8308903f Merge "Add self as OWNER for wm" am: 82e6aa3bd8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2618496

Change-Id: If262c77f978438831097945c242f85b0f3604022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 08:19:55 +00:00
Wesley Wang
e9e08812d4 Merge "Update battery saver haptics mode" into udc-d1-dev am: 9dcfdf8e68
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23631877

Change-Id: I0feeef1bf779b4123a50142e59cae410c1186212
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 08:17:05 +00:00
Candice Lo
7e0bed1b38 Merge "Update default values for capability and mode" into udc-qpr-dev 2023-06-12 08:01:58 +00:00
Jean Chalard
395a8f7ce8 Merge changes from topic "cherrypicker-L35800000961165098:N58500001377174291" into udc-dev-plus-aosp am: 938f3aa94b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23634234

Change-Id: Id6b7ca229df54407ce06d7be4a9ea0b935e4a91d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 08:01:56 +00:00
Chalard Jean
bbd8e9a68b Remove unused methods from NetworkManagementService. am: 03d91162fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23634233

Change-Id: Ieb7892548a07cf69c4c3642a7ffb683d869f5404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 08:01:51 +00:00
Tony Huang
5961cc369c Merge "Fix surface didn't fade out when dismiss" into udc-dev am: 7e387fc706 am: 883d3d5534
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23597525

Change-Id: Ib8bc9c7920dd89404abf6e981192990429f77414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 08:00:43 +00:00
Wesley Wang
a3fd661898 Merge "Update battery saver haptics mode" into udc-d1-dev am: 9dcfdf8e68
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23631877

Change-Id: I9631605e8ba7c83f8569a42e7ad4c8148a36f94a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 08:00:26 +00:00
Tony Huang
83ef9b4c1a Merge "Fix surface didn't fade out when dismiss" into udc-dev am: 7e387fc706 am: f2c45d55e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23597525

Change-Id: Ibaee9b8e0c723a0c6882b70c9f41ca665eabc7a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 08:00:17 +00:00
Wesley Wang
9dcfdf8e68 Merge "Update battery saver haptics mode" into udc-d1-dev 2023-06-12 07:58:23 +00:00
Tony Huang
12868e4c4a Merge "Fix surface didn't fade out when dismiss" into udc-dev am: 7e387fc706 am: f2c45d55e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23597525

Change-Id: I9133c030751465f4bcf3a38781d618961950ccbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 07:56:09 +00:00
Andreas Miko
f7521edda6 Merge "Fix multiple issues with DREAM => LOCKSCREEN transition" into udc-qpr-dev am: 6005ff6490
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23613302

Change-Id: I772b3e079fba25c4519e8dec035a2b57f6533561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 07:43:22 +00:00
Jean Chalard
938f3aa94b Merge changes from topic "cherrypicker-L35800000961165098:N58500001377174291" into udc-dev-plus-aosp
* changes:
  Remove the unused ITetheringStatsProvider.
  Remove unused methods from NetworkManagementService.
2023-06-12 07:35:22 +00:00
Treehugger Robot
82e6aa3bd8 Merge "Add self as OWNER for wm" 2023-06-12 07:30:42 +00:00
Tony Huang
f2c45d55e8 Merge "Fix surface didn't fade out when dismiss" into udc-dev am: 7e387fc706
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23597525

Change-Id: Ie16d5f7907590c0ee421b0cc395285d01ca24410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 07:18:30 +00:00
Tony Huang
883d3d5534 Merge "Fix surface didn't fade out when dismiss" into udc-dev am: 7e387fc706
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23597525

Change-Id: If31cf210429095d05e1253a188f82ab137fc4dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 07:13:58 +00:00
Andreas Miko
6005ff6490 Merge "Fix multiple issues with DREAM => LOCKSCREEN transition" into udc-qpr-dev 2023-06-12 06:53:55 +00:00
Tony Huang
7e387fc706 Merge "Fix surface didn't fade out when dismiss" into udc-dev 2023-06-12 06:39:24 +00:00
Jason Hsu
ea98d56027 Merge "Remove 'Audio output' feature for Android U" into udc-dev am: 228cc09545 am: cc77216572 am: a07ba1a908
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23599956

Change-Id: Ia28e1cf58a7d8f4857e5a8eb82ea9fc2daec9c2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 05:35:17 +00:00
Tony Huang
c7bfbf4901 Merge "Fix multiple divider when resize with rotate" into udc-dev am: a9025bc558 am: 8545c66a2c am: 28529d6347
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23589282

Change-Id: I23d1929f61da4d63777ba90c21e2e2384a719f21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 05:34:54 +00:00
Tony Huang
fdd0853b79 [automerger skipped] Merge "Make pip task could be enter split" into udc-dev am: 3b1ad3ebbc am: e814efcec0 -s ours am: 4e06ebcdef -s ours
am skip reason: Merged-In Iaf4f5e305ea8f46be786f0316b4f8a3d2a14c3e9 with SHA-1 7b133ffecd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23411356

Change-Id: I3fe201f55b90b7b000983b3e11846d7cc5ada6ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 05:34:40 +00:00
Treehugger Robot
e219aec177 [automerger skipped] Merge "[DO NOT MERGE]Revert "Edge click and drag using the trackpad shouldn't trigger back"" into udc-dev am: 6bdae608fc am: 4ff8b919d2 -s ours am: 4811946065 -s ours
am skip reason: Merged-In Id988517e115611161e8eb25f695a37631112338c with SHA-1 2939d1dedf is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23622757

Change-Id: I46fbfaea3e7a2bb63248ef506c99b87574a14321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 05:34:13 +00:00
Tracy Zhou
82af9f481b [automerger skipped] [DO NOT MERGE]Revert "Edge click and drag using the trackpad shouldn't trigger back" am: 59d2868944 am: a49cce02b9 -s ours am: 62b5869d12 -s ours
am skip reason: Merged-In Id988517e115611161e8eb25f695a37631112338c with SHA-1 2939d1dedf is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23622757

Change-Id: I6477e41904ba4987a715d93a10f11f753e43c8a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 05:34:05 +00:00
Jason Hsu
e95204c1f2 Merge "Remove 'Audio output' feature for Android U" into udc-dev am: 228cc09545 am: ed2ea94ffe am: ae13a3b922
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23599956

Change-Id: Id87fe2a4fca82c2d43ba74f7823c81ea55118f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 05:30:56 +00:00
Tony Huang
d42f6c0c3f Merge "Fix multiple divider when resize with rotate" into udc-dev am: a9025bc558 am: 82aa939db9 am: 1612319998
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23589282

Change-Id: Icb68a55a5b8dae61b370158ee929caf318a6c5b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 05:30:46 +00:00
Tony Huang
71cd060d5e [automerger skipped] Merge "Make pip task could be enter split" into udc-dev am: 3b1ad3ebbc am: 526dbe408b -s ours am: 2d43c0c8fd -s ours
am skip reason: Merged-In Iaf4f5e305ea8f46be786f0316b4f8a3d2a14c3e9 with SHA-1 a56a10c63f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23411356

Change-Id: Ie825188cd2c8aacc93d3f0eda541bb5cd75b41aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 05:30:35 +00:00
Treehugger Robot
e1cea0c33d [automerger skipped] Merge "[DO NOT MERGE]Revert "Edge click and drag using the trackpad shouldn't trigger back"" into udc-dev am: 6bdae608fc am: 0c3f17d600 am: 7ef8844c41 -s ours
am skip reason: Merged-In Id988517e115611161e8eb25f695a37631112338c with SHA-1 2939d1dedf is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23622757

Change-Id: Ic5c8b981ecce2955ac5c1f90311dd654fe7a4a30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 05:30:04 +00:00
Tracy Zhou
79981a38a3 [automerger skipped] [DO NOT MERGE]Revert "Edge click and drag using the trackpad shouldn't trigger back" am: 59d2868944 am: 5265ba9447 am: 348b33f6ac -s ours
am skip reason: Merged-In Id988517e115611161e8eb25f695a37631112338c with SHA-1 2939d1dedf is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23622757

Change-Id: Ic6a87275a517552006aea1cfb5d9c5100866f7ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 05:30:01 +00:00
Jason Hsu
2478f0122a Merge "Remove 'Audio output' feature for Android U" into udc-dev am: 228cc09545 am: cc77216572 am: 20b84e58db
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23599956

Change-Id: I5a33dab2b5f901451ed65cc46bdd1889b22e68e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 05:29:34 +00:00
Tony Huang
58c5b98a68 Merge "Fix multiple divider when resize with rotate" into udc-dev am: a9025bc558 am: 8545c66a2c am: f2a8b6d883
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23589282

Change-Id: I5154d5c0a841e2e0571c1152907c6ac3902d575a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 05:29:24 +00:00
Tony Huang
58ffe08530 [automerger skipped] Merge "Make pip task could be enter split" into udc-dev am: 3b1ad3ebbc am: e814efcec0 am: caac071deb -s ours
am skip reason: Merged-In Iaf4f5e305ea8f46be786f0316b4f8a3d2a14c3e9 with SHA-1 7b133ffecd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23411356

Change-Id: I559e332dd332eb598d66a92e89b1ebec72d9d15b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 05:29:10 +00:00
Treehugger Robot
7dca0ea315 [automerger skipped] Merge "[DO NOT MERGE]Revert "Edge click and drag using the trackpad shouldn't trigger back"" into udc-dev am: 6bdae608fc am: 4ff8b919d2 am: ec0bb4c7f7 -s ours
am skip reason: Merged-In Id988517e115611161e8eb25f695a37631112338c with SHA-1 2939d1dedf is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23622757

Change-Id: I8bd82d5b8ca4a4c8deac394c11acf5f1e7a35f26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 05:28:48 +00:00
Tracy Zhou
0e466cd757 [automerger skipped] [DO NOT MERGE]Revert "Edge click and drag using the trackpad shouldn't trigger back" am: 59d2868944 am: a49cce02b9 am: 8f4a6a70f2 -s ours
am skip reason: Merged-In Id988517e115611161e8eb25f695a37631112338c with SHA-1 2939d1dedf is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23622757

Change-Id: I4bbb1a8f581dc00772d6a391604e89bff5f44f63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 05:28:44 +00:00
Jason Hsu
ae13a3b922 Merge "Remove 'Audio output' feature for Android U" into udc-dev am: 228cc09545 am: ed2ea94ffe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23599956

Change-Id: I033d0525710493d0b1369446fb436d5d8e40048c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 04:53:09 +00:00
Tony Huang
1612319998 Merge "Fix multiple divider when resize with rotate" into udc-dev am: a9025bc558 am: 82aa939db9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23589282

Change-Id: Iafc52eb90b2c48c69b87810e21791d2dc6474a9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 04:52:51 +00:00