Commit Graph

667102 Commits

Author SHA1 Message Date
Zoey Chen
1e07f06cd4 [automerger skipped] Merge changes from topics "launch_wifi_details-sc-qpr1-dev", "refactor_icon_injector-sc-qpr1-dev" into sc-qpr1-dev am: c6691520b1 am: ed410c03ac -s ours
am skip reason: Merged-In Ieb7080ab6f6462abc3820b47c2a58cc2ea2a083e with SHA-1 fc39764944 is already in history

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

Change-Id: I0491b8caf07146eec35e249431d7239aca0e029e
2021-08-27 10:10:10 +00:00
Zoey Chen
03f442c2f7 [automerger skipped] [Provider Model] Cherry-pick from ag/15243691, ag/15287619, ag/15287620 and ag/15270751 am: 903f54b107 am: 0313f9c68c -s ours
am skip reason: Merged-In I4ea7aa443659cef091f525e0064a7db4c95522e2 with SHA-1 c3abe4998d is already in history

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

Change-Id: I670ca8c041554ebcfa4a037fc89a95b550a71366
2021-08-27 10:10:07 +00:00
Jooyung Han
f4c2717d34 Merge "telephony: suppress warnings in AIDL" am: 89242df0c9 am: 05820c8ff6 am: f2e4340476 am: 8f1cfa2ae8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1796511

Change-Id: I1fa7836cee511781523bcb6dbbb24bf89ae69b93
2021-08-27 10:09:52 +00:00
Zoey Chen
2e81277297 [automerger skipped] Merge "[Provider Model] Remove the flag of ProviderModel in InternetTile" into sc-qpr1-dev am: 50bdf2b540 am: e2749c27a2 -s ours
am skip reason: Merged-In I1775c8169f6a42fb0944892850999744f87c3f24 with SHA-1 9fc7547580 is already in history

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

Change-Id: Ia7c0a5b91968fee3bd460ef73186a20828da05c1
2021-08-27 10:09:26 +00:00
Arthur Hung
5e63fd8cd9 [automerger skipped] Merge "Add TYPE_STATUS_BAR_ADDITIONAL to trusted overlay" into sc-qpr1-dev am: 519749f60c am: 0869676255 -s ours
am skip reason: Merged-In I3f41f3eeeed431309d348cc4d1286e4b346f1259 with SHA-1 da3f6a15d7 is already in history

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

Change-Id: If7d631af15e0ca0e70155091c85e6ff9174c9dd1
2021-08-27 10:09:10 +00:00
Rhed Jao
b06d483c27 [automerger skipped] Merge "Apply a maximum char count to the load label api" into sc-qpr1-dev am: a824612523 -s ours am: 7bf07cca59 -s ours
am skip reason: Merged-In Ia4d768cc93a47cfb8b6f7c4b6dc73abd801809bd with SHA-1 3c26a24644 is already in history

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

Change-Id: I0bfe5142ab18f14dfe44686df8786662f07a4d75
2021-08-27 10:08:49 +00:00
Android Build Prod User
85ea162629 Merge "Don't unregister doze sensors that have been requested" into sc-qpr1-dev am: 1f1ec17fdc am: b6f895d6c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15627249

Change-Id: I8c8eae6a23e1b4940f8470ca6cd4c67907697d27
2021-08-27 10:08:37 +00:00
Beverly Tai
9ffd4917a6 [automerger skipped] Merge "Fix udfps flicker on camera launch + exit" into sc-dev am: abfeb71406 -s ours am: 311d0ebb18 -s ours am: 677d7648b7 -s ours
am skip reason: Merged-In Id3aa20662df8cdd6676141f5f70e5eae0cec6215 with SHA-1 822e07e0f4 is already in history

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

