Commit Graph

666233 Commits

Author SHA1 Message Date
Evan Chen
cdee5022e8 Merge "Fix Security issue for Html.fromHtml without escape" into sc-v2-dev am: a729265863
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15629060

Change-Id: I3b926ec210e6cf840e0f8a155e92b4ed78ea6387
2021-08-20 23:33:12 +00:00
Evan Chen
a729265863 Merge "Fix Security issue for Html.fromHtml without escape" into sc-v2-dev 2021-08-20 23:18:47 +00:00
TreeHugger Robot
2a86c11977 Merge "Add extra logs for when pulse is dropped" into sc-v2-dev am: 07b270e783
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15641540

Change-Id: I6aa8c0c2395d5d644cbf00bd60dc0d734726237b
2021-08-20 21:36:15 +00:00
TreeHugger Robot
07b270e783 Merge "Add extra logs for when pulse is dropped" into sc-v2-dev 2021-08-20 20:43:46 +00:00
Selim Cinek
a46335970d Fixes two bright flashes of the notification scrim am: ddefd45358
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15638985

Change-Id: I060fb5da3120960bb3ce96543517128ac8b83b95
2021-08-20 19:50:18 +00:00
Beverly
e189850ad5 Add extra logs for when pulse is dropped
Test: adb shell settings put global systemui/buffer/DozeLog v,
check logs
Bug: 197176772

Change-Id: I2251426fe7feabb1c982a8e9c95320868a60546b
2021-08-20 19:09:19 +00:00
Selim Cinek
ddefd45358 Fixes two bright flashes of the notification scrim
We were previously going to UNLOCKED state if if there was no camera
preview leading to a bright flash in light mode. we now only do this
when the whole screen is obscured anyway by the camera preview.
This also fixes another scrim issue where the unocclusion would
flash the notification scrim, because it's expanding, which
usually shows the bouncer with a bright background during the
expansion.

Test: atest SystemUITests
Fixes: 197160246
Change-Id: I418e878698c2606856b93faf774cd87830773815
2021-08-20 15:56:25 +00:00
Govinda Wasserman
e7887c221c Adds LPP sensitivity for Assistant invocation
Test: Cherrypick ag/15542611
Test: Ensure Assistant invocation is set as the LPP action
Test: Adjust LPP sensitivity
Test: Hold LPP for the set time
Test: Observe activation duration matches set time
BUG: 192995149
FIX: 197080361
FIX: 197081640
Merged-In: I820a9d83fd56bfa9ca978e82eb779cf3d519a5ab
Change-Id: I820a9d83fd56bfa9ca978e82eb779cf3d519a5ab
(cherry picked from commit d655414526)
2021-08-20 13:18:47 +00:00
Ryan Lin
96a0c06a0e Merge "Fix WindowMagnificationControllerTest failure on foldable targets" into sc-v2-dev am: 7aedd37457
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15624358

Change-Id: I0c94a925a8acd814e3136bb5568f3ece1e5221ed
2021-08-20 04:19:57 +00:00
Ryan Lin
7aedd37457 Merge "Fix WindowMagnificationControllerTest failure on foldable targets" into sc-v2-dev 2021-08-20 04:04:37 +00:00
TreeHugger Robot
e7a5cdf4a1 Merge "Fix pip or bubbles is under split divider" into sc-v2-dev am: dded85a1bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15527614

Change-Id: I9282ae77b7c4facb8a4eeb3c2d80874a3f43d158
2021-08-20 03:11:58 +00:00
TreeHugger Robot
dded85a1bd Merge "Fix pip or bubbles is under split divider" into sc-v2-dev 2021-08-20 02:57:09 +00:00
Neha Jain
7a8d9ea5c8 Merge "New blue baseline colors" into sc-dev am: 3393d56d2c am: 617f9bb794 am: 906bd66ab8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15615564

