Julia Reynolds
b495103ca7
Merge "Add link to more app settings"
2022-10-18 19:32:27 +00:00
Lucas Silva
947bf37e31
Merge "Update dream summary when dream suppressed by bedtime mode" into tm-qpr-dev am: 6a8e193fad
am: 5067d29ba4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20216381
Change-Id: Id7b947a04e655fe5d6e8b98c2fb8857be4cfb256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-18 18:15:24 +00:00
Lucas Silva
5067d29ba4
Merge "Update dream summary when dream suppressed by bedtime mode" into tm-qpr-dev am: 6a8e193fad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20216381
Change-Id: I72ec38de9b99e704d909ddf9e21e7ac825b00abf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-18 17:43:35 +00:00
Lucas Silva
6a8e193fad
Merge "Update dream summary when dream suppressed by bedtime mode" into tm-qpr-dev
2022-10-18 17:17:25 +00:00
Lucas Silva
51f838ba4b
Update dream summary when dream suppressed by bedtime mode
...
Bug: 246472225
Test: enabled bedtime mode, verified settings summary updated
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.dream.WhenToDreamPreferenceControllerTest"
Change-Id: I4de12f636975b1bdf36898f7a530fde2f55644d4
2022-10-18 13:23:49 +00:00
Xuanang Zhao
9da4302a78
Merge "Clean up ignored tests in Settings Slices provider."
2022-10-18 09:12:31 +00:00
SongFerng Wang
0693ac7282
Merge "[MEP] the user can't enable the psim when revmovable esim is enabled" into tm-qpr-dev am: 2cd07f51ef
am: bd476febf0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20116277
Change-Id: I932293c24499b93666686f47907244f8a472243c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-18 07:20:43 +00:00
Xuanang Zhao
50f229903e
Clean up ignored tests in Settings Slices provider.
...
Change-Id: Iad9102a5d23333d64976e0697f9438bccc77af0a
Bug: 253386051
2022-10-18 07:07:00 +00:00
SongFerng Wang
bd476febf0
Merge "[MEP] the user can't enable the psim when revmovable esim is enabled" into tm-qpr-dev am: 2cd07f51ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20116277
Change-Id: Ib62e9adf0e2bdac25821c9f70634c27b26515056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-18 06:50:09 +00:00
SongFerng Wang
2cd07f51ef
Merge "[MEP] the user can't enable the psim when revmovable esim is enabled" into tm-qpr-dev
2022-10-18 06:30:34 +00:00
Kuan Wang
d16201a375
Merge "Copy BatterySettingsContentProvider from SettingsIntelligence to Settings and rename it to BatteryUsageContentProvider."
2022-10-18 02:26:48 +00:00
Kuan Wang
0a0ba915ca
Copy BatterySettingsContentProvider from SettingsIntelligence to Settings and rename it to BatteryUsageContentProvider.
...
Bug: 253395332
Test: make RunSettingsRoboTests + manually
Change-Id: Ib6c2240cd065f6e29393e13b7231bba7afd2d850
2022-10-18 02:26:23 +00:00
Kuan Wang
f41ae57f17
Copy Battery Usage Database from SettingsIntelligence to Settings.
...
Bug: 253395332
Test: make RunSettingsRoboTests + manually
Change-Id: Ibdd2ace10d9e0893b3d96b345d563307b1890df6
2022-10-18 02:26:18 +00:00
Julia Reynolds
9ef3cf2572
Add link to more app settings
...
Test: MoreSettingsPreferenceControllerTest
Test: test app that can handle the settings intent
Bug: 236932102
Change-Id: Iae778c93057e47aa0f664d3faab21640b2cd5193
2022-10-17 13:59:31 -04:00
Julia Tuttle
6f25e6afca
Merge "Default to hiding silent notifications on lockscreen in Settings" into tm-qpr-dev am: 5d780a42eb
am: 8416222c25
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20193426
Change-Id: If8d5df779d82d0064a5cdec5d59c119fb8b404a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-17 16:13:04 +00:00
Julia Tuttle
8416222c25
Merge "Default to hiding silent notifications on lockscreen in Settings" into tm-qpr-dev am: 5d780a42eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20193426
Change-Id: I6b4ac70d7ca1d7c4fd76b42c6d26f7361ff3420d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-17 16:07:43 +00:00
Julia Tuttle
5d780a42eb
Merge "Default to hiding silent notifications on lockscreen in Settings" into tm-qpr-dev
2022-10-17 14:56:20 +00:00
Chaohui Wang
bfb81e249e
Merge "Fix broken app info Robolectric tests"
2022-10-17 09:32:55 +00:00
Wei Wang
b4146ffb1f
Merge "Reenable tests"
2022-10-17 08:52:42 +00:00
TreeHugger Robot
2d95f7cb18
Merge "Fix broken battery usage Robolectric tests"
2022-10-17 08:18:59 +00:00
Chaohui Wang
b25950d2cc
Fix broken app info Robolectric tests
...
Fix: 253396248
Test: m RunSettingsRoboTests
Change-Id: I5ccc900824880c5d585b2838bbe3948232617288
2022-10-17 15:46:03 +08: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
Wei Wang
52ab48caa0
Reenable tests
...
The test testLoadSlice_cachedEntryRemovedOnUnpinned was ignored in
ag/20185792 but fixed in ag/20172765
Test: manual run passed m RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.slices.*"
Change-Id: I0bd0e7f7ed780ab24500c3fb102fd216486c34d9
Bug: 253386051
2022-10-17 05:54:27 +00: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
Julia Tuttle
e9108aecd8
Default to hiding silent notifications on lockscreen in Settings
...
Also, fix an errorprone issue.
Bug: 252815574
Test: atest ShowOnLockscreenNotificationPreferenceControllerTest
Change-Id: I46e6d0f15c69abe60ef8505d300e5205b3c71e53
2022-10-15 01:24:19 -04: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