Change-Id: I58739c0a516b1dc868988ccd52e9127cdf7ac579
2021-08-27 10:08:02 +00:00
Android Build Prod User
bd0e680680 Merge "On keyguard unoccluding, set notif scrim alpha to KEYGUARD_SCRIM_ALPHA" into sc-dev am: 0f2a769d79 am: c4ff7892ab am: ea53f4ff68
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15662498

Change-Id: Ib6dead17b237e6cae947ea395ac0a1fa6897b682
2021-08-27 10:07:51 +00:00
Beverly Tai
545fa2ef99 [automerger skipped] Merge "Fix udfps flicker on camera launch + exit" into sc-dev am: abfeb71406 am: 99e25af04a -s ours am: 0ee822a954 -s ours
am skip reason: Merged-In Id3aa20662df8cdd6676141f5f70e5eae0cec6215 with SHA-1 822e07e0f4 is already in history

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

Change-Id: I809aa8f74fe6575af3eed48efea23efdecbb9bd6
2021-08-27 10:07:41 +00:00
Android Build Prod User
40f05a8ebe Merge "On keyguard unoccluding, set notif scrim alpha to KEYGUARD_SCRIM_ALPHA" into sc-dev am: 0f2a769d79 am: 003612073a am: e6a3dd0f61
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15662498

Change-Id: I8972284b9f6531daf7aa564bb96f3cad30f2d100
2021-08-27 10:07:31 +00:00
Android Build Prod User
7280b842ef [automerger skipped] Merge "Fix udfps flicker on camera launch + exit" into sc-qpr1-dev am: b0a0874290 am: 3d3a1ab4dd -s ours
am skip reason: Merged-In Id3aa20662df8cdd6676141f5f70e5eae0cec6215 with SHA-1 e8f14f4813 is already in history

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

Change-Id: I665f8a93e03cb989be3c1a778899b64bcbcfe7be
2021-08-27 10:07:08 +00:00
Michał Brzeziński
7ef2a7d542 Merge "Disable flaky biometric view tests." into sc-v2-dev am: a2bbce3ae2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15685198

Change-Id: Ib6edf351061e2ae29bd8fd4d5c4e64d0d2321488
2021-08-27 09:32:33 +00:00
Michał Brzeziński
a2bbce3ae2 Merge "Disable flaky biometric view tests." into sc-v2-dev 2021-08-27 09:08:09 +00:00
Android Build Prod User
59d30e06c4 Merge "Update divider bar layout to match stage split design" into sc-v2-dev am: 61babbcfb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15674533

Change-Id: Ifffbdabe4689f169c82cc3261aa0af8417962452
2021-08-27 04:35:00 +00:00
Android Build Prod User
61babbcfb5 Merge "Update divider bar layout to match stage split design" into sc-v2-dev 2021-08-27 04:24:41 +00:00
Jerry Chang
074c7291a9 Update divider bar layout to match stage split design
Bug: 197361088
Bug: 196272915
Test: manual
Change-Id: Ic2fed9c6ef5d8004f922d766c7e3d3170846041d
2021-08-27 04:22:22 +00:00
Jerry Chang
bb977694c0 Merge "Only run PipLegacySplitScreenTest when it is using legacy split" into sc-v2-dev am: 49844a1df0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15683891

Change-Id: I5bcb60094b50b8509361b9dc7c791931af0f7621
2021-08-27 04:13:10 +00:00
Jerry Chang
49844a1df0 Merge "Only run PipLegacySplitScreenTest when it is using legacy split" into sc-v2-dev 2021-08-27 04:01:17 +00:00
Hui Yu
1ad6196ac4 [automerger skipped] Add canAllowWhileInUsePermissionInFgsLocked() method back. am: 94b62d998d -s ours am: 0a819742a3 -s ours am: f349224ae1 -s ours am: 9ea468e5c8 -s ours
am skip reason: Merged-In Idc88f274c7a323d175d65bb47eca041772ae9bb7 with SHA-1 6706c1acc0 is already in history

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