Change-Id: I66999919455493b755ecee54d4c6ed33a93d2ec2
2021-08-19 23:29:53 +00:00
Caitlin Cassidy
db1a39aa4d Merge "Revert "[Dagger] Remove Dependency.get from VolumeDialogImpl."" into sc-v2-dev am: efbfcd1290
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15628183

Change-Id: I3ec594a03cfba5a8300d963ca6622a079933193e
2021-08-19 23:29:33 +00:00
Shan Huang
dfba4f9de8 Merge "Move boot color sysprop parsing to after loading zips." into sc-qpr1-dev am: a1c0f6dd41 am: e0b3b959f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15600978

Change-Id: I7cc37171cfbc486aaca0a5780c5e3fca0afc1cde
2021-08-19 23:28:36 +00:00
TreeHugger Robot
a301ad768d Merge "Add minimum show time for the udfps bouncer." into sc-qpr1-dev am: a1421cf606 am: 92ec5e8254
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15595759

Change-Id: I2424f50605ee4118a4897c2a7596405be5f7f583
2021-08-19 23:27:51 +00:00
TreeHugger Robot
58c7965b0d Merge "Announce Tuscany help/errors even when text suppressed" into sc-qpr1-dev am: a53bcc03eb am: 4a9d020279
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15613803

Change-Id: I2dab295e82c2a4587d732d3590eac6d3407c08c9
2021-08-19 23:27:37 +00:00
TreeHugger Robot
86dd0f1a71 Merge "Update boot animation owners" into sc-qpr1-dev am: 97395479cb am: 50fc335c4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616097

Change-Id: I024fa63727de01b4408111cbb5d95fa9941afe16
2021-08-19 23:27:14 +00:00
TreeHugger Robot
af1a9e3c23 Merge "Prevend user spoofing in isRequestPinItemSupported" into sc-dev am: 11f6a1013f am: 464d03f2ff am: 03fee5a3be
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340830

Change-Id: Ica08747e0af99a1e0424a04241db003c4cf874ee
2021-08-19 23:26:56 +00:00
TreeHugger Robot
d29c438db1 [automerger skipped] Merge "Fixed an issue where the statusbar was made opaque even though it wasnt" into sc-qpr1-dev am: f1eb5cc17a -s ours am: ca1132c55d -s ours
am skip reason: Merged-In I5a7e80e2ced8f15f1b215549d0c051f1d61d2953 with SHA-1 5d993ac26c is already in history

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

Change-Id: I8f0f008c2b7e37e5824481a446dfa069f2a1ceee
2021-08-19 23:26:38 +00:00
Govinda Wasserman
77663011c1 Merge "Allow BackupHelper to be overridden" into sc-qpr1-dev am: 3de2a1e721 am: bfbda478d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15596703

Change-Id: I6c63737ccdbf6973f7b59b06e060390f2af5499e
2021-08-19 23:26:25 +00:00
TreeHugger Robot
11afd71db2 Merge "Fixed an issue where the statusbar was made opaque even though it wasnt" into sc-v2-dev am: e7ea7111f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15580438

Change-Id: I166556142f96749d6a25c44e85035590469bfd81
2021-08-19 23:26:09 +00:00
TreeHugger Robot
bce78254a5 Merge "Filter package visibility in checkExistsAndEnforceCannotModifyImmutablyRestrictedPermission()." into sc-dev am: 4c2c1530bf am: 695b2a1b1a am: 8ffd5114a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14390030

Change-Id: I16caab4a833cfd5dddb5eaeef7eed9f78e0db0eb
2021-08-19 23:25:43 +00:00
Neha Jain
287f0a01c4 Merge "WaitForNegativeProximity stopped with power button." into sc-dev am: e77889cb61 am: 0946f87c40 am: 3a87db2326
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15611985

Change-Id: Ibeb67f6071dcc55c3c3796e88cb3d9eca7bca848
2021-08-19 23:25:07 +00:00
Xi Han
9e63b6d0fe Merge "Display W+ icon following carrier config" into sc-qpr1-dev am: 98de93009e am: 8e97f22068
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15600954

