Commit Graph

121921 Commits

Author SHA1 Message Date
Treehugger Robot
0e8839d15c Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: I4dd7fcb722810ecc8a844b5353f3b202b7e9f72c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 00:12:51 +00:00
Treehugger Robot
1dc52d159d Merge "Set primary services as enabled" into udc-dev 2023-05-05 23:40:43 +00:00
Becca Hughes
f736380002 Fix settings live update am: 481be6dde4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

Change-Id: I8c32d30c3460cdef22f2a8d34cd804b09a33eba0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 22:53:53 +00:00
Becca Hughes
4fe1f506dd Set primary services as enabled
Test: make
Bug: 281121157
Change-Id: Ide7902d0561fa6e513e90f8245da6a754c856ae7
2023-05-05 21:47:58 +00:00
Becca Hughes
fc4a33b355 Fix newly installed providers bug am: 17a0266b16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048200

Change-Id: Iddd9aacf9bcb06982a149dafc8ef634b3bf3f17c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 20:57:16 +00:00
Becca Hughes
481be6dde4 Fix settings live update
We were using a setting observer to watch
for changes but it was being cleaned up
because we did not hold a reference to
it.

Test: make
Bug: 280905737
Change-Id: I154951f47af20998e25d62a82a8e79f9c00fa027
2023-05-05 20:32:44 +00:00
Becca Hughes
17a0266b16 Fix newly installed providers bug
Package monitor was not registered
properly.

Change-Id: Ifde2e6027b2aee2355114c8ff9b0d1f542fa2f8d
Test: treehugger
Bug: 280867431
2023-05-05 18:27:26 +00:00
Guangjie (Jerry) Shi
6ee57bd7b8 Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23055667

Change-Id: I910b9821216fa1a5285193ce59b78525eb91aef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 17:23:30 +00:00
Guangjie (Jerry) Shi
2898e3b527 Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev 2023-05-05 16:45:37 +00:00
Jerry Shi
8d167d55f3 Do null check to account for the case where provider is only autofill
provider.

Test: local build
Bug: 281047738

Change-Id: I9f3dca118a0d4182e2d727fa011dcb48db2a553f
2023-05-05 14:59:27 +00:00
Chaohui Wang
7e441b2496 Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490

Change-Id: Ia1b143ca50843e865dd899cd1e1e7e1832027e34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 12:05:25 +00:00
Chaohui Wang
5b18837a49 Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev 2023-05-05 11:32:13 +00:00
Vania Januar
7f65b03c73 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: Ifba006b60361a77faea3e25e4cfa73e3aa53fa44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 10:41:27 +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
39bf7dd530 Fix dialog leak in RequestPermissionActivity
Dialog still show when activity destroyed will cause leak.

Dismiss dialog when activity onDestroy to fix this issue.

Fix: 279522922
Test: Manually with "Don't keep activities"
Test: Robolectric Test
Change-Id: I445f4b160020823a6f6e2883055218c1224e2c48
2023-05-05 17:30:02 +08:00
Chaohui Wang
ab3c6d568c 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: If7fe17060ef6fd3b0f554ee8480105373d27f3cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 08:17:00 +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
fa48499eb6 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: Id17ea588b11e85f971d66c5df1fc60ea09aed1e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 03:21:36 +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
ca5f384333 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: Ia96ff86deff46dcd51a1502058535ae5271aa5cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 02:35:06 +00:00
Daniel Huang
08b2b68e22 Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev 2023-05-05 02:33:13 +00:00
Bill Yi
bdba9f43ad [automerger skipped] Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE" am: e48fa8c19f -s ours am: eb890c8bf8 -s ours am: bdeb587767 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2576828

Change-Id: I103a5c2037a652321ed436047be159e845879b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 00:43:56 +00:00
Bill Yi
54f6fc6d11 [automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: 82c92ce15c -s ours am: 3f186b6b1c -s ours am: 649fb33ad4 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2576828

Change-Id: I5a2219a23ac792a1d8583b6345e8c46005f8e1d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 00:43:35 +00:00
Bill Yi
bdeb587767 [automerger skipped] Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE" am: e48fa8c19f -s ours am: eb890c8bf8 -s ours
am skip reason: Merged-In Ib0806c0bf18797da3e44dbe4800283430120b49a with SHA-1 c40b06b687 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2576828

Change-Id: I1912e8a1b21aae82c5ebd9c3f7daa14235d66978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 00:01:08 +00:00
Bill Yi
649fb33ad4 [automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: 82c92ce15c -s ours am: 3f186b6b1c -s ours
am skip reason: Merged-In Ib0806c0bf18797da3e44dbe4800283430120b49a with SHA-1 c40b06b687 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2576828

Change-Id: Ib13a4b9830161df33f6d36827fbdb6e584d9e54d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 00:00:53 +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
Bill Yi
eb890c8bf8 [automerger skipped] Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE" am: e48fa8c19f -s ours
am skip reason: Merged-In Ib0806c0bf18797da3e44dbe4800283430120b49a with SHA-1 c40b06b687 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2576828

Change-Id: I93c612069bd783894cfbc07e1f7e1028dd1a7780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 23:21:20 +00:00
Bill Yi
3f186b6b1c [automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: 82c92ce15c -s ours
am skip reason: Merged-In Ib0806c0bf18797da3e44dbe4800283430120b49a with SHA-1 c40b06b687 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2576828

Change-Id: I9fd542fb1505109f1e68ce2849d06061b7498093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 23:21:02 +00:00
Bill Yi
e48fa8c19f Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE" 2023-05-04 22:39:57 +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
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
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
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
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
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
d66bde103a Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev 2023-05-04 15:37:25 +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
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
Chaohui Wang
3f4820bdf1 Merge "Update for getSystemPackageNames" into udc-dev 2023-05-04 09:43:28 +00:00
Daniel Huang
8de64b59bf Merge "Fix Multiple UI issues" into udc-dev am: 4f541df33e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985401

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

Change-Id: I2cc06f818546475cb1951b0e02f44f9bf4add503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 09:03:24 +00:00
Daniel Huang
4f541df33e Merge "Fix Multiple UI issues" into udc-dev 2023-05-04 08:57:26 +00:00
danielwbhuang
55a3d089f9 Fix Multiple UI issues
1. Use edge-to-edge UI
2. Use new color token
3. Put text in the middle of the button

Bug:279163958
Bug:278504911

Test: manual
Change-Id: I189e9da2251f7d204ddc18680d3d1ec4638fa2db
2023-05-04 08:56:41 +00:00
Chaohui Wang
c16a088a73 Log app special permission change for SPA
Align with current logging and no package name.

Bug: 280575002
Test: Manually with App Op Permission pages
Change-Id: Ia0dde06769b1e08f8cec7cb1d87a8ca1baa80068
2023-05-04 16:36:02 +08:00
Treehugger Robot
54de6fd80b Merge "Support incompatible charger state in the battery main page" into udc-dev 2023-05-04 08:28:57 +00:00