Change-Id: Ib3d1426894a3d69138f9ae4957120446577d4731
2021-08-27 03:58:16 +00:00
Android Build Prod User
cf6c71d0ad Merge "Always show "Swipe up to open" on tapping empty space on LS" into sc-qpr1-dev am: 374929be06 am: f33bb45579
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15675583

Change-Id: I86932b67901a6c304a8c3a8593c63e76d1ca2d5f
2021-08-27 03:58:08 +00:00
Shan Huang
fbe437bd10 Merge "Support rendering white pixels." into sc-qpr1-dev am: e2f4ad3e7b am: cfb0fe05a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15676845

Change-Id: I01c05670625bef928a16212649dc881ca9e31c98
2021-08-27 03:57:50 +00:00
Hui Yu
60b1a960aa [automerger skipped] Merge "Revert "BG-FGS-start while-in-use permission restriction improve..."" into rvc-dev am: 63bab23a9d am: 2162cfd39b -s ours am: 8333d75972 -s ours am: e8396bc4a6 -s ours am: e41b77a7fa -s ours
am skip reason: Merged-In Idc88f274c7a323d175d65bb47eca041772ae9bb7 with SHA-1 6706c1acc0 is already in history. Merged-In was found from reverted change.

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

Change-Id: Iea8c651d7d180927be3cb93e90a021a74428c568
2021-08-27 03:57:28 +00:00
Hui Yu
5ffacae1e2 [automerger skipped] Merge "Revert "BG-FGS-start while-in-use permission restriction improve..."" into rvc-dev am: 63bab23a9d am: 4a9a5f59c8 -s ours am: 7aaecba06a -s ours am: 387bc6cb32 -s ours am: c28a36442d -s ours
am skip reason: Merged-In Idc88f274c7a323d175d65bb47eca041772ae9bb7 with SHA-1 6706c1acc0 is already in history. Merged-In was found from reverted change.

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

Change-Id: I5ea8c3346bb5dab12e76a232677be46f066bfae0
2021-08-27 03:57:14 +00:00
Julia Reynolds
9f3b2dafaa Merge "Fix behavior of updates to insistent notifs" into sc-qpr1-dev am: 5bda39799d am: bb01aa8d71
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15676601

Change-Id: Ib9e6ac55fb139c7c11b59e76881ba3f8c10d74eb
2021-08-27 03:57:02 +00:00
Android Build Prod User
389834c48b Merge "Remove ZigZagClassifer from lock-icon longpress falsing algo" into sc-qpr1-dev am: 1751bd89f1 am: e035b3c98c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15685188

Change-Id: I85087e2dfcc5e9f71add96ed4a54e75e796d7521
2021-08-27 03:56:46 +00:00
Android Build Prod User
b01b5b0856 Merge "Mutate the drawable when updating QS icon." into sc-qpr1-dev am: 590dc710e8 am: 513e53d864
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15668772

Change-Id: I847f54f4cbe3b608a54e65356ff044cfb7a720db
2021-08-27 03:56:30 +00:00
Julia Reynolds
caba29c8e6 Merge "Check user when snoozing" into sc-qpr1-dev am: b082cf64e1 am: da610ed67e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15676600

Change-Id: I3d22d79da748f378cd275a7c7b27416a57e857fe
2021-08-27 03:55:59 +00:00
Android Build Prod User
ce7586b5d2 Merge "Initial udfps vibration should always play" into sc-qpr1-dev am: 8b5f287dcb am: b62fbaf42d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15675980

Change-Id: I240ebb39204326b0d428edcdf5acfc552e5f6e1d
2021-08-27 03:55:32 +00:00
Pierre Barbier de Reuille
4e01191502 Merge "Accounting for image scaling when calculating color extraction" into sc-qpr1-dev am: 64b885a4f9 am: 699dcf2037
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15612141