Change-Id: I92cd38b90e6d9c9c3c7b39d0565d253d892858b3
2021-08-19 23:24:33 +00:00
Caitlin Cassidy
c742e4ddc3 Merge "[Dagger] Remove Dependency.get from VolumeDialogImpl." into sc-v2-dev am: 3585c3d7ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15502450

Change-Id: I7109f401bbfbefa1d8987a0ec64ef9c2b4d3d38b
2021-08-19 23:24:09 +00:00
Neha Jain
02213629bc Merge "New blue baseline colors" into sc-dev am: 3393d56d2c am: 617f9bb794 am: 0bba91920b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15615564

Change-Id: I3b6fb42124b343204089be6dc1d70f8034cd4d4a
2021-08-19 23:23:50 +00:00
Neha Jain
bed797f500 Merge "New blue baseline colors" into sc-dev am: 3393d56d2c am: ac10660840 am: a9ae5daff9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15615564

Change-Id: I3c507d324ebbf6948e2e2cb8f9bd74b1a922300e
2021-08-19 23:23:39 +00:00
Tom Natan
1adce4ec3c Merge "Log SizeCompatRestartButtonEventReported atom." into sc-v2-dev am: 73fbff2cc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15580431

Change-Id: I3c812707123785ad88cab81b5d7bb5150d308b6e
2021-08-19 23:23:27 +00:00
Riddle Hsu
69c5424e11 Merge "Remove Task#mForceNotOrganized" into sc-v2-dev am: d3811d8874
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15624357

Change-Id: Iff0d37aae88d99de7c12d7949d22bb32fa5a9f59
2021-08-19 23:23:05 +00:00
Dave Mankoff
a5c7c0f8ab Merge "Rename KeyboardShortcutsData to KeyboardShortcutsMessage." into sc-v2-dev am: f90ce119aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15613398

Change-Id: I93b2a9d788e8dec9b3a898b32a15692590160725
2021-08-19 23:22:37 +00:00
TreeHugger Robot
09c8f92842 Merge "Animate the Wallet activity launch on lockscreen (1/2)" into sc-v2-dev am: 38e9684d15
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15532250

Change-Id: I833b8279d084f3013f27301919ceefa85dac419c
2021-08-19 23:21:37 +00:00
Neha Jain
0bba91920b Merge "New blue baseline colors" into sc-dev am: 3393d56d2c am: 617f9bb794
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15615564

Change-Id: Iae7c4bd6502b65d555af05443f5074404655af98
2021-08-19 23:11:07 +00:00
Neha Jain
906bd66ab8 Merge "New blue baseline colors" into sc-dev am: 3393d56d2c am: 617f9bb794
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15615564

Change-Id: Ia46a0126af0e0b2d185464ff7f90730310c874e1
2021-08-19 23:11:06 +00:00
Neha Jain
a9ae5daff9 Merge "New blue baseline colors" into sc-dev am: 3393d56d2c am: ac10660840
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15615564

Change-Id: I296da21c6036263bf4e450715ab0f9cf70cd12fd
2021-08-19 23:10:44 +00:00
Neha Jain
617f9bb794 Merge "New blue baseline colors" into sc-dev am: 3393d56d2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15615564

Change-Id: Ic2ac9c26584b6ba6b5c15a5941c495c7d0e4f311
2021-08-19 22:24:10 +00:00
Neha Jain
ac10660840 Merge "New blue baseline colors" into sc-dev am: 3393d56d2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15615564

Change-Id: Ice00543c04cc6443c88a79b045904b5cb070086f
2021-08-19 22:23:20 +00:00
Caitlin Cassidy
efbfcd1290 Merge "Revert "[Dagger] Remove Dependency.get from VolumeDialogImpl."" into sc-v2-dev 2021-08-19 22:03:30 +00:00
Caitlin Cassidy
f02365656f Revert "[Dagger] Remove Dependency.get from VolumeDialogImpl."
Revert "[Dagger] Remove CarVolumeDialogComponent now that the cu..."

