TreeHugger Robot
bd41fe5a5b
Merge "Prevent leaking Wi-Fi dialog on lock screen" into tm-qpr-dev
2022-07-19 17:02:10 +00:00
Jason Chiu
c89755525f
Update all preferences when the account preference updates UI
...
When an account is added or removed, the account preference controller
just updates the account list, whereas there's no trigger point for the
account data sync preferences to refresh.
Add an API to update all preferences in DashboardFragment, so we can
refresh the account sync preferences whenever the account list is
updated.
Bug: 185479221
Test: robotest, manual
Change-Id: Ide3d972abae09ce0175e3bafbb1f4a5e307d20c8
2022-07-19 10:32:23 +00:00
Sorin Basca
e2b0873f9c
Use Mockito 4.6.1 API
...
Bug: 236636175
Test: m RunSettingsRoboTests
Change-Id: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
(cherry picked from commit c1c3a84fdc
)
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
(cherry picked from commit 61e0bcd194
)
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
2022-07-19 09:07:28 +00:00
TreeHugger Robot
91aec69fdc
[conflict] [conflict] Merge "Use Mockito 4.6.1 API" into tm-dev-plus-aosp am: ac6af411ed
am: 326c0ea30c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19305127
Change-Id: I52547d10f0579fddb21091b641925910db17ef38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
2022-07-18 22:39:07 +00:00
Simon Wingrove
ef498ef53d
Distinguish multiple PendingIntents via requestCode am: 25686219d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19289844
Change-Id: Id8509feac060578cf8d7ffb4d7a7b9def221f029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-18 19:19:15 +00:00
Simon Wingrove
25686219d3
Distinguish multiple PendingIntents via requestCode
...
Settings uses a system of intent extras to open subsettings pages. When
PendingIntents are created from these Intents, the system does not think
they are unique as extras are not included in this equality check. So
only one of them is likely to work.
A unique request code can be used to distinguish between them.
Bug: 238605613
Test: atest LockScreenSafetySourceTest
Merged-In: Ia59197eeb86e988d9ffbb86caff4bbda7b30f059
Change-Id: Ia59197eeb86e988d9ffbb86caff4bbda7b30f059
(cherry picked from commit f2b0cedcd0
)
2022-07-18 11:18:28 +00:00
TreeHugger Robot
326c0ea30c
[conflict] Merge "Use Mockito 4.6.1 API" into tm-dev-plus-aosp am: ac6af411ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19291449
Change-Id: Ifce8e49a098d2e745f15348eb2d318d347366e31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
2022-07-16 09:09:57 +00:00
Sorin Basca
b9503775c0
Use Mockito 4.6.1 API
...
Bug: 236636175
Test: m RunSettingsRoboTests
Change-Id: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
(cherry picked from commit 61e0bcd194
)
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
2022-07-16 07:57:52 +01:00
Sorin Basca
61e0bcd194
Use Mockito 4.6.1 API
...
Bug: 236636175
Test: m RunSettingsRoboTests
Change-Id: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
(cherry picked from commit c1c3a84fdc
)
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
2022-07-15 20:05:37 +00:00
TreeHugger Robot
f14704504b
Merge "Check portal on fingerprint intro page" into tm-qpr-dev am: 9fcf073bab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19267972
Change-Id: I738b4d76e633f359cdaedc4fee43f0975c60e7e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 00:33:48 +00:00
TreeHugger Robot
9fcf073bab
Merge "Check portal on fingerprint intro page" into tm-qpr-dev
2022-07-15 00:08:59 +00:00
Milton Wu
bd966754ce
Check portal on fingerprint intro page
...
Check SUW portal flag on Fingerprint introduction page. Do not use
suw_max_fingerprints_enrollable as fingerprint count if portal flag is
enable.
Bug: 235655422
Test: m RunSettingsRoboTests \
ROBOTEST_FILTER=FingerprintEnrollIntroductionTest
Test: Manually test "Add another finger" on Deferred and Portal
suggested actions page
Change-Id: I2789d95fb214b5da6d8d03ef77583d064652e69e
2022-07-14 05:28:46 +00:00
TreeHugger Robot
a51b1baeaa
Merge "Support multi-user privacy for battery usage chart" into tm-qpr-dev am: fedab69c9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19235726
Change-Id: I2d241c16e537f0131a95f70528dd47c75791f0ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 16:54:06 +00:00
TreeHugger Robot
fedab69c9a
Merge "Support multi-user privacy for battery usage chart" into tm-qpr-dev
2022-07-12 16:40:32 +00:00
Amy Hsu
a067fba01f
Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8
am: f51951c9d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855
Change-Id: If81fa8f115b89eb458b02736276940d8148458e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 04:47:15 +00:00
Amy Hsu
ef540c685d
Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855
Change-Id: I7f6bf6ad05de82ad77ced5bd776c3602f4057290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 04:15:31 +00:00
Amy Hsu
f51951c9d3
Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855
Change-Id: Ie9b806a127e7eced1b9d790beb874e712e452de5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 04:15:21 +00:00
Amy Hsu
1f7fab03c8
Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev
2022-07-12 03:54:27 +00:00
Hugh Chen
e88be4859c
RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings am: f5166f46e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753589
Change-Id: Ida6c1387588887b78f33de9f655b5397d04c4258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 00:00:14 +00:00
Robert Luo
bc66c0aba9
Merge "RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings" into tm-qpr-dev
2022-07-11 23:36:02 +00:00
Hugh Chen
95d2add6a2
RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings am: 858e6ff3d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753588
Change-Id: I6ba14905e50fb1fad3036cd91a8d2c9ceac2621e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-11 23:09:47 +00:00
TreeHugger Robot
f38e8e6194
Merge "RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings" into tm-qpr-dev
2022-07-11 22:50:58 +00:00
ykhung
764d513d00
Support multi-user privacy for battery usage chart
...
When there are multiple accounts in the devices, the battery usage list
is shared in the current design. We will aggregate other users usage
data into a single item to support multi-user privacy requirements
Screenshot: https://screenshot.googleplex.com/AkFTUtNvnoxcuGR
Bug: 202119550
Test: make RunSettingsRoboTests
Change-Id: I6cb55f0d50a4caca83212a0a54410530a032c089
2022-07-12 00:17:43 +08:00
Weng Su
be23c28ff2
Prevent leaking Wi-Fi dialog on lock screen
...
- The Wi-Fi dialog is designed to be displayed on the system UI
- Dismiss Wi-Fi dialog to prevent leaking user data on lock screen
Bug: 231583603
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest
Change-Id: Ie67ff1138ffeddd3e358331d8cef61e0629173e2
2022-07-08 05:43:10 +08:00
Amy Hsu
7087e5c457
[RRS] Activate investigation of screen_resolution in settingsstats
...
Define a setting string for putting data for suez/settingstats.
Bug: 234035619
Test: Manually check ScreenResolution ap in Settings can work normally.
Merged-In: Ib4622490b0f63139b47f242ebcae916edf291cea
Change-Id: Ib4622490b0f63139b47f242ebcae916edf291cea
2022-07-07 08:15:47 +00:00
TreeHugger Robot
7bdfb34b7b
Merge "Ignore CRLF strings in display SSIDs to avoid display errors" into tm-qpr-dev am: 9447ec6d81
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19168028
Change-Id: I37125c165dbb9d48d672666512faec8248bce5d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-06 19:49:52 +00:00
Weng Su
08adf4c2ed
Ignore CRLF strings in display SSIDs to avoid display errors
...
- Keep user-entered SSIDs in Wi-Fi Configuration
- Ignore CRLF strings in display SSIDs only
Bug: 224545390
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest
Change-Id: Ifc081f9c5c02b2d70412f296688b88e44e893add
2022-07-05 03:18:26 +08:00
Joshua Mccloskey
54b7ac755a
Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc
am: e30a71787e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093051
Change-Id: I80312c96248ff2231386c154ebe0f9bf54ae4f34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 17:37:37 +00:00
Joshua Mccloskey
70a6062446
Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093051
Change-Id: If3bf0ca501d6a5bb460fa0ab05ae39239f34720e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 17:12:08 +00:00
Joshua Mccloskey
e30a71787e
Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093051
Change-Id: I4574d7014cfb6ca9050428e451654b9e8002995b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 17:12:05 +00:00
Joshua Mccloskey
431542dddc
Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev
2022-06-29 16:48:53 +00:00
Xin Li
b8d6e73355
Merge tm-dev-plus-aosp-without-vendor@8763363
...
Bug: 236760014
Merged-In: Ifcb9d4c564839199d998bd503f390f021c6bf3ad
Change-Id: I9d69bcbc6916176beece2616f152ebd3d74fc0f8
2022-06-28 21:23:28 +00:00
Joshua McCloskey
cdb654f9be
Fixed unicorn multi-enrollment flow.
...
Test: Verified that Unicorn SUW flows can now
enroll a face.
Test: Verified normal SUW flow works as expected.
Fixes: 237088482
Fixes: 234663447
Change-Id: I9c4100f61b5e7d40fc9ed67c6918ec7bf31fc30a
2022-06-28 17:08:40 +00:00
SongFerng Wang
f0973dfa33
Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" am: e27d1790f8
am: 2225b7058b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138453
Change-Id: Iecbe5647bbe469a0239b594692f66c0226e16df8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 11:45:09 +00:00
SongFerngWang
7c173b36f8
The UI only shows the active LE device am: 7f6fcce1d5
am: 787a0e0249
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138452
Change-Id: I6e57db85b4d10586d111e39dcd7ee77e67fd9d74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 11:45:05 +00:00
SongFerngWang
30a312975c
Fix the testcase error
...
The BluetoothDeviceUdater added the checking whether the item is in the
list. It caused this testcase failed.
Add more mocks for this testcase.
Bug: 237223797
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDevicesSliceTest
Change-Id: Idb746e42480f99846efb5d1e4d4a411a5a9ca296
Merged-In: Idb746e42480f99846efb5d1e4d4a411a5a9ca296
2022-06-28 15:18:39 +08:00
SongFerngWang
7f6fcce1d5
The UI only shows the active LE device
...
At the media device, it only shows the active LE device which is
connected.
Bug: 232892046
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=SavedBluetoothDeviceUpdaterTest
Change-Id: Iac661206def4d43bc40ab9bb1938f084926899c2
Merged-In: Iac661206def4d43bc40ab9bb1938f084926899c2
2022-06-28 15:03:07 +08:00
SongFerng Wang
8a00f325f4
Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9
am: c150fe528d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766
Change-Id: Icfcdf386740d4ad79d45923a9a0fce5c4306a5e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 06:35:52 +00:00
SongFerng Wang
2bcd1f3897
Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766
Change-Id: Ic44ab60d81ed96478ace362f50df8919fcfa52cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 06:20:38 +00:00
SongFerng Wang
c150fe528d
Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766
Change-Id: I2e79ea4100840627a21bd8797c9f1875b09c9161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 06:20:37 +00:00
SongFerng Wang
602fe375d9
Merge "Fix the testcase error" into tm-d1-dev
2022-06-28 05:57:21 +00:00
SongFerngWang
cefad1e4b7
Fix the testcase error
...
The BluetoothDeviceUdater added the checking whether the item is in the
list. It caused this testcase failed.
Add more mocks for this testcase.
Bug: 237223797
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDevicesSliceTest
Change-Id: Idb746e42480f99846efb5d1e4d4a411a5a9ca296
2022-06-27 20:42:31 +08:00
SongFerng Wang
6293d2a103
Merge "The UI only shows the active LE device" into tm-d1-dev am: dc72a4a14f
am: 0018589f09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910989
Change-Id: Ifb31acb46471b17244ad806986be4ba6c0bed56b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-26 17:24:01 +00:00
SongFerng Wang
7b3320804e
Merge "The UI only shows the active LE device" into tm-d1-dev am: dc72a4a14f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910989
Change-Id: I8aa0a982af28ba1a4f8386027ce0382d6b582bbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-26 17:02:19 +00:00
SongFerng Wang
0018589f09
Merge "The UI only shows the active LE device" into tm-d1-dev am: dc72a4a14f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910989
Change-Id: I43380dd3e84f63925c494038f9bb1c84207f2faa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-26 17:02:16 +00:00
SongFerng Wang
dc72a4a14f
Merge "The UI only shows the active LE device" into tm-d1-dev
2022-06-26 16:38:24 +00:00
Evan Chen
fc86787927
Merge "Update AssociationIno creation for Bluetooth test" into tm-qpr-dev am: bd2b5e7bfb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18744660
Change-Id: I45cdf05096add05a6702a703fc9287f0237bb8c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 04:52:37 +00:00
Evan Chen
bd2b5e7bfb
Merge "Update AssociationIno creation for Bluetooth test" into tm-qpr-dev
2022-06-24 04:25:49 +00:00
Bonian Chen
c1bd6bc6e3
Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31
am: e941740b35
am: 67556fac04
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040
Change-Id: I3aa2ebcdd16ff73296fbda1ce44441ba43bb4f39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 19:59:10 +00:00
Bonian Chen
a40112328c
Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31
am: e9cdc176a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040
Change-Id: I80200d5694abf84b7f540db8142b5f0f525cde49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 19:43:40 +00:00