Commit Graph

122874 Commits

Author SHA1 Message Date
Vania Januar
aa438742ed Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0 am: 247fed89c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585

Change-Id: Ie8ee82c7ec38135b7f8bba33e171aece1bf337a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 11:23:05 +00:00
Vania Januar
247fed89c4 Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585

Change-Id: Icc6d64627bba5370c4d68a0456c0d2641540cdfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 10:45:36 +00:00
Vania Januar
072d8b90d0 Merge "Replace placeholder icons with stylus icons" into udc-dev 2023-05-05 09:50:11 +00:00
Chaohui Wang
ee0a1b5224 Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b am: 3d06aec9ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156

Change-Id: Ie1b0bc84ff0a286544815d1b8e860b403ef157cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 09:22:02 +00:00
Chaohui Wang
3d06aec9ab Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156

Change-Id: Id277b59be091126b986475450cc36c89bf24f52a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 08:19:39 +00:00
Chaohui Wang
7c042f374b Merge "FRP bypass defense in the Settings App for SPA" into udc-dev 2023-05-05 07:57:39 +00:00
Chaohui Wang
f7e0171059 Merge "Log app special permission change for SPA" into udc-dev am: 804214c160 am: 8b550ddb4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957

Change-Id: Ia903e4ca45754258386e9142007d5c9af03b7b83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 03:33:35 +00:00
Chaohui Wang
8b550ddb4c Merge "Log app special permission change for SPA" into udc-dev am: 804214c160
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957

Change-Id: I64197b730225942a2cab8cf154b1ad6f4b438e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 03:19:04 +00:00
Daniel Huang
719d54a0ed Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22 am: 5f12c8fcf8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936

Change-Id: Id9d40a85143dc91f7831af69c9fa0b28825a3390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 03:15:25 +00:00
Chaohui Wang
804214c160 Merge "Log app special permission change for SPA" into udc-dev 2023-05-05 03:03:52 +00:00
Daniel Huang
5f12c8fcf8 Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936

Change-Id: I6d1705a4e749d9d46d1c52433e6d7b3a3766f713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 02:34:58 +00:00
Daniel Huang
08b2b68e22 Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev 2023-05-05 02:33:13 +00:00
Becca Hughes
c54ac1369e Use isPrimary bit to determine top provider am: 3096997718 am: 4c657e3635
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343

Change-Id: Icd1551c9a1bd5867480201659ee96cb76ab9f613
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 00:21:57 +00:00
Becca Hughes
28e5ef06b4 Use isPrimary bit to determine top provider am: 3096997718 am: 1955e67933
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343

Change-Id: Ibdba4a4a9d9e581ab2ab4b365a124dc3fb6ed5c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 00:19:06 +00:00
Becca Hughes
1955e67933 Use isPrimary bit to determine top provider am: 3096997718
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343

Change-Id: I9f410931f805bbf05bf3a7956a48483ed4388bee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 23:49:42 +00:00
Becca Hughes
4c657e3635 Use isPrimary bit to determine top provider am: 3096997718
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343

Change-Id: I8e6537d62ca6802adbdfadf9535cc4395dd6154c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 23:39:14 +00:00
Becca Hughes
3096997718 Use isPrimary bit to determine top provider
If the cred man provider has the isPrimary
bit set then we should use it as top
provider.

Test: ondevice
Bug: 280454916
Change-Id: I8c5651909d3926f09549c64af68185f1ef633198
2023-05-04 21:19:54 +00:00
Oli Thompson
465ff4f2d2 Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c am: 983c8081db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558

Change-Id: I051363cf71979cd50d1b3f22032aecdcbd99c72f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 20:05:41 +00:00
Oli Thompson
3c003a0300 Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c am: a99e532ce8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558

Change-Id: If9125a6c97bfb3520e2ee31f68e178c604f29f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 19:14:11 +00:00
Oli Thompson
a99e532ce8 Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558

Change-Id: I7af3a61b06c9922be100dbba9a2bd0b58ba784d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 18:57:31 +00:00
Guangjie (Jerry) Shi
6e2724c62d Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f am: f3e24a0595
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498

Change-Id: Iad77b961d8b9352e14732a9bfb0311e23dac7348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 18:54:02 +00:00
Oli Thompson
983c8081db Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558

Change-Id: I75481f3d79891dba6f6fd5b1355433e288dac3a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 18:53:30 +00:00
Guangjie (Jerry) Shi
01e1a4c0fd Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f am: 38a3645ad1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498

Change-Id: I8ad61423e61cd583fb9698c469935a6618ab83d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 18:39:36 +00:00
Xiaozhen Lin
1e3a085121 Merge "Password clearing in Settings App" into udc-dev am: be911918d0 am: cf18fba86c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954

Change-Id: Ia1c9dfaa13adb5a97f2e6a562e99134c4ca3bb79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 18:38:49 +00:00
Xiaozhen Lin
8a16522a44 Merge "Password clearing in Settings App" into udc-dev am: be911918d0 am: b0df220382
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954

