Commit Graph

690370 Commits

Author SHA1 Message Date
Automerger Merge Worker
0844d577ed Merge changes from topic "am-8db26f97255a47d789da3cac64a835f3" into sc-v2-dev-plus-aosp
* changes:
  [automerger skipped] Merge "DO NOT MERGE Add an OEM configurable limit for zen rules" into qt-dev am: 81f051eff4 am: 14dec12d60 -s ours am: 112d4908aa -s ours am: 9b1a9dc79f -s ours am: 2f0fb97c95 -s ours am: 1c322c87dc -s ours am: ce0c044b09 -s ours
  [automerger skipped] DO NOT MERGE Add an OEM configurable limit for zen rules am: 3072d98c2d am: db048de08d -s ours am: 31ea70be4d -s ours am: 8ed03bc2bb -s ours am: 098f855189 -s ours am: 1fdb7c8a2f -s ours am: dec064097a -s ours
2022-03-23 00:04:53 +00:00
TreeHugger Robot
c78bd96967 [automerger skipped] Merge "DO NOT MERGE Add an OEM configurable limit for zen rules" into qt-dev am: 81f051eff4 am: 14dec12d60 -s ours am: 112d4908aa -s ours am: 9b1a9dc79f -s ours am: 2f0fb97c95 -s ours am: 1c322c87dc -s ours am: ce0c044b09 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibeac90cf8b485bb3ffd86b491fe6f793adfbae24
2022-03-23 00:04:44 +00:00
Julia Reynolds
52c18e04b3 [automerger skipped] DO NOT MERGE Add an OEM configurable limit for zen rules am: 3072d98c2d am: db048de08d -s ours am: 31ea70be4d -s ours am: 8ed03bc2bb -s ours am: 098f855189 -s ours am: 1fdb7c8a2f -s ours am: dec064097a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9f7b6ac2edcf986af10a8a5a7ded6f138c39bb45
2022-03-23 00:04:37 +00:00
Automerger Merge Worker
e40726fdc8 Merge "[automerger skipped] RESTRICT AUTOMERGE Read flag resource overrides. am: 6e1571579e -s ours" am: feed8c99a7 -s ours am: ca1c4e5073 -s ours
am skip reason: Merged-In I40eb02d73faa4c2476d2a4e136e08c6dcd7795a2 with SHA-1 e392af2817 is already in history

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

Change-Id: I34adf2fd5f8537ec667566eb6a10c62241673eb7
2022-03-23 00:04:35 +00:00
Dave Mankoff
1a8e3562d3 [automerger skipped] RESTRICT AUTOMERGE Read flag resource overrides. am: 6e1571579e -s ours am: 9f889e0584 -s ours am: 8b1f746160 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1a7c8e690fb5dc5537b4dc2f2cbf92d073d5afca
2022-03-23 00:04:12 +00:00
Automerger Merge Worker
3d8dffb5f2 Merge "[automerger skipped] Letterbox apps in multi-window if resizeable only due to supportsPictureInPicture. am: 417fd4d17e -s ours" am: 391569fd69 -s ours am: 3f56c5292a -s ours
am skip reason: Merged-In I664742b033ad49a77ae21b28c7ade4011d123c74 with SHA-1 5e7baf6324 is already in history

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

Change-Id: I493a1ba708e14f63a3b61f493b73f5def1d01b7d
2022-03-23 00:03:56 +00:00
Mariia Sandrikova
036e45e8a3 [automerger skipped] Letterbox apps in multi-window if resizeable only due to supportsPictureInPicture. am: 417fd4d17e -s ours am: d5270cf8a9 -s ours am: 5ee0dd7e52 -s ours
am skip reason: Merged-In I664742b033ad49a77ae21b28c7ade4011d123c74 with SHA-1 5e7baf6324 is already in history

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

Change-Id: I1ce810566cd8e4ab46b77f938068d39571aeb8d4
2022-03-23 00:03:46 +00:00
Automerger Merge Worker
f5f6e05f8b Merge "[automerger skipped] Fix IME flicker by dispatching unrelated insets after unset IME frozen am: 83c396e9e7 -s ours" am: 2230c3691a -s ours am: 87e9ffaf62 -s ours
am skip reason: Merged-In I95c5b45bd4cf9c30ff7771b2db485c8ae2b0c6db with SHA-1 be42921e05 is already in history

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

