Commit Graph

660913 Commits

Author SHA1 Message Date
Beverly Tai
218182d11f Merge "Don't forward touches to udfps if notification panel is expanding" into sc-dev am: f7b36eedf5 am: c2810b436a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340335

Change-Id: I7db0b1c060cc43a071ea1ec613efe94944df5a7d
2021-07-21 14:25:28 +00:00
Beverly Tai
0e116ac6bb Merge "Don't forward touches to udfps if notification panel is expanding" into sc-dev am: f7b36eedf5 am: db88fa5c71
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340335

Change-Id: I10bb5475caad73feadcca07abb47209b79a60570
2021-07-21 14:17:19 +00:00
Beverly Tai
c2810b436a Merge "Don't forward touches to udfps if notification panel is expanding" into sc-dev am: f7b36eedf5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340335

Change-Id: I35812bb6ba722816320d3e8083563083e5e2c169
2021-07-21 14:08:28 +00:00
Beverly Tai
db88fa5c71 Merge "Don't forward touches to udfps if notification panel is expanding" into sc-dev am: f7b36eedf5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340335

Change-Id: Ie8f21500e8c50cd8746f17dc03440c258031e09f
2021-07-21 14:06:43 +00:00
Beverly Tai
f7b36eedf5 Merge "Don't forward touches to udfps if notification panel is expanding" into sc-dev 2021-07-21 13:57:08 +00:00
TreeHugger Robot
054dbac3e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 39bd3b0f40 -s ours am: 4d7a460996 -s ours am: 429650a265 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I102321f33aec3a1b4f792656d1551cfdaecac5a7
2021-07-21 13:50:49 +00:00
TreeHugger Robot
59ca5cf7f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 39bd3b0f40 -s ours am: 4d7a460996 -s ours am: 9118bfc2fb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idbb6664468db0588e015cf407da7edbadc5c01c6
2021-07-21 13:50:30 +00:00
TreeHugger Robot
9118bfc2fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 39bd3b0f40 -s ours am: 4d7a460996 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7519602542fa70cf8b965c6bd898e0abae2f2efb
2021-07-21 13:41:22 +00:00
TreeHugger Robot
429650a265 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 39bd3b0f40 -s ours am: 4d7a460996 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8eee4968e4701a4308bca538bacafa73577886ec
2021-07-21 13:40:37 +00:00
TreeHugger Robot
4d7a460996 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 39bd3b0f40 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8c0cebc41af2170eef0105f2bd9b1a1f38416e8f
2021-07-21 13:31:15 +00:00
TreeHugger Robot
f20a2ae1b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4959acde34 -s ours am: 9d0657478b -s ours am: 82738e061b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icf7dfdba1d516ef63f6371fdf453fa3dc0dbec84
2021-07-21 13:21:09 +00:00
TreeHugger Robot
f20faacfda [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 18636927b7 -s ours am: 0ae2db6866 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I138fc8f8841f96471d5c8c65771e31f84f11bea6
2021-07-21 13:20:53 +00:00
TreeHugger Robot
cc3724e778 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4959acde34 -s ours am: 9d0657478b -s ours am: 78ea856c42 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idb449a9ae91e025dc5229867aeaeb25e268ae780
2021-07-21 13:20:43 +00:00
TreeHugger Robot
4ed735e558 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 18636927b7 -s ours am: 678227ea73 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia771b138518aea87f32ad16c21cd7e3bff5d9baa
2021-07-21 13:20:37 +00:00
TreeHugger Robot
78ea856c42 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4959acde34 -s ours am: 9d0657478b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3dbf617c997c0d061dd64fe3fb0563eaeddd906d
2021-07-21 13:06:06 +00:00
TreeHugger Robot
678227ea73 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 18636927b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0d933f51fb30104eebfa4d40378798aec5ea61ed
2021-07-21 13:06:02 +00:00
TreeHugger Robot
82738e061b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4959acde34 -s ours am: 9d0657478b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib97d4215e11217da943d84fe830d6823c821f73e
2021-07-21 13:05:31 +00:00
TreeHugger Robot
0ae2db6866 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 18636927b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7842b8e673d07461f4d4eb63060a515e8428d32d
2021-07-21 13:05:06 +00:00
TreeHugger Robot
39bd3b0f40 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-07-21 13:04:13 +00:00
Beverly Tai
276952493f Merge "Reset messages when the keyguard isn't showing" into sc-dev am: fb4aa06b99 am: ecfac749e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15341139

Change-Id: I23961f2739c6ab28eda0f31fd9c2e5823ccbf0c4
2021-07-21 13:00:20 +00:00
TreeHugger Robot
a8c628116b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b64b9b2a62 -s ours am: 63ad597247 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I711466b07c39507ddfb6a131ca4f7a917f3ebabd
2021-07-21 13:00:01 +00:00
TreeHugger Robot
9d0657478b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4959acde34 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3e717b1925dc73cbc435ee44cd5f7390864d07c1
2021-07-21 12:59:06 +00:00
Beverly Tai
a6ba0961c0 Merge "Reset messages when the keyguard isn't showing" into sc-dev am: fb4aa06b99 am: 1f5bf69769
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15341139

Change-Id: Ibeb89d3d619d37fbc69ab95784b7dfa749afa5df
2021-07-21 12:56:59 +00:00
TreeHugger Robot
b80fa8bdf0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b64b9b2a62 -s ours am: 50e20bab88 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I35b2341fa1d0d65535d0d044b524a0d7b7602610
2021-07-21 12:55:51 +00:00
TreeHugger Robot
18636927b7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-21 12:54:44 +00:00
Beverly Tai
1f5bf69769 Merge "Reset messages when the keyguard isn't showing" into sc-dev am: fb4aa06b99
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15341139

Change-Id: Ia06458130d39fa37441c8ad67afb10304d2b32a7
2021-07-21 12:51:32 +00:00
Beverly Tai
ecfac749e8 Merge "Reset messages when the keyguard isn't showing" into sc-dev am: fb4aa06b99
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15341139

Change-Id: Ibe6c1d09a1862dd10a638197e8bc10ea9846a2db
2021-07-21 12:51:17 +00:00
TreeHugger Robot
50e20bab88 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b64b9b2a62 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I108aed7736415c906851f63806900f13d1ca7465
2021-07-21 12:51:11 +00:00
TreeHugger Robot
3b227f8e01 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 650177561b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia183feed41f17e99bc71c2d9d0f9687f2203d1af
2021-07-21 12:51:04 +00:00
TreeHugger Robot
faaefa7a9a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6e3073c4f9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3c203bcb24e349cc313e2c4fb01115f7756c4d31
2021-07-21 12:50:54 +00:00
TreeHugger Robot
63ad597247 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b64b9b2a62 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6f31cd6adc232ab64bfdc61e79b43e217722d899
2021-07-21 12:50:43 +00:00
TreeHugger Robot
d57f9a62f1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5afbf93938 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib45135ab03403528926224e08bdd45c42fac5ed6
2021-07-21 12:50:40 +00:00
TreeHugger Robot
4959acde34 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-07-21 12:48:43 +00:00
Beverly Tai
fb4aa06b99 Merge "Reset messages when the keyguard isn't showing" into sc-dev 2021-07-21 12:40:50 +00:00
TreeHugger Robot
b64b9b2a62 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-21 12:40:48 +00:00
TreeHugger Robot
650177561b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-21 12:40:41 +00:00
TreeHugger Robot
6e3073c4f9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-21 12:36:28 +00:00
TreeHugger Robot
5afbf93938 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-21 12:33:38 +00:00
Treehugger Robot
07a7cf045f [automerger skipped] Merge "Revert "Add systrace tag for system property"" am: 00e6e9cd26 -s ours am: 09adeddd2a -s ours am: a4ad343ea2 -s ours
am skip reason: Merged-In Id78992d238a73257bb9b80bfaa6bbfeb16f477d8 with SHA-1 7dc8bf4acf is already in history. Merged-In was found from reverted change.

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

Change-Id: I4490460f98c8009ff10c4d3d2f984dddbdc13b90
2021-07-21 12:27:48 +00:00
Treehugger Robot
a4ad343ea2 [automerger skipped] Merge "Revert "Add systrace tag for system property"" am: 00e6e9cd26 -s ours am: 09adeddd2a -s ours
am skip reason: Merged-In Id78992d238a73257bb9b80bfaa6bbfeb16f477d8 with SHA-1 7dc8bf4acf is already in history. Merged-In was found from reverted change.

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

Change-Id: Ib14493ee49e9bf9cfb2870aa9aaeadeb31f5ee18
2021-07-21 12:05:50 +00:00
Treehugger Robot
09adeddd2a [automerger skipped] Merge "Revert "Add systrace tag for system property"" am: 00e6e9cd26 -s ours
am skip reason: Merged-In Id78992d238a73257bb9b80bfaa6bbfeb16f477d8 with SHA-1 7dc8bf4acf is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1403551

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

Change-Id: Ic750825ce2924d6ce85281da1ccad5005d9e0507
2021-07-21 11:56:23 +00:00
Treehugger Robot
00e6e9cd26 Merge "Revert "Add systrace tag for system property"" 2021-07-21 11:43:39 +00:00
Alex Florescu
80d9010787 Merge "Remove feature flag for split shade" into sc-v2-dev am: ad502315bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302106

Change-Id: I63c09330ba4cf27762e44f1b832ed68152ccfd53
2021-07-21 10:39:36 +00:00
Alex Florescu
ad502315bb Merge "Remove feature flag for split shade" into sc-v2-dev 2021-07-21 10:24:26 +00:00
TreeHugger Robot
04856073c1 [automerger skipped] Merge "More consistently retry system calls on EINTR" into sc-dev am: 84d34f9ce5 am: 2b9b70f9ff -s ours
am skip reason: Merged-In Icbfb38be5110607c121545e5c200ce65d1eefbfe with SHA-1 65fee3cfdc is already in history

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

Change-Id: I970a40d6ceabfd96e397f705d62463bbc5167d0a
2021-07-21 10:09:07 +00:00
TreeHugger Robot
2b9b70f9ff Merge "More consistently retry system calls on EINTR" into sc-dev am: 84d34f9ce5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15336435

Change-Id: Icf4276a6690e29ec873d804f2d919ea73c5ede2a
2021-07-21 09:46:05 +00:00
TreeHugger Robot
13241f64dd [automerger skipped] Merge "More consistently retry system calls on EINTR" into sc-dev am: 84d34f9ce5 -s ours am: 1c3ae12bbe -s ours
am skip reason: Merged-In Icbfb38be5110607c121545e5c200ce65d1eefbfe with SHA-1 c3dcb0d088 is already in history

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

Change-Id: Ibe178b7bd6372a11f4fcfe258bfab01c4a9e11ac
2021-07-21 09:46:05 +00:00
Treehugger Robot
e6e767caa9 Merge "profcollect: Add verbose logging for ota status updates" am: ac418218f8 am: c7c73d4ee1 am: eb1b047f7d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1773825

Change-Id: I722338b43c1320bf96bf07dc23828db89efbd166
2021-07-21 09:46:00 +00:00
TreeHugger Robot
1c3ae12bbe [automerger skipped] Merge "More consistently retry system calls on EINTR" into sc-dev am: 84d34f9ce5 -s ours
am skip reason: Merged-In Icbfb38be5110607c121545e5c200ce65d1eefbfe with SHA-1 c3dcb0d088 is already in history

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

Change-Id: I64b0f7e41a54d9c10e12a87875cc3fd3135cb7aa
2021-07-21 09:44:53 +00:00
Treehugger Robot
eb1b047f7d Merge "profcollect: Add verbose logging for ota status updates" am: ac418218f8 am: c7c73d4ee1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1773825

Change-Id: I366385185ad1ba6ab6e6f8c906e86aeae17ee187
2021-07-21 09:34:11 +00:00