Aaron Liu
1e714f76ba
[automerger skipped] Merge "Set corner radius to 0 when casting" into tm-qpr-dev am: 162ed4af42 -s ours
...
am skip reason: Merged-In I76427c0064c9935c76e3ec8662d6b7955bcbfd2b with SHA-1 ae4dec818a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22935398
Change-Id: I633cdd3f2585da9fd3eea4c78f1811c971a1bf5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 15:48:50 +00:00
Aaron Liu
8762a5d65c
[automerger skipped] Set corner radius to 0 when casting am: ebf8503944 -s ours
...
am skip reason: Merged-In I76427c0064c9935c76e3ec8662d6b7955bcbfd2b with SHA-1 ae4dec818a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22935398
Change-Id: I4f036d3421c978463ab03646f63cb53d3dedff3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 15:48:38 +00:00
Ioana Alexandru
139934df8d
Merge changes from topic "presubmit-am-e981430fb42a480e9e40b7ef0b292a51" into sc-qpr1-dev am: 59aee8fbbb am: 0414c728e6 am: 27a94cf804 am: 0114dfd5ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22787457
Change-Id: Ic88346c3667d5797b3902fe0dfb934b599ef6493
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 15:47:54 +00:00
Automerger Merge Worker
1c5290f25c
Merge changes from topic "am-109f7458af5d41ceb727cd78287dfa75" into udc-dev
...
* changes:
[automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-v2-dev am: 04c42b8cbb -s ours am: 2fd58ff889 -s ours am: 538aed39e1 -s ours
[automerger skipped] Truncate ShortcutInfo Id am: fee62a33da -s ours am: 0a632feffc -s ours am: 865239dab8 -s ours
2023-05-04 15:47:39 +00:00
András Kurucz
84e0745483
[automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-v2-dev am: 04c42b8cbb -s ours am: 2fd58ff889 -s ours am: 538aed39e1 -s ours
...
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 d31fe58376 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22907463
Change-Id: I2df0175b29ffcf78918216ee458ffdc1a4f72724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 15:47:24 +00:00
Paul Duffin
ace02d1b28
[automerger skipped] Merge "Update PMService tests to use SDK version 10000" into tm-qpr-dev am: 47727334a1 -s ours
...
am skip reason: Merged-In I05081ef96c44dbf0cbedf585a2e13897712d080c with SHA-1 714d1f1b34 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23021530
Change-Id: I4a06e3fb6415ac72a352e76416486da653fddb28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 15:47:22 +00:00
Michael Groover
2e8db37ae8
[automerger skipped] Update PMService tests to use SDK version 10000 am: f5344f6c4e -s ours
...
am skip reason: Merged-In I05081ef96c44dbf0cbedf585a2e13897712d080c with SHA-1 714d1f1b34 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23021530
Change-Id: Icfef54e36b842cd1168203ba0cca19e40ca5d624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 15:47:10 +00:00
András Kurucz
d2e93be4be
[automerger skipped] Truncate ShortcutInfo Id am: fee62a33da -s ours am: 0a632feffc -s ours am: 865239dab8 -s ours
...
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 d31fe58376 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22907463
Change-Id: I49e6e3fc42db45af668b9357b07530d17048e0cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 15:47:08 +00:00
Siyamed Sinir
f59aed083d
Merge "Update ALT+DEL/FORWARD_DEL behavior" into udc-dev
2023-05-04 15:45:22 +00:00
Tony Huang
cf02b08d0e
Merge "Fix accident evict if drag same app to same position." into udc-dev
2023-05-04 15:40:05 +00:00
Treehugger Robot
8fd01cb739
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-04 15:29:30 +00:00
Kweku Adams
5f6ded25b5
Merge "Fix cumulative execution calculation." into udc-dev
2023-05-04 15:24:05 +00:00
Aaron Liu
162ed4af42
Merge "Set corner radius to 0 when casting" into tm-qpr-dev
2023-05-04 15:16:41 +00:00
Paul Duffin
47727334a1
Merge "Update PMService tests to use SDK version 10000" into tm-qpr-dev
2023-05-04 15:15:25 +00:00
Santiago Seifert
b48492686a
Merge "Add some extra TYPE constants" into udc-dev
2023-05-04 15:11:47 +00:00
Ioana Alexandru
0114dfd5ab
Merge changes from topic "presubmit-am-e981430fb42a480e9e40b7ef0b292a51" into sc-qpr1-dev am: 59aee8fbbb am: 0414c728e6 am: 27a94cf804
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22787457
Change-Id: I1ddf3e17c93280a417f8bd16a9d2640acfe7357c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 15:06:44 +00:00
András Kurucz
538aed39e1
[automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-v2-dev am: 04c42b8cbb -s ours am: 2fd58ff889 -s ours
...
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 d31fe58376 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22907463
Change-Id: Id6bb46826074aa2a3f34352f4a1a7c370763be1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 15:06:27 +00:00
András Kurucz
865239dab8
[automerger skipped] Truncate ShortcutInfo Id am: fee62a33da -s ours am: 0a632feffc -s ours
...
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 d31fe58376 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22907463
Change-Id: I75b76527da9f71caf71e27ebe2a37d8195cb7e2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 15:06:23 +00:00
Mady Mellor
36e121d425
Merge "Make the task remove a wct" into udc-dev
2023-05-04 14:58:56 +00:00
Seth Moore
d1b1115b80
Merge "Use IBinder to compare callbacks in remote provisioning service" into udc-dev
2023-05-04 14:57:05 +00:00
Ioana Alexandru
2ce407b164
[automerger skipped] DO NOT MERGE Increase notification channel limit. am: 5664378a7c am: 022550d586 -s ours am: d7e5354147 -s ours am: 206c83c4fe -s ours am: 32d2fb5b7a -s ours am: b385c4548e -s ours am: a43fbe7808 -s ours am: 230d0cc925 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22931456
Change-Id: I569f55688e87327ed110d25cade788659de4ebf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 14:22:25 +00:00
Ioana Alexandru
a2faf3d151
[automerger skipped] DO NOT MERGE Increase notification channel limit. am: de7c43eb60 -s ours am: 55fbfb391d -s ours am: e1ca6ae90d -s ours am: b9f7e703e9 -s ours am: bdfb599a98 -s ours am: 39ca736fb9 -s ours am: f6413e322c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22931416
Change-Id: I4b3973cdecf6bcf0ba4864cd8212f70f212b0447
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 14:22:03 +00:00
Ioana Alexandru
27a94cf804
Merge changes from topic "presubmit-am-e981430fb42a480e9e40b7ef0b292a51" into sc-qpr1-dev am: 59aee8fbbb am: 0414c728e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22787457
Change-Id: If4a5ad7848cce614ff27a76521692a828c9fdfdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 14:22:00 +00:00
András Kurucz
2fd58ff889
[automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-v2-dev am: 04c42b8cbb -s ours
...
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 d31fe58376 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22907463
Change-Id: I724c8bf5b84f55265609cf5f38f92baa4e499143
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 14:20:44 +00:00
András Kurucz
0a632feffc
[automerger skipped] Truncate ShortcutInfo Id am: fee62a33da -s ours
...
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 d31fe58376 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22907463
Change-Id: I7ccc9d6719495c22a2c31d6f92c477004b9e2ac1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 14:20:26 +00:00
Ioana Alexandru
0414c728e6
Merge changes from topic "presubmit-am-e981430fb42a480e9e40b7ef0b292a51" into sc-qpr1-dev am: 59aee8fbbb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22787457
Change-Id: I797eb947d37c9e339b64a5dfb13b2ab96cf96b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 14:04:18 +00:00
András Kurucz
04c42b8cbb
Merge "Truncate ShortcutInfo Id" into sc-v2-dev
2023-05-04 13:46:45 +00:00
Ioana Alexandru
230d0cc925
[automerger skipped] DO NOT MERGE Increase notification channel limit. am: 5664378a7c am: 022550d586 -s ours am: d7e5354147 -s ours am: 206c83c4fe -s ours am: 32d2fb5b7a -s ours am: b385c4548e -s ours am: a43fbe7808 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22931456
Change-Id: I311721837a9c36e9564e0d9307e92b252c6bcc3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 13:43:16 +00:00
Ioana Alexandru
f6413e322c
[automerger skipped] DO NOT MERGE Increase notification channel limit. am: de7c43eb60 -s ours am: 55fbfb391d -s ours am: e1ca6ae90d -s ours am: b9f7e703e9 -s ours am: bdfb599a98 -s ours am: 39ca736fb9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22931416
Change-Id: I7090461e5ab79b0ce1bd6e79ca15202144701ec2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 13:43:07 +00:00
Ioana Alexandru
b45aeda1d0
[automerger skipped] DO NOT MERGE Increase notification channel limit. am: 5664378a7c am: 022550d586 -s ours am: d7e5354147 -s ours am: 206c83c4fe -s ours am: 32d2fb5b7a -s ours am: b385c4548e -s ours am: 67f9f1fda1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22931456
Change-Id: Id05cc2d8f3a8935f272dcb51071869762eeb8586
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 13:41:14 +00:00
Automerger Merge Worker
3e1928ca21
Merge "[automerger skipped] DO NOT MERGE Increase notification channel limit. am: de7c43eb60 -s ours am: 55fbfb391d -s ours am: e1ca6ae90d -s ours am: b9f7e703e9 -s ours am: bdfb599a98 -s ours am: 28171a11b3 -s ours" into udc-dev
2023-05-04 13:41:09 +00:00
Hawkwood Glazier
2e2e1ca600
Merge "Do not proguard com.android.systemui.log" into udc-dev
2023-05-04 13:40:37 +00:00
Ioana Alexandru
8a4bdcabc4
[automerger skipped] DO NOT MERGE Increase notification channel limit. am: de7c43eb60 -s ours am: 55fbfb391d -s ours am: e1ca6ae90d -s ours am: b9f7e703e9 -s ours am: bdfb599a98 -s ours am: 28171a11b3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22931416
Change-Id: I38b07a423ebe551430f5fd010537f8f913555658
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 13:40:35 +00:00
Kholoud Mohamed
0b4502f91f
Merge "Migrate personal apps suspension to policy engine" into udc-dev
2023-05-04 13:39:11 +00:00
Santiago Seifert
995f23af0f
Add some extra TYPE constants
...
Bug: 278728942
Test: m
Test: lunch sdk-eng && m -j 8 ds-docs-switched
Change-Id: I5f9c7bd9eeaf6297bae772aed4955bdcfb0be126
2023-05-04 13:34:26 +00:00
Jerry Chang
026f32962a
Merge "Keep splitting tasks in the background with shell transition" into udc-dev
2023-05-04 13:34:17 +00:00
Ioana Alexandru
59aee8fbbb
Merge changes from topic "presubmit-am-e981430fb42a480e9e40b7ef0b292a51" into sc-qpr1-dev
...
* changes:
[automerge] Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS. 2p: 43b1711332
Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS.
2023-05-04 13:18:36 +00:00
Tony Huang
322d69469c
Merge "Send divider change to launcher to animate" into udc-dev
2023-05-04 13:02:52 +00:00
Ioana Alexandru
a43fbe7808
[automerger skipped] DO NOT MERGE Increase notification channel limit. am: 5664378a7c am: 022550d586 -s ours am: d7e5354147 -s ours am: 206c83c4fe -s ours am: 32d2fb5b7a -s ours am: b385c4548e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22931456
Change-Id: I2952034738efd43c7561836ab48345aeda9a5360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 13:01:32 +00:00
Treehugger Robot
5f3cda92f6
Merge "Send HOME Intent for the main display of the visibule user, with the visible userId." into udc-dev
2023-05-04 13:01:23 +00:00
Ioana Alexandru
39ca736fb9
[automerger skipped] DO NOT MERGE Increase notification channel limit. am: de7c43eb60 -s ours am: 55fbfb391d -s ours am: e1ca6ae90d -s ours am: b9f7e703e9 -s ours am: bdfb599a98 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22931416
Change-Id: I4eb239807d65afe5e43310f311eadb24d5eb5e34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 13:01:11 +00:00
Ioana Alexandru
67f9f1fda1
[automerger skipped] DO NOT MERGE Increase notification channel limit. am: 5664378a7c am: 022550d586 -s ours am: d7e5354147 -s ours am: 206c83c4fe -s ours am: 32d2fb5b7a -s ours am: b385c4548e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22931456
Change-Id: Ifa24ed55b491817cfc92a025b1ce82029e478cbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 13:00:30 +00:00
Ioana Alexandru
28171a11b3
[automerger skipped] DO NOT MERGE Increase notification channel limit. am: de7c43eb60 -s ours am: 55fbfb391d -s ours am: e1ca6ae90d -s ours am: b9f7e703e9 -s ours am: bdfb599a98 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22931416
Change-Id: I97b71ddb7e411e1a2fb38788ec274a8e5fde16e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 13:00:15 +00:00
Treehugger Robot
3820c510f4
Merge "Remove zoom from app clips." into udc-dev
2023-05-04 12:42:49 +00:00
Ioana Alexandru
b385c4548e
[automerger skipped] DO NOT MERGE Increase notification channel limit. am: 5664378a7c am: 022550d586 -s ours am: d7e5354147 -s ours am: 206c83c4fe -s ours am: 32d2fb5b7a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22931456
Change-Id: I58c780405ff92ff53cc853e5f8a64ce2e77be664
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 12:15:07 +00:00
Ioana Alexandru
bdfb599a98
[automerger skipped] DO NOT MERGE Increase notification channel limit. am: de7c43eb60 -s ours am: 55fbfb391d -s ours am: e1ca6ae90d -s ours am: b9f7e703e9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22931416
Change-Id: Iaecb51a665c61685ec0831c56eeeb4aa2f4acd41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 12:14:47 +00:00
Ioana Alexandru
32d2fb5b7a
[automerger skipped] DO NOT MERGE Increase notification channel limit. am: 5664378a7c am: 022550d586 -s ours am: d7e5354147 -s ours am: 206c83c4fe -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22931456
Change-Id: I3b18ea6022ef38fea48c24f096faf8f7f6730797
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 11:37:42 +00:00
Ioana Alexandru
b9f7e703e9
[automerger skipped] DO NOT MERGE Increase notification channel limit. am: de7c43eb60 -s ours am: 55fbfb391d -s ours am: e1ca6ae90d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22931416
Change-Id: I28f1e3971382768842f4aa91c8b7343e0c5e5a6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 11:37:29 +00:00
Avinash Vadlamudi
9651d0bbf1
Merge "[Platform Scanner]: Update the icon of the qr scanner" into udc-dev
2023-05-04 11:31:03 +00:00
TreeHugger Robot
5cef355a78
Merge "Add test API for phone call state" into udc-dev
2023-05-04 11:26:16 +00:00