Change-Id: I209ca77250f7f83912fc9756c6f2514ef26f839c
2022-03-23 00:03:27 +00:00
Ming-Shin Lu
8d05655561 [automerger skipped] Fix IME flicker by dispatching unrelated insets after unset IME frozen am: 83c396e9e7 -s ours am: 6aef8318b9 -s ours am: 3d48e3c6d5 -s ours
am skip reason: Merged-In I95c5b45bd4cf9c30ff7771b2db485c8ae2b0c6db with SHA-1 be42921e05 is already in history

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

Change-Id: Ib1029f02983ec85139ff70732da697fa181431a7
2022-03-23 00:03:17 +00:00
Automerger Merge Worker
ea45ac7ede Merge "[automerger skipped] Revert "Decode the input of both setStream and setResource calls first" am: ade248a9bc -s ours" am: 3568a7a8c5 -s ours am: b4cced1f88 -s ours
am skip reason: Merged-In I9c401b4cbded8753fc89df25a2c4f88a2fe72087 with SHA-1 ac8151be84 is already in history

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

Change-Id: I5b4944dc5cb7d71b13117b2099b841fd247d772e
2022-03-23 00:02:48 +00:00
Wu Ahan
39fead479c [automerger skipped] Revert "Decode the input of both setStream and setResource calls first" am: ade248a9bc -s ours am: cf9fb94485 -s ours am: 9ee9ac6fe5 -s ours
am skip reason: Merged-In I9c401b4cbded8753fc89df25a2c4f88a2fe72087 with SHA-1 ac8151be84 is already in history

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

Change-Id: I19eac0d4bb0947b7d97f76120f2bfcaa72b217a1
2022-03-23 00:02:24 +00:00
Automerger Merge Worker
3f3185a2fa Merge "[automerger skipped] Enable nested scrolling for locale picker am: 589f88b9a9 -s ours" am: 9b8871acdd -s ours am: 3bf3e5c885 -s ours
am skip reason: Merged-In Iaf90211da640cd265fc2b23dd34b3149c4406891 with SHA-1 7f4b8b1784 is already in history

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

Change-Id: Idbad2305cd767c60f4ea64a4ed9ed7bad613ad11
2022-03-23 00:02:06 +00:00
Mill Chen
59e2ad1bd5 [automerger skipped] Enable nested scrolling for locale picker am: 589f88b9a9 -s ours am: e605577eed -s ours am: e7d923d28a -s ours
am skip reason: Merged-In Iaf90211da640cd265fc2b23dd34b3149c4406891 with SHA-1 7f4b8b1784 is already in history

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

Change-Id: Ie53539bf03a17ec45a4ed868931b1234b553db40
2022-03-23 00:02:02 +00:00
Automerger Merge Worker
85fcb1ceee Merge "[automerger skipped] Change window type of Media Projection dialog am: e86dacf6ea -s ours" am: 23f7860c1c -s ours am: c538f21239 -s ours
am skip reason: Merged-In I937678a5d8ee91902c324aa063e48610de7b0f74 with SHA-1 467b282eae is already in history

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

Change-Id: I4c11eefb105adc8b255fa572709c421f66dc1722
2022-03-23 00:01:40 +00:00
Fabian Kozynski
7413273c96 [automerger skipped] Change window type of Media Projection dialog am: e86dacf6ea -s ours am: bad346a5e4 -s ours am: a310fd3f0f -s ours
am skip reason: Merged-In I937678a5d8ee91902c324aa063e48610de7b0f74 with SHA-1 467b282eae is already in history

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

Change-Id: I77745711a0b751a1c06b2a07391a055621ea6516
2022-03-23 00:01:29 +00:00
Automerger Merge Worker
6d9d17bf65 Merge "[automerger skipped] Fix leakage of DisplayContent referenced from TransitionController am: 6c04f9b6da -s ours" am: f1710ab1ad -s ours am: 0f20fbf037 -s ours
am skip reason: Merged-In I44e2a794981fc114ada0ce98cd2471adf623d856 with SHA-1 c3eaf66225 is already in history

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

Change-Id: I57b108b78de471a78a7e4cbdcb180ba1d3347543
2022-03-23 00:01:09 +00:00
Riddle Hsu
1144176e42 [automerger skipped] Fix leakage of DisplayContent referenced from TransitionController am: 6c04f9b6da -s ours am: e993518ad0 -s ours am: 4a65ab8192 -s ours
am skip reason: Merged-In I44e2a794981fc114ada0ce98cd2471adf623d856 with SHA-1 c3eaf66225 is already in history

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