Change-Id: I9172e1b5536f5089a24205cf2367d8438642b19f
2021-08-27 03:55:16 +00:00
Tyler Gunn
3c4d280e5c Merge "Fix issue when adding existing connections via remote connection services." into sc-dev am: 5f54351908 am: 0bacd2b473 am: 92d049d63d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15113691

Change-Id: Ic94e7ded1d8b1afc4c1e063b60c5b30a467b466e
2021-08-27 03:54:21 +00:00
Selim Cinek
adbe7bb84f [automerger skipped] Fixed failing scrim test am: ac3e13a89c am: 97f9823318 -s ours am: b1d63e6268 -s ours
am skip reason: Merged-In Ib9216246b9eb05b664d4f88f8cf6d11cc58e32d6 with SHA-1 baa03325f9 is already in history

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

Change-Id: I980645d6dacfab3bdc1aad5dbe11dc42de69af06
2021-08-27 03:54:09 +00:00
Zoey Chen
d69e2e3f59 [automerger skipped] Merge changes I61c32c74,I505c9b04,I5c19e6a8,I24e86a75 into sc-qpr1-dev am: 78569f942a -s ours am: 5190fc03bc -s ours
am skip reason: skipped by user zoeychen

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

Change-Id: I1a6fe0dd910a14381eaabae5f202f5e02678d5c0
2021-08-27 03:53:53 +00:00
Zoey Chen
30618ec5d7 Merge changes I61c32c74,I505c9b04,I5c19e6a8,I24e86a75 into sc-v2-dev am: ac2c9b4576
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15683506

Change-Id: I6db1eb3cf9e951f682c9c38474337e755f95f9b5
2021-08-27 03:53:07 +00:00
Zoey Chen
04f79eee35 [RESTRICT AUTOMERGE] [Provider Model] Support 2+ lines instead of marque for Mobile data and Wi-Fi am: fc0d0bc3f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15683506

Change-Id: Ie51ad812e1ad6fe5e2c312f861e6cde7b6ef309b
2021-08-27 03:52:56 +00:00
Hui Yu
9ea468e5c8 [automerger skipped] Add canAllowWhileInUsePermissionInFgsLocked() method back. am: 94b62d998d -s ours am: 0a819742a3 -s ours am: f349224ae1 -s ours
am skip reason: Merged-In Idc88f274c7a323d175d65bb47eca041772ae9bb7 with SHA-1 6706c1acc0 is already in history

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

Change-Id: I08d5d72cceab7a7cb6c584f63b77ad250e3a9d88
2021-08-27 03:52:12 +00:00
Android Build Prod User
f33bb45579 Merge "Always show "Swipe up to open" on tapping empty space on LS" into sc-qpr1-dev am: 374929be06
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15675583

Change-Id: I11034c992273e9b42693d70e8190e2a02f57ac7a
2021-08-27 03:52:00 +00:00
Shan Huang
cfb0fe05a5 Merge "Support rendering white pixels." into sc-qpr1-dev am: e2f4ad3e7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15676845

Change-Id: Idc0b67471d5a4822c004933443a2c996fff6939c
2021-08-27 03:51:35 +00:00
Hui Yu
e41b77a7fa [automerger skipped] Merge "Revert "BG-FGS-start while-in-use permission restriction improve..."" into rvc-dev am: 63bab23a9d am: 2162cfd39b -s ours am: 8333d75972 -s ours am: e8396bc4a6 -s ours
am skip reason: Merged-In Idc88f274c7a323d175d65bb47eca041772ae9bb7 with SHA-1 6706c1acc0 is already in history. Merged-In was found from reverted change.

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

Change-Id: I17f7ed5ade01ea825cef9f71ade03cc3c211c8f1
2021-08-27 03:51:25 +00:00
Hui Yu
c28a36442d [automerger skipped] Merge "Revert "BG-FGS-start while-in-use permission restriction improve..."" into rvc-dev am: 63bab23a9d am: 4a9a5f59c8 -s ours am: 7aaecba06a -s ours am: 387bc6cb32 -s ours
am skip reason: Merged-In Idc88f274c7a323d175d65bb47eca041772ae9bb7 with SHA-1 6706c1acc0 is already in history. Merged-In was found from reverted change.

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

