Commit Graph

654180 Commits

Author SHA1 Message Date
Dave Mankoff
a920a2ea1c [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours am: 6db47d2d58 -s ours am: 804799ae8a -s ours am: dab8365333 -s ours am: 826e38be42 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history

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

Change-Id: I67f18ba21957844b2b63c45c61aa67feb37b0bfe
2021-08-10 20:19:11 +00:00
TreeHugger Robot
1adecd0740 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 5f7ad43cdf -s ours am: fcd7401cfd -s ours
am skip reason: subject contains skip directive

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

Change-Id: If69380b301fc9e1b0a369e2a72f8266560897007
2021-08-10 20:19:11 +00:00
Dave Mankoff
86ed339ccc [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours am: be89b2aa43 -s ours am: 4bd029298a -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history

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

Change-Id: I9ddd5adc7570c763285c99c673de221d912bbc38
2021-08-10 20:19:06 +00:00
TreeHugger Robot
817a17b203 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 40cb9ed9c1 -s ours am: 2e95d0be8c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I282ab9baf3fd1b30bfd5f6db270e92866b6757a6
2021-08-10 20:19:01 +00:00
Dave Mankoff
6025909575 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours am: 6db47d2d58 -s ours am: 804799ae8a -s ours am: dab8365333 -s ours am: 826e38be42 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history

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

Change-Id: I059aeaa1f2b8dc4db3af5dd0fdddde12b29adae1
2021-08-10 20:18:48 +00:00
Dave Mankoff
edb8eab9eb [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours am: be89b2aa43 -s ours am: 4bd029298a -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history

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

Change-Id: Iaba24bc4c04a8e675f1c5300288423fb10c0729d
2021-08-10 20:18:25 +00:00
Dave Mankoff
642240ef30 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours am: 6db47d2d58 -s ours am: 804799ae8a -s ours am: da9baed374 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history

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

Change-Id: If4dcbe01a5eacf2377fe25aecd908fb16dd54ca8
2021-08-10 20:15:43 +00:00
Dave Mankoff
49ee68690f [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours am: 4b8f7a7991 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history

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

Change-Id: I7db06a50bfe7ac974fc07714ae46d243ee64f8e6
2021-08-10 20:15:29 +00:00
TreeHugger Robot
785ec227e5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 262de4fb4f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic4f62ce35190b8d7e10de407d38f1bed1cd5e8d1
2021-08-10 20:15:01 +00:00
TreeHugger Robot
fcd7401cfd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 5f7ad43cdf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9c1713135dcd37c589bbe24150dbed690ff5cbfb
2021-08-10 20:14:38 +00:00
TreeHugger Robot
2e95d0be8c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 40cb9ed9c1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ice118db3b140053137bc8ea0117f20ac891e3227
2021-08-10 20:13:59 +00:00
Dave Mankoff
826e38be42 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours am: 6db47d2d58 -s ours am: 804799ae8a -s ours am: dab8365333 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history

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

Change-Id: Iedefd042d0ced95d7d2da35cfb351949cae13e25
2021-08-10 20:03:52 +00:00
Dave Mankoff
4bd029298a [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours am: be89b2aa43 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history

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

Change-Id: I1c078ba951483d8b2dec5e52b0de71077852836c
2021-08-10 20:03:32 +00:00
TreeHugger Robot
2da899656c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 0cab7eb1f2 -s ours am: 3569f162e7 -s ours am: 8cf0b96327 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I99252b975977938893220f00d7abb61dd0d1fc44
2021-08-10 20:00:16 +00:00
TreeHugger Robot
f3d13e9054 Merge "Reduce height of expanded media controls" into sc-dev am: 30a5f7a877 am: d49e52c4a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15503759

Change-Id: I3854251bb18d851b294c254de1664f0dab2d936c
2021-08-10 19:59:03 +00:00
TreeHugger Robot
a1032dce07 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 0cab7eb1f2 -s ours am: 3569f162e7 -s ours am: d99229c409 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I36b963a515117bb6aabeffd0e3b701b2307dee87
2021-08-10 19:58:22 +00:00
TreeHugger Robot
8f0cd472f5 Merge "Reduce height of expanded media controls" into sc-dev am: 30a5f7a877 am: 1b47d90b57
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15503759

Change-Id: Ie3b8281873cfca08534bbdad2c94be536682f959
2021-08-10 19:58:02 +00:00
TreeHugger Robot
8cf0b96327 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 0cab7eb1f2 -s ours am: 3569f162e7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaaf22d26c374822fffb63ec71db4e7d49785e084
2021-08-10 19:56:46 +00:00
TreeHugger Robot
d99229c409 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 0cab7eb1f2 -s ours am: 3569f162e7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I188504dc3b0c64cd9fb2bafae9fbe1dc7ffba3f7
2021-08-10 19:56:41 +00:00
TreeHugger Robot
d49e52c4a3 Merge "Reduce height of expanded media controls" into sc-dev am: 30a5f7a877
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15503759

Change-Id: I42948954e1b469f2d0751574db4c726e8ed76653
2021-08-10 19:54:39 +00:00
TreeHugger Robot
1b47d90b57 Merge "Reduce height of expanded media controls" into sc-dev am: 30a5f7a877
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15503759

Change-Id: I9fa9e7cc95faf1d3835c2a5e97563798a87a03f3
2021-08-10 19:54:36 +00:00
TreeHugger Robot
1ae77c6757 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a319964f46 -s ours am: d3db1ee81a -s ours am: f8eac418b0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifb5e0affad8cf149ed4d633c2c50911acf5aeb2e
2021-08-10 19:50:58 +00:00
TreeHugger Robot
dc0da91ec6 Merge "Update udfps AOD icon" into sc-dev am: fbf9a2634c am: 03c0f1c012
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15500384

Change-Id: I3c0a1d837e2fe68be4894ffd7fd70a4ec36bcd99
2021-08-10 19:50:30 +00:00
TreeHugger Robot
26cd408083 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46da446809 -s ours am: b88ec0ad1c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaa48e59db64f3a17b3daa41fd09dd42df5a3e148
2021-08-10 19:50:21 +00:00
TreeHugger Robot
edc6acf028 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 177e73216a -s ours am: 4f094926bb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4c78e87b6c4476033b264b66f4100642d1aad56a
2021-08-10 19:50:10 +00:00
TreeHugger Robot
57faa493db [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8dd449cee4 -s ours am: ddf08527ea -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5ee1130dcd0e95c62ef9768d65aedd9a66576b85
2021-08-10 19:50:02 +00:00
TreeHugger Robot
76717e9850 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d9c0e6992d -s ours am: 581ce0a2aa -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id88bfeb43d31db8ef4ad71cf81a92af8ddd8c160
2021-08-10 19:49:53 +00:00
TreeHugger Robot
281bde202c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ff33c17f8e -s ours am: 9bc82fed67 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5e8175c9c6ad9b10aa9d9b458286023eb8a02217
2021-08-10 19:49:45 +00:00
Automerger Merge Worker
a2381a091c Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0421f6c653 -s ours am: 94a0cf2aea -s ours" into sc-qpr1-dev-plus-aosp 2021-08-10 19:49:30 +00:00
TreeHugger Robot
76bd0b7c0c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0421f6c653 -s ours am: 94a0cf2aea -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0acfc7cf6b6e8fc9f73362ab7b6fe0025bfaa9ee
2021-08-10 19:49:22 +00:00
TreeHugger Robot
9426127dca [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a319964f46 -s ours am: d3db1ee81a -s ours am: 7ef3d6ca95 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic417558da100ae0e246d92ef146b19fd80cc0ad7
2021-08-10 19:49:20 +00:00
TreeHugger Robot
051760792a Merge "Update udfps AOD icon" into sc-dev am: fbf9a2634c am: 93e0c269af
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15500384

Change-Id: I021148f9f92641eb74c277c18e3bab05447e294e
2021-08-10 19:49:13 +00:00
TreeHugger Robot
212f6ecfd4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46da446809 -s ours am: 07a2913428 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic7b98b17e4a21c1c804e86aca0dc7e3f76659ea5
2021-08-10 19:49:01 +00:00
TreeHugger Robot
3569f162e7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 0cab7eb1f2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib9e4c9614ce42b6807695de56907a9edf13b3ae1
2021-08-10 19:48:52 +00:00
Automerger Merge Worker
b708b2adc7 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 177e73216a -s ours am: df74ed8fe6 -s ours" into sc-qpr1-dev-plus-aosp 2021-08-10 19:48:52 +00:00
TreeHugger Robot
79e5c9aa64 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 177e73216a -s ours am: df74ed8fe6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I91ff4d9fbed7b6679cc47f6df2c73c98cb1dcacf
2021-08-10 19:48:43 +00:00
TreeHugger Robot
2e445676f7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edd4b154f4 -s ours am: d52ff8d1f2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic3627619b90d7dee15211f2240b2fb60d7641562
2021-08-10 19:48:41 +00:00
Dave Mankoff
da9baed374 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours am: 6db47d2d58 -s ours am: 804799ae8a -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history

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

Change-Id: Idd16d3824639191b81394377ae3e945eaea725f7
2021-08-10 19:48:40 +00:00
Dave Mankoff
4b8f7a7991 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history

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

Change-Id: If2aedea5dd07a0934d4de73ec429e0245e795ef0
2021-08-10 19:48:35 +00:00
TreeHugger Robot
734a9a37e7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8dd449cee4 -s ours am: 79405cd9d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4b971fa5b0357a22a403560ea2344393dcb0727b
2021-08-10 19:48:35 +00:00
TreeHugger Robot
1d71c481f9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d9c0e6992d -s ours am: 52b1ce3c9c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic8b9f06ae0a5d40ba48335840006ecd789747ca8
2021-08-10 19:48:22 +00:00
TreeHugger Robot
f1a0dce1f2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ff33c17f8e -s ours am: 64557dfbde -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ied0dadbab0625871d6365d0e6f4c4a758e6d0b87
2021-08-10 19:48:16 +00:00
TreeHugger Robot
09116c63f3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0421f6c653 -s ours am: ad6e40f073 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6fbf92cc3c5be3338b0b6d18819a8cec705f6325
2021-08-10 19:48:09 +00:00
Dave Mankoff
dab8365333 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours am: 6db47d2d58 -s ours am: 804799ae8a -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history

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

Change-Id: Ia4ff6e30e2563161e5746e3a649dfcbf5945842c
2021-08-10 19:48:08 +00:00
TreeHugger Robot
30a5f7a877 Merge "Reduce height of expanded media controls" into sc-dev 2021-08-10 19:48:02 +00:00
Dave Mankoff
be89b2aa43 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history

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

Change-Id: I6379095c8cc4f938b9a28b6cd4952778898032c6
2021-08-10 19:48:00 +00:00
TreeHugger Robot
c0ca2fcf9c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edd4b154f4 -s ours am: c56c5cf2d2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If9cc8704187692f09932decc2719ffe230966436
2021-08-10 19:47:51 +00:00
TreeHugger Robot
f8eac418b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a319964f46 -s ours am: d3db1ee81a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I69279af9b40d9acd96a80a0d55de7c87c39a35f0
2021-08-10 19:44:17 +00:00
TreeHugger Robot
7ef3d6ca95 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a319964f46 -s ours am: d3db1ee81a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icc74a0b9246c7e08acadb95e8528add38c9eea79
2021-08-10 19:43:19 +00:00
TreeHugger Robot
d3db1ee81a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a319964f46 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I73fb19ed69289508599d138c5178405f924406a0
2021-08-10 19:38:50 +00:00