Chaohui Wang
732636cbd5
Merge "Refactor AutomaticDataSwitchingPreference" into main
2024-03-19 11:14:25 +00:00
Manish Singh
bb8652e1e8
Merge "Update Trusted credentials page for private profile" into main
2024-03-19 10:01:26 +00:00
Manish Singh
acafaf94b9
Merge "Support private profile in spinner adapters" into main
2024-03-19 09:54:58 +00:00
Haijie Hong
ba80f1934e
Merge "Add event for Spatial Audio toggle in Settings" into main
2024-03-19 09:52:01 +00:00
Aleksandr Lukin
b30a1fc098
Merge "Add strings for Documents&Other split" into main
2024-03-19 08:26:49 +00:00
Haijie Hong
b2d6c06c5c
Add event for Spatial Audio toggle in Settings
...
Bug: 322279959
Test: atest BluetoothDetailsSpatialAudioControllerTest
Change-Id: Id0a3e4c0bcdce80c25326c83db7913a51462ef58
2024-03-19 15:29:45 +08:00
Chaohui Wang
bfd8a517be
Refactor AutomaticDataSwitchingPreference
...
Split into AutomaticDataSwitchingPreference.kt, and use
isMobileDataPolicyEnabledFlow.
Bug: 329061940
Test: manual - Set Automatic data switching
Test: unit test
Change-Id: I878ed70328307c0a5dba6dfb461ff5a85efbcf88
2024-03-19 14:17:20 +08:00
Chaohui Wang
a3507d535f
Fix APN network type not updated
...
The issue is caused by SettingsDropdownCheckBox's interface is updated,
but ApnNetworkTypeCheckBox not updated.
Update ApnNetworkTypeCheckBox to fix.
Bug: 329547692
Test: manual - update network type
Test: unit test
Change-Id: I4a5a1ad7d9d97960799f5ba0d89b5178ce410b6e
2024-03-19 13:59:11 +08:00
Vincent Wang
3a12c7b18b
[automerger skipped] Merge "Show calibtation result in FingerprintSettings & EnrollEnrolling if results are available" into 24D1-dev am: 177867af12
-s ours
...
am skip reason: Merged-In I006db64f001fb70d2bb294a15a2d3efc77e2da25 with SHA-1 6666bb97b4
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26617943
Change-Id: Id96b4a611af9849c04376767f8400897b2805157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-19 05:52:53 +00:00
Vincent Wang
e44054ba34
[automerger skipped] Show calibtation result in FingerprintSettings & EnrollEnrolling am: 118abc5568
-s ours
...
am skip reason: Merged-In I006db64f001fb70d2bb294a15a2d3efc77e2da25 with SHA-1 6666bb97b4
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26617943
Change-Id: Icd3e1b340bebfa8c0a2fabc63add1f594a3b30b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-19 05:52:48 +00:00
Vincent Wang
177867af12
Merge "Show calibtation result in FingerprintSettings & EnrollEnrolling if results are available" into 24D1-dev
2024-03-19 05:37:39 +00:00
George Chang
8c6ba30e3c
[automerger skipped] Merge "Revert "settings(dev): Remove NFC stack logging control"" into 24D1-dev am: 1df6f6a976
-s ours
...
am skip reason: Merged-In I3c6026e230c7d35f04d9771442fadbf040a84b94 with SHA-1 a5bd1cf34f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26593227
Change-Id: If4990b8214acadce90f73274ba735c1a0a6d88c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-19 05:25:29 +00:00
George Chang
5004b19a2d
[automerger skipped] Revert "settings(dev): Remove NFC stack logging control" am: b5d57eaa58
-s ours
...
am skip reason: Merged-In I3c6026e230c7d35f04d9771442fadbf040a84b94 with SHA-1 a5bd1cf34f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26593227
Change-Id: I03265d2076c67b8d7be8dfb1caa473a77fd545f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-19 05:25:20 +00:00
George Chang
1df6f6a976
Merge "Revert "settings(dev): Remove NFC stack logging control"" into 24D1-dev
2024-03-19 05:06:34 +00:00
Ze Li
29168c0d3e
Merge "[ConnectedDevicePage] Add setup to fix testing fail." into main
2024-03-19 05:05:40 +00:00
Vincent Wang
118abc5568
Show calibtation result in FingerprintSettings & EnrollEnrolling
...
if results are available
Bug: b/326155807
Test: Enroll multiple fingerprints and check if
calibration isn't triggered.
Change-Id: I006db64f001fb70d2bb294a15a2d3efc77e2da25
Merged-In: I006db64f001fb70d2bb294a15a2d3efc77e2da25
2024-03-19 02:32:58 +00:00
yomna
5599de4fb5
Add new Cellular Network Security page
...
Test: m & atest CellularSecurityNotificationsDividerControllerTest CellularSecurityNotificationsPreferenceControllerTest CellularSecurityEncryptionDividerControllerTest CellularSecurityPreferenceControllerTest
Bug: b/318428717
Change-Id: I4a6ec5f47beb36bd455e04c2e6c4cea0ba65110f
2024-03-18 21:22:10 +00:00
Chun-Ku Lin
59a329cae5
Merge "Make QS shortcut type as default preferred shortcut for A11yService that associate with a TileService" into main
2024-03-18 17:20:43 +00:00
alukin
124040e17e
Add strings for Documents&Other split
...
Adding strings that are used for Documents&Other
category split in Settings > Storage
Bug: 328505030
Test: atest StorageItemPreferenceControllerTest
Test: atest StorageCacheHelperTest
Change-Id: I8b8d0cc96d85273da878655295f3d0919f46a46c
2024-03-18 16:05:10 +00:00
Aleksandr Lukin
23cb6eeb10
Merge "Add strings for System split" into main
2024-03-18 15:06:55 +00:00
Eran Messeri
7011cfeb8b
Merge "Auth-bound keys usability: Update strings" into main
2024-03-18 14:58:58 +00:00
Vincent Wang
1a498d030d
Merge "Show calibtation result in FingerprintSettings & EnrollEnrolling if results are available" into main
2024-03-18 14:34:24 +00:00
Allen Su
354a78e33b
Merge "Fix Locale unit test failure" into main
2024-03-18 14:11:08 +00:00
Ze Li
e1bff83335
[ConnectedDevicePage] Add setup to fix testing fail.
...
Test: manual test
Bug: 322712259
Change-Id: I770e56524ce28511b9d3f773b439d6ea419b1509
2024-03-18 19:22:41 +08:00
Bill Lin
aee3dd3fb3
Merge "Revert "Prevent full-screen face enroll on tablet"" into main
2024-03-18 10:15:22 +00:00
Chaohui Wang
ad0b01e7cf
Add BootBroadcastReceiver required permissions
...
These permissions are required for any Settings tests to run, otherwise
the tests will fails.
Instead of adding these permissions to each of the tests, add it to the
Settings-core.
Bug: 329046490
Test: unit tests
Change-Id: I54dc1ebfdd062acc224021429dce318d7c12809b
2024-03-18 09:23:34 +00:00
Chaohui Wang
905d0ff82e
Merge "Fix SubscriptionInfoListViewModelTest" into main
2024-03-18 09:23:03 +00:00
Vincent Wang
6666bb97b4
Show calibtation result in FingerprintSettings & EnrollEnrolling
...
if results are available
Bug: b/326155807
Test: Enroll multiple fingerprints and check if
calibration isn't triggered.
Change-Id: I006db64f001fb70d2bb294a15a2d3efc77e2da25
2024-03-18 09:07:46 +00:00
Allen Su
99fb1065fa
Fix Locale unit test failure
...
Bug: 301380610
Bug: 313604701
Test: atest LocalePickerActivityTest
Change-Id: Icab8eeea62c7c40c160d745afd08f71fcca5ec9c
2024-03-18 08:52:34 +00:00
Jakub Rotkiewicz
1c4d2116da
Merge "Refactor Bluetooth Codec settings to dynamic ListPreference" into main
2024-03-18 08:21:57 +00:00
chelseahao
74f65ed315
Remove flag, use new api for auto on in settings.
...
Test: atest com.android.settings.bluetooth
Bug: b/316822488 b/316985153
Change-Id: I8bc7651fd6e33175a3f95cce050b9a957ac6f241
2024-03-18 15:59:58 +08:00
Chaohui Wang
21d5f4160b
Merge "Enforce BaseUserRestriction for DISALLOW_CONFIG_SCREEN_TIMEOUT" into main
2024-03-18 05:43:44 +00:00
Chaohui Wang
95d2b19c17
Merge "Enforce BaseUserRestriction for DISALLOW_CONFIG_BRIGHTNESS" into main
2024-03-18 05:43:38 +00:00
Chaohui Wang
10f5bdabb4
Fix SubscriptionInfoListViewModelTest
...
Fix: 329160337
Test: unit test
Change-Id: I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0
2024-03-18 13:43:04 +08:00
Charlotte Lu
9419d67044
Merge "Add server name title." into main
2024-03-18 05:24:45 +00:00
Chaohui Wang
be49e61d0f
Enforce BaseUserRestriction for DISALLOW_CONFIG_BRIGHTNESS
...
Fix: 329205638
Test: pm set-user-restriction --user 0 no_config_brightness 1
Change-Id: Icacf051789ea40d23cd29c16168fbeb204cf8f5b
2024-03-18 03:32:54 +00:00
Charlotte Lu
18f3d29a5c
Add server name title.
...
Test: Manual
Fix: 330084607
Change-Id: I11f2cc995d5d09d04bbfb3d95b9bf5309813e8eb
2024-03-18 11:30:59 +08:00
Chun-Ku Lin
5cdf972b50
Make QS shortcut type as default preferred shortcut for A11yService that
...
associate with a TileService
Bug: 322712028
Test: manual (Turn on the shortcut for the first time for various
feature with or without tile. Verify only the A11yService with tile
would show QS as the shortcut when directly turn on the main shortcut
toggle)
Test: atest com.android.settings.accessibility
Flag: aconfig android.view.accessibility.a11y_qs_shortcut
Change-Id: I569b417639d2db8b7eddd818a2b9037ed4be2509
2024-03-18 00:14:43 +00:00
Richard MacGregor
40debb2540
Update screenshare protection strings
...
Update developer options strings for screen share protections
Bug: 323015826
Test: manual
Flag: ACONFIG com.android.server.notification.sensitive_notification_app_protection TRUNK_FOOD
Change-Id: Ib597c0bc7df518337647e537c948ace60af79046
2024-03-15 15:11:53 -07:00
Bill Yi
42be6f6e88
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-03-15 20:23:43 +00:00
Bill Yi
1732b38eda
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-03-15 20:23:43 +00:00
Bill Yi
e82472d6f5
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-03-15 20:23:43 +00:00
Manish Singh
c5e07bb662
Don't show private accounts when locked
...
screen recoriding - https://drive.google.com/file/d/1_QzXJgISWhiYFGOGQkqDw6ZMxlVmojH_/view?usp=drive_link&resourcekey=0-64S56eFqFukR2ez4yKQlpQ
Bug: 324574475
Test: manual
Change-Id: I08eafbd66ee81d2ea539993d2d96c28b89a6dad0
2024-03-15 17:20:17 +00:00
Manish Singh
d7ff6fe966
Support private profile in spinner adapters
...
Screenshot - https://screenshot.googleplex.com/35czwQHeevX75pj
Video - https://drive.google.com/file/d/1LkYPJ3i8llArnQBE3ieLPYMctEOw3xdp/view?usp=sharing&resourcekey=0-j-3-VV4OyXJKBPXwAqJvKg
Bug: 328565911
Bug: 313610609
Bug: 302082696
Test: manual
Test: atest UserAdapterTest
Test: atest StylusDevicesControllerTest
Change-Id: If8395eba5cc73809ab4abc95bc13067451c38b8f
2024-03-15 17:16:57 +00:00
Manish Singh
e5028048a0
Update Trusted credentials page for private profile
...
screen recording - https://drive.google.com/file/d/1XuDEkgOGSIvHlk1q5r7-EX13BGld0OWh/view?usp=sharing&resourcekey=0-FKRl_ddBn2HAkxfnV2dfKg
Bug: 307896268
Test: manual
Change-Id: Ic4b438282686704deef2a051b5c302b7fae49edc
2024-03-15 17:12:34 +00:00
Treehugger Robot
71ebe0f959
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: e80fe88947
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26588535
Change-Id: I970433d9e624039d5e8757085b983429384de349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-15 17:09:32 +00:00
Bill Yi
f69c8e50b3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1bfd1f0420
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26588535
Change-Id: I08915d5d5f8c54278f2e65ab6715ebedd2a9ac20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-15 17:09:28 +00:00
Treehugger Robot
58f996238b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: ca8f823c87
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26588534
Change-Id: I11d675974eb806d88048e5adff7007317b40c0a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-15 17:09:23 +00:00
Bill Yi
a3a25757cd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b999a848db
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26588534
Change-Id: I938414220cd83b91ffb9e20dcbfac1ea4e32ed0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-15 17:09:09 +00:00
Manish Singh
3b4e29e68d
Merge "Return my user id" into main
2024-03-15 16:55:36 +00:00