Revert "[Dagger] Add VolumeModule to SystemUIGoogleModule."

Revert submission 15548780-dagger-volumedialogimpl

Reason for revert: Breaking builds
Reverted Changes:
Iea3f06de8:[Dagger] Add VolumeModule to SystemUIGoogleModule....
I3213f0c6f:[Dagger] Remove CarVolumeDialogComponent now that ...
I74c71860b:[Dagger] Remove Dependency.get from VolumeDialogIm...

Change-Id: I17255bb75282481014ada7dee43c9a5d5cd2caf9
Bug: 138786270
2021-08-19 22:03:11 +00:00
Neha Jain
3393d56d2c Merge "New blue baseline colors" into sc-dev 2021-08-19 22:02:54 +00:00
Jooyung Han
773acea2ff Merge "tuner: use typed Map<String, String>" am: 6f3ebef588 am: 150af91f9c am: 8a3b6fc1e6 am: 38bbe2b326
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1801772

Change-Id: Ic5436a57c8a7e2fc32d9cecf76376c10d5a9c8a0
2021-08-19 21:53:33 +00:00
Hongguang Chen
1f83ebf747 Merge "Update tuner OWNERS." am: 332cd02609 am: bcc2864d50 am: 956d644c63 am: 6baa6ba29d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1801122

Change-Id: I0765a22da35b918a640b3b60637a26d4b660e362
2021-08-19 21:52:55 +00:00
Shan Huang
a332213f93 Merge "Move boot color sysprop parsing to after loading zips." into sc-qpr1-dev am: a1c0f6dd41 am: 28c7d63d16
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15600978

Change-Id: I0737e969419aa6297b5e4420935fe7804193a1a5
2021-08-19 21:51:22 +00:00
Jooyung Han
38bbe2b326 Merge "tuner: use typed Map<String, String>" am: 6f3ebef588 am: 150af91f9c am: 8a3b6fc1e6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1801772

Change-Id: I96c963e60d3c9d8109dc844f0df4ec985447c6fa
2021-08-19 21:34:16 +00:00
Hongguang Chen
6baa6ba29d Merge "Update tuner OWNERS." am: 332cd02609 am: bcc2864d50 am: 956d644c63
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1801122

Change-Id: I644cc569c7e773a44c198eabfc6e80c4cd32e554
2021-08-19 21:33:34 +00:00
Shan Huang
e0b3b959f2 Merge "Move boot color sysprop parsing to after loading zips." into sc-qpr1-dev am: a1c0f6dd41
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15600978

Change-Id: Iaf81ba285283aafcbffaf592b978d675a203006a
2021-08-19 21:33:15 +00:00
Shan Huang
28c7d63d16 Merge "Move boot color sysprop parsing to after loading zips." into sc-qpr1-dev am: a1c0f6dd41
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15600978

Change-Id: I5869b4e53f9023a60f7af87a8b5afae03389eda4
2021-08-19 21:33:15 +00:00
Jooyung Han
8a3b6fc1e6 Merge "tuner: use typed Map<String, String>" am: 6f3ebef588 am: 150af91f9c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1801772

Change-Id: I2dfc4cb57c3072c116d2e79d4ecc3c209c7d37e2
2021-08-19 21:21:04 +00:00
Hongguang Chen
956d644c63 Merge "Update tuner OWNERS." am: 332cd02609 am: bcc2864d50
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1801122

Change-Id: Id220348cf1a321dad405891f5c523aca028ca9f0
2021-08-19 21:20:40 +00:00
TreeHugger Robot
6a485ae90a Merge "Add minimum show time for the udfps bouncer." into sc-qpr1-dev am: a1421cf606 am: 972369a5be
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15595759

Change-Id: Id25216e11391dc7d3eae70f890b2fcadd1fafd2c
2021-08-19 21:15:21 +00:00