Change-Id: Iab94d3add6c6a20afb0fcdae9ac18f4a21ca3a62
2022-03-23 00:01:05 +00:00
Automerger Merge Worker
730b3cca8a Merge "[automerger skipped] [Provider Model] Fix the overlap when changing the font/display size am: 941c4a4af0 -s ours" am: 53afae201c -s ours am: b501a1bac3 -s ours
am skip reason: Merged-In I10032a866ee05030070b40076fa946c3e73e0d56 with SHA-1 10925e6bf5 is already in history

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

Change-Id: Idbcb2ce53c4f1ece9e073dfe04dc2f29c4d1ff68
2022-03-23 00:00:38 +00:00
Zoey Chen
993e2ec4e4 [automerger skipped] [Provider Model] Fix the overlap when changing the font/display size am: 941c4a4af0 -s ours am: 1df9c88a0b -s ours am: aee77bdcba -s ours
am skip reason: Merged-In I10032a866ee05030070b40076fa946c3e73e0d56 with SHA-1 10925e6bf5 is already in history

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

Change-Id: Idaf9f1fb66ef6f1688e7b2368ca116c5f344a240
2022-03-23 00:00:27 +00:00
Treehugger Robot
93115dcac1 Merge "Introduce mutable parcelable request to open/close logical channel" am: 3059d36148 am: d29e996cb9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2037108

Change-Id: Id3fc62cdbd548241e6d98d9ad7166659e87ef1f3
2022-03-22 23:59:17 +00:00
Automerger Merge Worker
ca1c4e5073 Merge "[automerger skipped] RESTRICT AUTOMERGE Read flag resource overrides. am: 6e1571579e -s ours" am: feed8c99a7 -s ours
am skip reason: Merged-In I40eb02d73faa4c2476d2a4e136e08c6dcd7795a2 with SHA-1 e392af2817 is already in history

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

Change-Id: I715370ba7e95de49d8be2af556fe98fc2de51bd1
2022-03-22 23:47:32 +00:00
Dave Mankoff
8b1f746160 [automerger skipped] RESTRICT AUTOMERGE Read flag resource overrides. am: 6e1571579e -s ours am: 9f889e0584 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0f9dd192e56e857825538b3b414bba56a73c16d5
2022-03-22 23:47:31 +00:00
Automerger Merge Worker
3f56c5292a Merge "[automerger skipped] Letterbox apps in multi-window if resizeable only due to supportsPictureInPicture. am: 417fd4d17e -s ours" am: 391569fd69 -s ours
am skip reason: Merged-In I664742b033ad49a77ae21b28c7ade4011d123c74 with SHA-1 5e7baf6324 is already in history

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

Change-Id: Id1c89e4e4bb17ea83d35585ce83129648991a584
2022-03-22 23:46:47 +00:00
Mariia Sandrikova
5ee0dd7e52 [automerger skipped] Letterbox apps in multi-window if resizeable only due to supportsPictureInPicture. am: 417fd4d17e -s ours am: d5270cf8a9 -s ours
am skip reason: Merged-In I664742b033ad49a77ae21b28c7ade4011d123c74 with SHA-1 5e7baf6324 is already in history

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

Change-Id: I446b50504e65a226df97e658a8dd4859286118f2
2022-03-22 23:46:46 +00:00
Automerger Merge Worker
87e9ffaf62 Merge "[automerger skipped] Fix IME flicker by dispatching unrelated insets after unset IME frozen am: 83c396e9e7 -s ours" am: 2230c3691a -s ours
am skip reason: Merged-In I95c5b45bd4cf9c30ff7771b2db485c8ae2b0c6db with SHA-1 be42921e05 is already in history

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

Change-Id: Ie7442f57d52c849e3213908d20be2c7ddea45aa9
2022-03-22 23:46:10 +00:00
Ming-Shin Lu
3d48e3c6d5 [automerger skipped] Fix IME flicker by dispatching unrelated insets after unset IME frozen am: 83c396e9e7 -s ours am: 6aef8318b9 -s ours
am skip reason: Merged-In I95c5b45bd4cf9c30ff7771b2db485c8ae2b0c6db with SHA-1 be42921e05 is already in history

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

Change-Id: If32e3c9f2381ad0f51b8dc43db7fe94b54188fdc
2022-03-22 23:46:08 +00:00
Automerger Merge Worker
b4cced1f88 Merge "[automerger skipped] Revert "Decode the input of both setStream and setResource calls first" am: ade248a9bc -s ours" am: 3568a7a8c5 -s ours
am skip reason: Merged-In I9c401b4cbded8753fc89df25a2c4f88a2fe72087 with SHA-1 ac8151be84 is already in history

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