Change-Id: Ifb3b9d5ab39f06d954163d46e3ff7c339b385e72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 18:32:21 +00:00
Oli Thompson
69fcc2ba5c Merge "Change icon in settings work challenge" into udc-dev 2023-05-04 18:28:23 +00:00
Guangjie (Jerry) Shi
38a3645ad1 Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498

Change-Id: I3beee0f10d1f007b8df76f3871a01bae7121d013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 17:55:30 +00:00
Guangjie (Jerry) Shi
f3e24a0595 Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498

Change-Id: Ie4d4a6cdc9e94ce2143255e7f380ff7492abe825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 17:54:31 +00:00
Xiaozhen Lin
b0df220382 Merge "Password clearing in Settings App" into udc-dev am: be911918d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954

Change-Id: I6706bf4e642f5a7dbfdd6ec6f328382644407b04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 17:54:02 +00:00
Xiaozhen Lin
cf18fba86c Merge "Password clearing in Settings App" into udc-dev am: be911918d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954

Change-Id: I13fad162f2d5f1b92ee90a079dea99fc68114c7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 17:52:46 +00:00
Guangjie (Jerry) Shi
817ee8489f Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev 2023-05-04 17:33:03 +00:00
Xiaozhen Lin
be911918d0 Merge "Password clearing in Settings App" into udc-dev 2023-05-04 17:09:34 +00:00
Lucas Silva
f1183c161b Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a am: 5cd017f470
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698

Change-Id: I50f6924f38b0252135ae579d222aa8085a3dc5e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:10:25 +00:00
Lucas Silva
69b0fd5d45 Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a am: 86231b9ec5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698

Change-Id: If7e797520ae040dc9439b6c304da6afb9c09ca84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:09:46 +00:00
TreeHugger Robot
878a4ac1df Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5 am: 76edddc1c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321

Change-Id: Ia5830736de9c3d15256343f579e5e022feaf1d30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:09:39 +00:00
Lucas Silva
5cd017f470 Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698

Change-Id: I067595333640ccba5b76f54a2b529049869192c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:06:07 +00:00
TreeHugger Robot
777e3778dd Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5 am: 1765b7d866
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321

Change-Id: I4784eabb88684a4d18bf0bee1947f4178babe973
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:05:54 +00:00
Jerry Shi
645ba04085 Modify the usage of setEnabledProvider to temporarily passed in empty
list.

Test: local test
Bug: 280492574

Change-Id: Id13aea203636527bcda745727aae417b2a8e289c
2023-05-04 08:57:43 -07:00
Lucas Silva
86231b9ec5 Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698

Change-Id: I6bef5d5f5c4730c8832436b03242315aa4098f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 15:48:46 +00:00
Lucas Silva
d66bde103a Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev 2023-05-04 15:37:25 +00:00
TreeHugger Robot
1765b7d866 Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321

Change-Id: I2f1bdfb9c562ecc3809376e1dfa471388cb5451a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 15:27:32 +00:00
TreeHugger Robot
76edddc1c5 Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321

Change-Id: I97766d9ecac3a7de66d7d1b66a95264c14049a69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 15:23:05 +00:00
TreeHugger Robot
3a2b8e81e5 Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev 2023-05-04 14:57:36 +00:00
Vania Januar
fb7c1766a8 Replace placeholder icons with stylus icons
Bug: 250909304
Test: manual
Change-Id: I738a262ea0e3f03408c892adb758b99dd6d47386
2023-05-04 11:24:39 +00:00
Chaohui Wang
eac485f661 Merge "Update for getSystemPackageNames" into udc-dev am: 3f4820bdf1 am: e9540185f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948670

Change-Id: I48ca3f2af4dfcb3db4b998b94cc0232048ecd265
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 11:10:53 +00:00
Chaohui Wang
dd3458d125 Merge "Update for getSystemPackageNames" into udc-dev am: 3f4820bdf1 am: 77d967d713
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948670

Change-Id: I308e86901dd8c4351287446b7253ddffb1f3a3e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:31:20 +00:00
Chaohui Wang
e9540185f1 Merge "Update for getSystemPackageNames" into udc-dev am: 3f4820bdf1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948670

Change-Id: I49f8c6cd6294cfb44d176f4dd79e7b4b8804b0ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:30:46 +00:00
Chaohui Wang
77d967d713 Merge "Update for getSystemPackageNames" into udc-dev am: 3f4820bdf1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948670

Change-Id: I45f674b17b68eee4c3c7246eaf5d11c80666f48e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 09:59:12 +00:00
Daniel Huang
80155a1f9f Merge "Fix Multiple UI issues" into udc-dev am: 4f541df33e am: da19d4a244
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985401

Change-Id: I4226404e458e9f45aee3bcae3dacfd3228077ba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 09:59:01 +00:00
Treehugger Robot
c78f69ccbd Merge "Support incompatible charger state in the battery main page" into udc-dev am: 54de6fd80b am: c1607192c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981565

Change-Id: I8c7674799e4dbf46957699cba13d27b058c686e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 09:55:41 +00:00