TreeHugger Robot
2d95f7cb18
Merge "Fix broken battery usage Robolectric tests"
2022-10-17 08:18:59 +00:00
Zaiyue Xue
1c457ce101
Fix broken battery usage Robolectric tests
...
Bug: 253385659
Fix: 253385659
Test: presubmit
Change-Id: I4f09f9e5af57a62249970cc2170b60dab267488e
2022-10-17 15:14:29 +08:00
Zoey Chen
f8eb29606b
Merge "[Settings] Change the way in MobileNetworkSummaryController for getting the subscription info from room db"
2022-10-17 03:12:08 +00:00
Betty Chang
15066fe36e
Merge "[LE Audio] Add LE Audio Devices in Sound Settings" into tm-qpr-dev am: b2269caa45
am: 90a1263b87
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20176143
Change-Id: I535cbd8acbf40182f2f43df27b56462cc24674bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-15 05:37:12 +00:00
Betty Chang
90a1263b87
Merge "[LE Audio] Add LE Audio Devices in Sound Settings" into tm-qpr-dev am: b2269caa45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20176143
Change-Id: I207add249654cc4963ee065b0b161e94c24e9b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-15 05:03:37 +00:00
Betty Chang
b2269caa45
Merge "[LE Audio] Add LE Audio Devices in Sound Settings" into tm-qpr-dev
2022-10-15 04:38:00 +00:00
Pajace Chen
65a44582b9
Merge "Fix failed test case for BatteryInfoTest"
2022-10-14 23:59:09 +00:00
Julia Tuttle
431d967b6d
Fix some out-of-order imports am: 9f0efa68a1
am: 16b7c91e5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20193425
Change-Id: I7ac72e785fff82674f3bf47546044ab92a0acf74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-14 19:50:17 +00:00
Julia Tuttle
16b7c91e5e
Fix some out-of-order imports am: 9f0efa68a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20193425
Change-Id: I85de5768359802bd1800bc88b7ab490631c280e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-14 19:03:13 +00:00
Pajace Chen
720602b900
Fix failed test case for BatteryInfoTest
...
Test: atest SettingsRoboTests:BatteryInfoTest
Change-Id: Ia83af3a7075ee80b27345ca74d02a2d94b88a51d
2022-10-14 22:01:54 +08:00
Zoey Chen
a87affdb82
[Settings] Change the way in MobileNetworkSummaryController for getting the subscription info from room db
...
Bug: 236919685
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkSummaryControllerTest
Change-Id: If417b792224261ad1965196d3675f28f55448fd6
2022-10-14 12:19:16 +00:00
TreeHugger Robot
981458c8ac
Merge "Refine the check restriction function in WifiEntryPreference"
2022-10-14 07:44:21 +00:00
changbetty
1096417464
[LE Audio] Add LE Audio Devices in Sound Settings
...
- When connected to the LE Audio Device, it will display "Play XXX on
LEAduioDeviceName" in Sound Settings.
- When connected to the LE Audio Device, it will display the LE Audio
device name in the "Take call on" list for you having a active call(Hands Free).
- Remove the @Ignore annotation for all the tests and make test
cases pass.
Bug: 240911615
Bug: 243494881
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AudioOutputSwitchPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HandsFreeProfileOutputPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaOutputPreferenceControllerTest
Change-Id: I10db59b33623495a9e9933556c78e20d81e405ea
2022-10-14 06:10:52 +00:00
Chaohui Wang
cf26d6ba5e
Merge "Add AppTimeSpentPreference for Spa"
2022-10-14 03:27:37 +00:00
Julia Tuttle
9f0efa68a1
Fix some out-of-order imports
...
Bug: 20188695
Test: build
Change-Id: I47d463f82bee4e1b22300eb4260dd38dbeb13c88
2022-10-13 21:55:46 -04:00
Chloris Kuo
6e64305274
Disable Enhanced notifications setting when default NAS is not available am: 236eaed326
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20188999
Change-Id: I68d337b4d5b947a7e0af817cb0c76039df18dbf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-13 20:42:21 +00:00
Jackson Michael Moreira Miranda
f81ae05d26
Merge "Adding the sections "Allow multiple users" and "Delete guest activity" on the search result"
2022-10-13 17:00:19 +00:00
Chloris Kuo
236eaed326
Disable Enhanced notifications setting when default NAS is not available
...
Test: NotificationAssistantPreferenceControllerTest
Bug: 251400808
Change-Id: Idec520013bea32cfaea0285f33c525a6e37f0124
(cherry picked from commit 873b8544e1
)
2022-10-13 16:27:35 +00:00
Chloris Kuo
064b960554
Merge "Disable Enhanced notifications setting when default NAS is not available"
2022-10-13 16:27:05 +00:00
Chaohui Wang
b2fdc25a6e
Add AppTimeSpentPreference for Spa
...
Bug: 236346018
Test: Manual with App Info page
Test: atest SettingsSpaUnitTests
Change-Id: Ia707dc57222797536861a7366a31aafaf91b677b
2022-10-14 00:14:39 +08:00
Jackson Michael
898421bd0c
Adding the sections "Allow multiple users" and "Delete guest activity" on the search result
...
Also added new keywords strings for the both items.
Bug: 245261104
Test: Manual test and unit test
Change-Id: I3ddc1204c6dbdcd6a82ffaa55f4ca7f4bcb3783d
2022-10-13 12:31:03 +00:00
Chaohui Wang
763f3c7521
Merge "Add AppStoragePreference for Spa"
2022-10-13 11:18:47 +00:00
Wei Wang
fcd3c608bf
Ignore all failing tests in Settings for now in order to unblock ATP V2
...
migration
Test: m RunSettingsRoboTests passed on desktop
Change-Id: I2450aaa083aabdf224e070f588441bb01206972b
Bug: 252671269
2022-10-13 17:29:36 +08:00
Chaohui Wang
bb4d0250bb
Add AppStoragePreference for Spa
...
Also add new SettingsSpaUnitTests.
Bug: 236346018
Test: Manual with App Info page
Test: atest SettingsSpaUnitTests
Test: Manual compare generated Settings AndroidManifest.xml
Change-Id: I9f6b2ca446fd3d196792a876a6e4049c5cf97a1d
2022-10-13 17:21:08 +08:00
Chaohui Wang
a1042f2e2d
Merge "Rename AppSettings to AppInfoSettings for Spa"
2022-10-13 06:04:41 +00:00
Behnam Heydarshahi
ee4d902410
Merge "Add notification volume controller in settings" into tm-qpr-dev am: 7f6c833b89
am: 8b2496eb9e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19940409
Change-Id: Ia1b13bf425da2ef90c287b3aaee6231891c67bd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-12 20:38:18 +00:00
Behnam Heydarshahi
8b2496eb9e
Merge "Add notification volume controller in settings" into tm-qpr-dev am: 7f6c833b89
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19940409
Change-Id: Iffd5dcd7eb9ad645807d9529f352582457dc3f0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-12 20:07:05 +00:00
Weng Su
10ef69316f
Refine the check restriction function in WifiEntryPreference
...
- Move checkRestrictionAndSetDisabled function from WifiEntryPreference to necessary child-classes to avoid impacting other child-classes such as SavedAccessPointsPreference.
- Avoid adding ShadowRestrictedPreference to the unnecessary test class.
Bug: 233871529
Test: manual test
make RunSettingsRoboTests
Change-Id: Ia2145401558b293b5f4eaa0860f83b7d3bbab548
2022-10-13 03:52:08 +08:00
Behnam Heydarshahi
7f6c833b89
Merge "Add notification volume controller in settings" into tm-qpr-dev
2022-10-12 19:37:26 +00:00
Raphael Kim
98ace3f8f2
Merge "Fix build error from AssociationInfo constructor change"
2022-10-12 18:43:42 +00:00
Chloris Kuo
873b8544e1
Disable Enhanced notifications setting when default NAS is not available
...
Test: NotificationAssistantPreferenceControllerTest
Bug: 251400808
Change-Id: Idec520013bea32cfaea0285f33c525a6e37f0124
2022-10-12 11:05:25 -07:00
Chaohui Wang
d44e2ad3f6
Rename AppSettings to AppInfoSettings for Spa
...
To align with current naming.
Bug: 236346018
Test: Make Settings App
Change-Id: I20b2423faf5ee433a530e6a963dd6bb3de33ba90
2022-10-12 19:00:59 +08:00
Xuanang Zhao
bac24478a1
Merge "Fix the slice provider test."
2022-10-12 10:14:24 +00:00
Xuanang Zhao
890d8d2940
Fix the slice provider test.
...
Change-Id: Ia711b6f66ef7737f57f388b16f9fb9586727e395
Bug: 249101421
2022-10-12 08:33:26 +00:00
Chaohui Wang
2fc09c5117
Clean up AppPermissionSummaryJavaTest
...
Kotlin Robolectric test could be directly run.
Bug: 236346018
Test: m RunSettingsRoboTests
Change-Id: I0a520236191655d01f2c4b81454627a73a271da5
2022-10-12 16:01:52 +08:00
Hugh Chen
b1fac0fb92
RESTRICT AUTOMERGE Refactoring settings UI am: f891f7ba86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20034710
Change-Id: I2e6bb7660f690b2aa2db5a2ef4c628e406d674c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-12 06:35:46 +00:00
Wei Wang
f71883b2bb
Merge "Fix tests broken by below CL:"
2022-10-12 05:54:54 +00:00
Wei Wang
878ce96163
Fix tests broken by below CL:
...
platform/packages/apps/Settings/+/0fe65b582abde16c1b46cb314a8358752cef1658
Change-Id: Ie6b6b7ffca15476a05e363fc68d2fa4ba0693895
Test: m RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.wifi.p2p.WifiP2pSettingsTest.*"
Bug: 252671269
2022-10-12 05:54:34 +00:00
Lauren Winston
246597c1ac
Merge "Revert "Add a cursor preference to Accessibility Settings""
2022-10-11 23:00:34 +00:00
Lauren Winston
4f493778a6
Revert "Add a cursor preference to Accessibility Settings"
...
This reverts commit 205018a854
.
Reason for revert: Software Cursor not launching in Android U
Change-Id: Ieddc6b27a8a28910e7c12328ee6d1b5e0d2e4c17
2022-10-11 18:32:27 +00:00
Chaohui Wang
2b11c1fe12
Add AppPermissionPreference for Spa
...
This is the permission preference in the App Settings page.
The summary is single line.
Add the first Kotlin Robolectric Test for Settings, since Kotlin is not
directly supported by the Robolectric test, using a Java class as a
wrapper.
Bug: 236346018
Test: Manual with App Settings page
Test: Robolectric Test
Change-Id: Ic5a4f7d965885a9cd143428a8cd1900981e316a9
2022-10-11 09:15:26 +00:00
Hugh Chen
f891f7ba86
RESTRICT AUTOMERGE Refactoring settings UI
...
Bug: 248174653
Test: build & boot pass
Change-Id: I124a65941349d3338145865cae2c8354678897fa
2022-10-11 04:30:09 +00:00
Behnam Heydarshahi
3ac6aaf796
Add notification volume controller in settings
...
Separate notification and ring controllers based on the ring/volume
stream alias boolean in config.xml.
For both ring and volume controller: Not show vibrate icon when vibration is not supported on device. Show
silent icon instead.
Known issue: Add the notification volume slider only in Settings, and
not in VolumePanelDialog. When the alias is set to false and the streams
separated, the ring volume slider in VolumePanelDialog keeps its title
of "Ring & notification volume" instead of changing to "Ring volume".
Bug: b/38477228
Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=NotificationVolumePreferenceControllerTest RunSettingsRoboTests -j40
make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=RingVolumePreferenceControllerTest RunSettingsRoboTests -j40
make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=SoundSettingsTest RunSettingsRoboTests
Change-Id: Id17523f49b291a5cf612b90f93c3b2ab6486c62f
2022-10-10 14:42:56 +00:00
Chaohui Wang
41716cd24e
Update onPermissionSummaryResult()
...
standardGrantedPermissionCount is removed.
Bug: 236346018
Test: m Settings
Change-Id: Id1b6a7d5302416f073e342d5b0d70b9b3dd102f0
2022-10-09 19:36:40 +08:00
Chaohui Wang
a947e88c9f
Clean up unused AppPermissionsPreferenceController
...
This one is replaced by AppPermissionPreferenceController.
Bug: 234570979
Test: m Settings
Change-Id: Id9d16caf33cdea626f79a3cd142dfcde2c54769f
2022-10-09 15:42:01 +08:00
TreeHugger Robot
88f9c8fe7e
Merge "Do not show 2nd FingerprintErrorDialog" into tm-qpr-dev am: 4fd86cc096
am: 45bab9ddc4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20120050
Change-Id: Ia6c96f2c1f1ea869f1fdaebeebd977b0e1612263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-08 07:53:32 +00:00
TreeHugger Robot
45bab9ddc4
Merge "Do not show 2nd FingerprintErrorDialog" into tm-qpr-dev am: 4fd86cc096
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20120050
Change-Id: I68b6a8afeb51b04b1c48cf7e4c94e6e9ff5f346e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-08 07:21:06 +00:00
TreeHugger Robot
4fd86cc096
Merge "Do not show 2nd FingerprintErrorDialog" into tm-qpr-dev
2022-10-08 06:54:15 +00:00
Evan Severson
38eb8fea44
Merge "Make SensorToggleControllers lifecycle aware"
2022-10-07 19:11:16 +00:00
TreeHugger Robot
2d83f8b5bf
Merge "Show policy transparency dialog if adding Wi-Fi config is not allowed"
2022-10-07 08:12:56 +00:00