Change-Id: I0a7cf1a1dedea39b4a63c3bf52ef7e1bd21a6cbf
2021-08-27 03:51:07 +00:00
Julia Reynolds
bb01aa8d71 Merge "Fix behavior of updates to insistent notifs" into sc-qpr1-dev am: 5bda39799d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15676601

Change-Id: I3aa33474328b678aa29266095f3755d93bd8fe44
2021-08-27 03:50:59 +00:00
Android Build Prod User
e035b3c98c Merge "Remove ZigZagClassifer from lock-icon longpress falsing algo" into sc-qpr1-dev am: 1751bd89f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15685188

Change-Id: I7caa332dfe3ac47e23a4fb93a1f945df85a79c2f
2021-08-27 03:49:49 +00:00
Android Build Prod User
513e53d864 Merge "Mutate the drawable when updating QS icon." into sc-qpr1-dev am: 590dc710e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15668772

Change-Id: I2461d957e8b3a72278e07b0becb1d4f00cd29cb3
2021-08-27 03:49:07 +00:00
Julia Reynolds
da610ed67e Merge "Check user when snoozing" into sc-qpr1-dev am: b082cf64e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15676600

Change-Id: I27f2b4d2531ab2d564d6dc1a0f176104831d2009
2021-08-27 03:48:12 +00:00
Android Build Prod User
b62fbaf42d Merge "Initial udfps vibration should always play" into sc-qpr1-dev am: 8b5f287dcb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15675980

Change-Id: Ibddbc9758169d8e201083085a900e4b38c4cf62f
2021-08-27 03:47:55 +00:00
Pierre Barbier de Reuille
699dcf2037 Merge "Accounting for image scaling when calculating color extraction" into sc-qpr1-dev am: 64b885a4f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15612141

Change-Id: Id6a5319fd81823138780e55a1ba05af2119ef476
2021-08-27 03:47:13 +00:00
Tyler Gunn
92d049d63d Merge "Fix issue when adding existing connections via remote connection services." into sc-dev am: 5f54351908 am: 0bacd2b473
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15113691

Change-Id: I09d36ec632fcba7794e63ae0b7d3afe8616eecca
2021-08-27 03:46:51 +00:00
Selim Cinek
b1d63e6268 [automerger skipped] Fixed failing scrim test am: ac3e13a89c am: 97f9823318 -s ours
am skip reason: Merged-In Ib9216246b9eb05b664d4f88f8cf6d11cc58e32d6 with SHA-1 baa03325f9 is already in history

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

Change-Id: Ibaba1318dfe72617d557c39122339f1e33546ddd
2021-08-27 03:44:25 +00:00
Zoey Chen
5190fc03bc [automerger skipped] Merge changes I61c32c74,I505c9b04,I5c19e6a8,I24e86a75 into sc-qpr1-dev am: 78569f942a -s ours
am skip reason: skipped by user zoeychen

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

Change-Id: I1066aef34b1fb2fb53e04c1e8d2dfd7504cfa245
2021-08-27 03:44:06 +00:00
Zoey Chen
ac2c9b4576 Merge changes I61c32c74,I505c9b04,I5c19e6a8,I24e86a75 into sc-v2-dev
* changes:
  [RESTRICT AUTOMERGE] [Provider Model] Support 2+ lines instead of marque for Mobile data and Wi-Fi
  [RESTRICT AUTOMERGE] [Provider Model] Fix WiFi SSID disappear issue
  [RESTRICT AUTOMERGE] [Provider Model] Enforce DISALLOW_CONFIG_WIFI in Internet Panel
  [RESTRICT AUTOMERGE] [Provider Model] Correct Wi-Fi toggle title color in Dark Theme
2021-08-27 03:38:12 +00:00