Commit Graph

2659 Commits

Author SHA1 Message Date
Guangjie (Jerry) Shi
570bdf7331 Merge "Use correct filter" into udc-dev am: cf440dcae5 am: 9355fbfa8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048001

Change-Id: I4ddcaefd09384d27922cafd36bd702d5b46b2525
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 04:01:31 +00:00
Guangjie (Jerry) Shi
cf440dcae5 Merge "Use correct filter" into udc-dev 2023-05-06 02:38:26 +00:00
Treehugger Robot
e8873adcce Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d am: b91facbb79
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: Ia4158d64795d0f9060ae2984d3de6fa1b1ff870e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 00:15:24 +00:00
Becca Hughes
29e62f898e Fix settings live update am: 481be6dde4 am: eb5c65a43b am: dd4b33d784 am: 5e9b4bf2e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

Change-Id: Icb7383cefd84ed93a31b7e463093f185ee8497f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 00:01:25 +00:00
Becca Hughes
ed295c248e Use correct filter
Test: TH
Bug: 280908763
Change-Id: I8a80e8533578b5e0b7a9b516c488b3602d18feef
2023-05-05 23:42:29 +00:00
Becca Hughes
5e9b4bf2e2 Fix settings live update am: 481be6dde4 am: eb5c65a43b am: dd4b33d784
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

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

Change-Id: I43a4d9dd08534bafb9599ece6889629ac9a5b9ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 23:28:14 +00:00
Becca Hughes
97d865845c Fix newly installed providers bug am: 17a0266b16 am: fa5c54dcaf am: b15ed12119
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048200

Change-Id: I93dab6fc16e7888bdef5886d857897cbafa93085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 22:21:18 +00:00
Becca Hughes
293e348606 Fix newly installed providers bug am: 17a0266b16 am: a4a355ed92
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048200

Change-Id: I738543af72a781e78198165f86c18166d68fa5b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 22:01:43 +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
b15ed12119 Fix newly installed providers bug am: 17a0266b16 am: fa5c54dcaf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048200

Change-Id: I4364111601f67e6661dd7b6f09ef7f36361769db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 21:39:26 +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
Guangjie (Jerry) Shi
7096d488d4 Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527 am: 5ea3d20578 am: b9853fd9f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23055667

Change-Id: Ic6462c987370c9c3ba3731747328fcab2b5a31d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 18:51:02 +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
2b377dbe6c Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527 am: 918e3637b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23055667

Change-Id: I1b81056efecaffee6c46d870bf8e3d7fd2819097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 18:06:48 +00:00
Guangjie (Jerry) Shi
b9853fd9f4 Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527 am: 5ea3d20578
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23055667

Change-Id: Id318cb90a4fe3d364cb91c4a6b3228835860c6a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 18:06:33 +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
Becca Hughes
e69657227a Use isPrimary bit to determine top provider am: 3096997718 am: 1955e67933 am: 28e5ef06b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343

Change-Id: Ic885a62a7273e27b26235bd5a05f2ca5f2dfbce4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 01:27:56 +00:00
Becca Hughes
34e0a12753 Use isPrimary bit to determine top provider am: 3096997718 am: 6464b82525
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343

Change-Id: Ib2ca71277a44069e1b0f91ac704374e3056d72de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 00:20:25 +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
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
Guangjie (Jerry) Shi
5fb7bdb79b Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f am: f3e24a0595 am: 22776f3097
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498

Change-Id: Ifcbe53717c43cfc198edf5731806f47b850cc396
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 18:39:45 +00:00
Guangjie (Jerry) Shi
22776f3097 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: I8bbf72d419885144d48d52c2458bf3322a18619b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 18:15:26 +00:00
Guangjie (Jerry) Shi
b3b3342c89 Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f am: b3b562cd34
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498

Change-Id: I8b81873853261b242fc02df9dc48c466b5401295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 18:14:25 +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
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
Becca Hughes
027c7213ab Merge "Align settings with new mocks" into udc-dev am: 21733fa106 am: 6f600f1ddf am: 4326242066
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923

Change-Id: Ia03bc602567d208bec44d619882684a71077b6bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 18:00:29 +00:00
Becca Hughes
b20744c9fc Merge "Align settings with new mocks" into udc-dev am: 21733fa106 am: 454cfbf2cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923

Change-Id: I535bbe38e6ac91ed1c635c5ac8d8a399d4f701ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 17:41:11 +00:00
Becca Hughes
1c5bfbeafd Merge "Align settings with new mocks" into udc-dev am: 21733fa106 am: 1022918da5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923

Change-Id: Ica4092467ac4a290b5f1a5ec0f7c7905e3928755
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 17:36:09 +00:00
Becca Hughes
6f600f1ddf Merge "Align settings with new mocks" into udc-dev am: 21733fa106
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923