Change-Id: If74afcec8021705a06071e5ac42f761a63a46974
2022-03-22 23:45:31 +00:00
Wu Ahan
9ee9ac6fe5 [automerger skipped] Revert "Decode the input of both setStream and setResource calls first" am: ade248a9bc -s ours am: cf9fb94485 -s ours
am skip reason: Merged-In I9c401b4cbded8753fc89df25a2c4f88a2fe72087 with SHA-1 ac8151be84 is already in history

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

Change-Id: Ic073dc0b8d979259e37b51a09b39766c7be0ce35
2022-03-22 23:45:21 +00:00
Automerger Merge Worker
3bf3e5c885 Merge "[automerger skipped] Enable nested scrolling for locale picker am: 589f88b9a9 -s ours" am: 9b8871acdd -s ours
am skip reason: Merged-In Iaf90211da640cd265fc2b23dd34b3149c4406891 with SHA-1 7f4b8b1784 is already in history

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

Change-Id: I7a3ffae0323b4f0d1eff7fd88ad574040866338f
2022-03-22 23:44:46 +00:00
Mill Chen
e7d923d28a [automerger skipped] Enable nested scrolling for locale picker am: 589f88b9a9 -s ours am: e605577eed -s ours
am skip reason: Merged-In Iaf90211da640cd265fc2b23dd34b3149c4406891 with SHA-1 7f4b8b1784 is already in history

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

Change-Id: Ie5c4e686fe722ffd2064aba30d477dedfcae1155
2022-03-22 23:44:45 +00:00
Automerger Merge Worker
c538f21239 Merge "[automerger skipped] Change window type of Media Projection dialog am: e86dacf6ea -s ours" am: 23f7860c1c -s ours
am skip reason: Merged-In I937678a5d8ee91902c324aa063e48610de7b0f74 with SHA-1 467b282eae is already in history

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

Change-Id: I37cde6dca77617c6f7d00456e56dc6fb070d2c9b
2022-03-22 23:44:16 +00:00
Fabian Kozynski
a310fd3f0f [automerger skipped] Change window type of Media Projection dialog am: e86dacf6ea -s ours am: bad346a5e4 -s ours
am skip reason: Merged-In I937678a5d8ee91902c324aa063e48610de7b0f74 with SHA-1 467b282eae is already in history

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

Change-Id: I114a22b226f6219b98d502ab48f5c6b6f8701617
2022-03-22 23:44:14 +00:00
Automerger Merge Worker
0f20fbf037 Merge "[automerger skipped] Fix leakage of DisplayContent referenced from TransitionController am: 6c04f9b6da -s ours" am: f1710ab1ad -s ours
am skip reason: Merged-In I44e2a794981fc114ada0ce98cd2471adf623d856 with SHA-1 c3eaf66225 is already in history

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

Change-Id: I8f83f5f8dfcd47e86ef34a3aed9e33467bbf1fa6
2022-03-22 23:43:39 +00:00
Riddle Hsu
4a65ab8192 [automerger skipped] Fix leakage of DisplayContent referenced from TransitionController am: 6c04f9b6da -s ours am: e993518ad0 -s ours
am skip reason: Merged-In I44e2a794981fc114ada0ce98cd2471adf623d856 with SHA-1 c3eaf66225 is already in history

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

Change-Id: I65abcfbeb22e21f025cbbf670564e5adde391b5b
2022-03-22 23:43:32 +00:00
TreeHugger Robot
ce0c044b09 [automerger skipped] Merge "DO NOT MERGE Add an OEM configurable limit for zen rules" into qt-dev am: 81f051eff4 am: 14dec12d60 -s ours am: 112d4908aa -s ours am: 9b1a9dc79f -s ours am: 2f0fb97c95 -s ours am: 1c322c87dc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ida3b33f4dea13e329d14d8b75f1f27432c6d58cc
2022-03-22 23:42:18 +00:00
Julia Reynolds
dec064097a [automerger skipped] DO NOT MERGE Add an OEM configurable limit for zen rules am: 3072d98c2d am: db048de08d -s ours am: 31ea70be4d -s ours am: 8ed03bc2bb -s ours am: 098f855189 -s ours am: 1fdb7c8a2f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2b1d9eeef1acc4d673f2bb86ccf4c958b4ab57ec
2022-03-22 23:42:11 +00:00
Automerger Merge Worker
b501a1bac3 Merge "[automerger skipped] [Provider Model] Fix the overlap when changing the font/display size am: 941c4a4af0 -s ours" am: 53afae201c -s ours
am skip reason: Merged-In I10032a866ee05030070b40076fa946c3e73e0d56 with SHA-1 10925e6bf5 is already in history

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

