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
Simon Wingrove
4884157649
Don't trampoline twice when opening security or privacy
...
Settings already trampolines to a two-pane version of deeplink
activities, doing another trampoline will wind up creating a second task
covering up the first, with the wrong layout.
Bug: 253554698
Test: manually
Change-Id: Ib7ba5c95cac2f644ade37a41f321d11c8f1d1b89
2022-10-17 14:55:51 +01: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
Zekan Qian
5d68c3f7b0
Merge "Use new API of SpaEnvironmentFactory."
2022-10-17 05:13:19 +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
Zekan Qian
f1311f800e
Use new API of SpaEnvironmentFactory.
...
Test: manual - build Settings
Change-Id: I1cd5d7297687b6373a0044f8a100dd968b91e657
2022-10-17 02:49:11 +00:00
Shen Lin
72e5a7ea21
Fix crash when showing error dialog in NetworkRequestDialogActivity
...
Fix: 253913148
Test: manual
Change-Id: I23593da1ef6d72806f22d3501b06a8e7abadb100
2022-10-17 09:30:16 +08:00
Chaohui Wang
507e5f8c90
Fix some errors for Settings project
...
Attrs could not have same name, so create a common parent for the
messageText. And BiometricEnrollCheckbox is not in use.
Replace some com.android.settingslib.R with com.android.settings.R,
because these are files in settings instead of settingslib.
Bug: 253772249
Test: TAP
Change-Id: Ifa796e923bf26facf4935be4968637affdb4b48b
2022-10-16 14:14:02 +08:00
Bill Yi
f3af6d0fac
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: de36845714
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20203158
Change-Id: Ib389f8ba4a69c562f0b5dee99f749e913dea96c1
2022-10-16 02:58:00 +00:00
Bill Yi
10685ce812
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I52af69635563e5f832ff9b2db1988ab1a0b8947a
2022-10-15 15:51:11 -07:00
Bill Yi
79c253e260
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id7d06d3b00b512acc3083791bb5e2386bc50d932
2022-10-15 15:48:10 -07:00
Bill Yi
8b6197643d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9e456fa02748875d1d19cb5e74440837eb5c6ba0
2022-10-15 15:45:37 -07:00
Bill Yi
e4026445ed
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0049720788b756d0c4ae917806b14df933b8a34a
2022-10-15 15:44:31 -07:00
Bill Yi
46d8824ca9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I933ba841c96f32bb402f5bfe167bf80caf4444e9
2022-10-15 15:42:38 -07:00
Bill Yi
de36845714
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0e826273bdc55424787e63cb755130073006e3d6
2022-10-15 15:39:55 -07: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
Philip Junker
6108cce37c
Only list apps with android.permission.TURN_SCREEN_ON.
...
Bug: 237045954
Test: manually verified the special app access list.
Test: atest SettingsRoboTests:TurnScreenOnDetailsTest
Test: atest SettingsRoboTests:TurnScreenOnSettingsTest
Change-Id: Ic7ded92d7be307ba90d7871224f756422589c792
2022-10-14 19:00:48 +02: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
SongFerngWang
7087388a0f
[LE unicast] Using the pairDeviceByCsip API
...
ag/20176285 changes the API flow.
Bug: 253541065
Test: make RunSettingsLibRoboTests ROBOTEST_FILTER=CachedBluetoothDeviceManagerTest
local test and result is on bug (pass)
Change-Id: I2354b464a93b3122b462dc9cc20556f621490d2a
2022-10-14 04:43:39 +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
6cec9a63ed
Disable Enhanced notifications setting when default NAS is not available am: 236eaed326
am: 6e64305274
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20188999
Change-Id: Ia61efd794da0bcec36bc7bf015bae717875ac4c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-13 21:28:16 +00: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
Anay Wadhera
17231a4375
Merge "Change Peak Refresh Rate string from 90 Hz to config_defaultPeakRefreshRate"
2022-10-13 18:02:22 +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
YK Hung
a5069dbd43
Merge "Update Battery settings entry index summary"
2022-10-13 15:57:53 +00:00
Treehugger Robot
c49d0aacfa
Merge "Fix "show system apps" status lost when switching on/off dark theme" am: df8e9c630a
am: c0904055f4
am: 61cc95f7d1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2253577
Change-Id: Ib54ccf0e5b64a8d1445d3bfdce16456fd1403455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-13 15:51:46 +00:00
Treehugger Robot
61cc95f7d1
Merge "Fix "show system apps" status lost when switching on/off dark theme" am: df8e9c630a
am: c0904055f4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2253577
Change-Id: If5a0b0e899b0eea3110319c7df89bb23f932e77e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-13 15:19:20 +00:00
Treehugger Robot
c0904055f4
Merge "Fix "show system apps" status lost when switching on/off dark theme" am: df8e9c630a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2253577
Change-Id: Ie35b84bc9e348997fc34f58ded21c84e191e6786
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-13 14:35:09 +00:00
Treehugger Robot
df8e9c630a
Merge "Fix "show system apps" status lost when switching on/off dark theme"
2022-10-13 14:09:17 +00: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