Change-Id: I563b006d6eccc442dd63a39bca10a8bd82eb690e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 16:36:54 +00:00
Becca Hughes
dbee9f7670 Fork autofill default app selection am: ddf359d0f8 am: 02e4e1d05f am: b66c783024
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922

Change-Id: Iffbc0657ff72e99eaf4d4b09f083e1acb7326e65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:11:21 +00:00
Becca Hughes
b21df6c5fc Align settings with new mocks
Test: ondevice
Bug: 278919696
Change-Id: I274126bce3616596c4a81dd3385f0844d8bdbf71
2023-05-02 23:50:22 +00:00
Becca Hughes
428811be05 Fork autofill default app selection am: ddf359d0f8 am: 270b54d8a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922

Change-Id: I63239ddc7d287a32afc9b686fe83d1aefef8587b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 23:49:18 +00:00
Becca Hughes
5215358c2c Fork autofill default app selection am: ddf359d0f8 am: 02e4e1d05f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922

Change-Id: Iffea8157079911c9a26de9cf8f03c3cea3f6d3fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 23:31:48 +00:00
Becca Hughes
b66c783024 Fork autofill default app selection am: ddf359d0f8 am: 02e4e1d05f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922

Change-Id: I5c3133f66d3c0245b408946fdcbeffa9f4f91018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 23:27:42 +00:00
Becca Hughes
476e6769eb Fork autofill default app selection am: ddf359d0f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922

Change-Id: I52df2333cec85e89f24940c7a463a5ce57f50655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 22:47:57 +00:00
Becca Hughes
58cc818200 Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd59b am: c5f2edcb4c am: 1ac2d51e73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585

Change-Id: Iceef860c979f74c2b3ee2d9ae774202964262164
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 22:29:28 +00:00
Becca Hughes
09b2df4303 Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd59b am: c5f2edcb4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585

Change-Id: I490298203b8748898ae07ca00a9372241b2e6199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 21:46:55 +00:00
Becca Hughes
ebb465971b Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd59b am: bee80de992
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585

Change-Id: Iceb6a59344669bb640fd50ab51eb8c50dc27cab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 21:42:55 +00:00
Becca Hughes
1ac2d51e73 Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd59b am: c5f2edcb4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585

Change-Id: I1bbab46eacf48ee4ce8aa9f176017177eab80c1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 21:42:54 +00:00
Becca Hughes
b31c4909db Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd59b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585

Change-Id: I6a7611e31c835d41eb53a1160bd7d7aa68b9f0ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 21:00:01 +00:00
Becca Hughes
ddf359d0f8 Fork autofill default app selection
We are merging the default app selection for autofill
with credman so this forks the existing UI (so we can
flag it off).

Test: ondevice
Bug: 278919696
Change-Id: I96bcf1ff86b169a182b9974f7384c45b474c3d5d
2023-05-02 20:31:14 +00:00
Becca Hughes
ea03b3e2a0 Add combined provider class that manages new settings UI
Example of how to use: https://paste.googleplex.com/6523798525313024

Test: make
Bug: 278919696
Change-Id: I934a5f6d02b50f8c97bda6d997902a42ff88e26f
2023-05-02 17:37:44 +00:00
George
2da88dcfb5 Fork the NfcTagAppsSettings page to SPA am: 750cd809fe am: 81fe8bb38e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22939919

Change-Id: Icb95d7948769e699079d8cc138f7c26f5304e602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 14:45:12 +00:00
George
81fe8bb38e Fork the NfcTagAppsSettings page to SPA am: 750cd809fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22939919

Change-Id: Ia6b29eaaec791ba54797513905b302289c3d4b09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 12:52:03 +00:00
George
750cd809fe Fork the NfcTagAppsSettings page to SPA
The page is located at "Apps > Special app access > Nfc launch"

Bug: 267404181
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NfcTagAppsPreferenceControllerTest
Change-Id: I9fb4a68634f0b6f20d5f87601c1175ced33daad5
2023-05-02 10:15:53 +00:00
Becca Hughes
7fdbfc7b0e Revert "Rollback decision to merge by package name"
This reverts commit ca542c90cd.

Reason for revert: product changed mind

Change-Id: Ic4b9275e8f19bf2b3e3e51f09162fb6d45e6a5bf
2023-04-28 21:06:00 +00:00
Treehugger Robot
9ed2ac48fb Merge "[Settings] Update code owner" am: 709b27384b am: c40b06b687 am: a6f0662924 am: 0469be62f0 am: 82296631cd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2527125

Change-Id: I81730fe484cd19aec2a97e43f2f4d7e57ec4672a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 05:53:26 +00:00
Treehugger Robot
0469be62f0 Merge "[Settings] Update code owner" am: 709b27384b am: c40b06b687 am: a6f0662924
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2527125

Change-Id: I63b80b09c29c9d41f7b950c7a63955088e17824e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 18:02:40 +00:00