Change-Id: I78ac5e3a80f31f5964a370ae53dbc9d7d139c8c2
2022-03-22 23:41:24 +00:00
Zoey Chen
aee77bdcba [automerger skipped] [Provider Model] Fix the overlap when changing the font/display size am: 941c4a4af0 -s ours am: 1df9c88a0b -s ours
am skip reason: Merged-In I10032a866ee05030070b40076fa946c3e73e0d56 with SHA-1 10925e6bf5 is already in history

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

Change-Id: I8c8ed373d337ba6bbcb14de7df1bfc662ebebbfb
2022-03-22 23:41:19 +00:00
Treehugger Robot
d29e996cb9 Merge "Introduce mutable parcelable request to open/close logical channel" am: 3059d36148
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2037108

Change-Id: I80a0a926e396650fce2113f50e1e2031c81c3e9f
2022-03-22 23:35:32 +00:00
Automerger Merge Worker
feed8c99a7 Merge "[automerger skipped] RESTRICT AUTOMERGE Read flag resource overrides. am: 6e1571579e -s ours" 2022-03-22 23:24:19 +00:00
Dave Mankoff
9f889e0584 [automerger skipped] RESTRICT AUTOMERGE Read flag resource overrides. am: 6e1571579e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia946c8d88aabe30d6c44c6113533e2f21075d433
2022-03-22 23:24:11 +00:00
Automerger Merge Worker
391569fd69 Merge "[automerger skipped] Letterbox apps in multi-window if resizeable only due to supportsPictureInPicture. am: 417fd4d17e -s ours" 2022-03-22 23:23:57 +00:00
Mariia Sandrikova
d5270cf8a9 [automerger skipped] Letterbox apps in multi-window if resizeable only due to supportsPictureInPicture. am: 417fd4d17e -s ours
am skip reason: Merged-In I664742b033ad49a77ae21b28c7ade4011d123c74 with SHA-1 5e7baf6324 is already in history

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

Change-Id: I9fb5a025095d285549cf7c8511cc4d16eb7feeb4
2022-03-22 23:23:49 +00:00
Automerger Merge Worker
2230c3691a Merge "[automerger skipped] Fix IME flicker by dispatching unrelated insets after unset IME frozen am: 83c396e9e7 -s ours" 2022-03-22 23:23:34 +00:00
Ming-Shin Lu
6aef8318b9 [automerger skipped] Fix IME flicker by dispatching unrelated insets after unset IME frozen am: 83c396e9e7 -s ours
am skip reason: Merged-In I95c5b45bd4cf9c30ff7771b2db485c8ae2b0c6db with SHA-1 be42921e05 is already in history

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

Change-Id: Icc85a6c4e90f48be20abcd61c2ca3ed0291f7e4c
2022-03-22 23:23:27 +00:00
Automerger Merge Worker
3568a7a8c5 Merge "[automerger skipped] Revert "Decode the input of both setStream and setResource calls first" am: ade248a9bc -s ours" 2022-03-22 23:23:16 +00:00
Wu Ahan
cf9fb94485 [automerger skipped] Revert "Decode the input of both setStream and setResource calls first" am: ade248a9bc -s ours
am skip reason: Merged-In I9c401b4cbded8753fc89df25a2c4f88a2fe72087 with SHA-1 ac8151be84 is already in history

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

Change-Id: I2bab7068bfee8592bcb23e26bf1ad66070b0c33e
2022-03-22 23:23:08 +00:00
Automerger Merge Worker
9b8871acdd Merge "[automerger skipped] Enable nested scrolling for locale picker am: 589f88b9a9 -s ours" 2022-03-22 23:22:50 +00:00
Mill Chen
e605577eed [automerger skipped] Enable nested scrolling for locale picker am: 589f88b9a9 -s ours
am skip reason: Merged-In Iaf90211da640cd265fc2b23dd34b3149c4406891 with SHA-1 7f4b8b1784 is already in history

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

Change-Id: I90cb045b73c25383035d2ba2aa0406e5fb8940ec
2022-03-22 23:22:43 +00:00
Automerger Merge Worker
23f7860c1c Merge "[automerger skipped] Change window type of Media Projection dialog am: e86dacf6ea -s ours" 2022-03-22 23:22:28 +00:00