Treehugger Robot
a71f46ecc6
Merge "Update the flow of charging optimization strings." into main
2024-05-15 09:10:39 +00:00
Chaohui Wang
065c6b717b
[automerger skipped] Merge changes If41d957f,I5c49d195 into 24D1-dev am: 381638f284
-s ours
...
am skip reason: Merged-In If41d957f916a99eacc1becb6b460e58722a4dca7 with SHA-1 6e4ac4bdc0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27354018
Change-Id: Ia34d946f48ef188ceacaa6440beec31c99ba46dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-15 08:37:24 +00:00
Chaohui Wang
c28ccbb114
[automerger skipped] Fix empty network scan result am: 99b09df4a8
-s ours
...
am skip reason: Merged-In If41d957f916a99eacc1becb6b460e58722a4dca7 with SHA-1 6e4ac4bdc0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27354018
Change-Id: I1c2322da36cf4348a67d28d462ed69c9b80d511a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-15 08:37:19 +00:00
Chaohui Wang
381638f284
Merge changes If41d957f,I5c49d195 into 24D1-dev
...
* changes:
Fix empty network scan result
Create NetworkScanRepository
2024-05-15 07:50:58 +00:00
Yiling Chuang
8bcaab7cc8
Update the flow of charging optimization strings.
...
Bug: 329020954
Test: atest SettingsRoboTests
Change-Id: I73738602036d79568fe4739a63534af1c64bd9d1
2024-05-15 07:47:10 +00:00
Manish Singh
2164352ea7
Merge "Change default lock to every time device locks" into main
2024-05-15 07:36:43 +00:00
Chaohui Wang
99b09df4a8
Fix empty network scan result
...
Settings use TelephonyScanManager.NetworkScanCallback to scan, and its
onComplete() could happens before onResults().
We will change Settings to fix.
Fix: 338986191
Test: manual - on NetworkSelectSettings
Test: unit test
Change-Id: If41d957f916a99eacc1becb6b460e58722a4dca7
Merged-In: If41d957f916a99eacc1becb6b460e58722a4dca7
2024-05-15 15:29:55 +08:00
Roy Chou
535494eca9
Merge "feat(brightness suw): add brightness preferences in suw" into main
2024-05-15 07:25:06 +00:00
SongFerng Wang
bbc605efd0
Merge "Fix search indexed the item from the invisible sim" into 24D1-dev am: 365cc18c40
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27341396
Change-Id: Ibecc4037975cc50636daecb18b243a1a5183f3fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-15 07:17:08 +00:00
SongFerng Wang
365cc18c40
Merge "Fix search indexed the item from the invisible sim" into 24D1-dev
2024-05-15 07:02:53 +00:00
Chaohui Wang
12158eb1fe
Create NetworkScanRepository
...
And migrate network scan to flow for better maintenance and prevent ANR.
Fix: 323105271
Test: manual - Choose network
Test: unit test
Change-Id: I5c49d195fc202143c0131ffd78bc3adc168b119c
Merged-In: I5c49d195fc202143c0131ffd78bc3adc168b119c
2024-05-15 14:09:03 +08:00
Fan Wu
4fc959d8c1
Ignore LinkifyUtilsTest to investigate on ClassNotFoundException
...
Bug: 340657656
Test: atest
Change-Id: I7837b5eead0e58f47719cd250b3270cd344c3e59
2024-05-15 03:59:05 +00:00
Roy Chou
042c8c7328
feat(brightness suw): add brightness preferences in suw
...
Add brightness level and auto brightness preference in
accessibility_settings_for_setup_wizard.xml. Since the flagging has not
be supported yet for non-Manifest resources, for now we add the
preferences by default, and update the preferece availablity status in
each preference controllers based on the flag.
Bug: 311093618
Flag: ACONFIG com.android.settings.accessibility.add_brightness_settings_in_suw DEVELOPMENT
Test: manually
atest AccessibilitySettingsForSetupWizardTest
atest AutoBrightnessPreferenceFragmentForSetupWizardTest
atest AutoBrightnessPreferenceControllerTest
atest BrightnessLevelPreferenceControllerTest
Change-Id: I350d99138bdd14bf28828a39e42f707b5b1066c1
2024-05-15 03:19:40 +00:00
Vlad Popa
59b7bef837
Merge "Improve the BT settings audio device type strings" into main
2024-05-14 22:54:11 +00:00
Guangjie (Jerry) Shi
1d51de0384
Merge "Fix the issue the if primary provider is disabled by work admin, it should be removed from the settings' storage." into main
2024-05-14 19:55:41 +00:00
David Liu
e18b91c190
Merge "Set noparent to avoid it recursively looks up. Android biometric team should approve all change in this subdirectories." into main
2024-05-14 19:45:16 +00:00
Jason Chang
2f595f7047
Merge "Remove redundant marginStart for FaceSettings button" into main
2024-05-14 18:11:56 +00:00
Manjeet Rulhania
09552b3caa
Merge "mark developer settings page as sensitive" into main
2024-05-14 16:35:21 +00:00
Nick Chameyev
b34632720c
Update fold setting text am: b9a0722d20
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27323129
Change-Id: Ibf9dbb23c6da433aec2b3785883ec88e4b3cffea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-14 16:25:16 +00:00
songferngwang
6f8cc6f0b6
Fix search indexed the item from the invisible sim
...
When search start to index and run to MobileNetworkSettings.java, the
TelephonyBasePreferenceController will find which subId can be the
"AVAILABLE" from the active subscriptionInfo list. This active subscriptionInfo
list does not be filtered, so the search uses the invisibile sim's item for user.
Bug: 335509130
Test: atest MobileNetworkUtilsTest (pass)
Change-Id: I2840e7de344347643197592e125f5524d27a068e
2024-05-14 15:04:02 +00:00
Manish Singh
ef8194e7d9
Change default lock to every time device locks
...
Fix: 339826512
Test: manual
Test: atest PrivateSpaceMaintainerTest
Test: atest AutoLockPreferenceControllerTest
Change-Id: I9f5f028666ac409ab6c732a440b2202f31839c9f
2024-05-14 11:16:53 +00:00
Nick Chameyev
b9a0722d20
Update fold setting text
...
Clarify default behavior and correct
the 'never' option to make sure
that it takes into account power
button instantly locks setting.
Bug: 300238754
Change-Id: I3d513bd06880b7be7e5610659dd72174d468c3dd
Flag: none
Test: presubmit
2024-05-14 10:10:28 +00:00
Jason Chang
a547a145dc
Remove redundant marginStart for FaceSettings button
...
To set button's marginStart to zero to align layout.
Flag: NONE
Bug: 331945001
Test: manual build and check UI visually in Fold/Unfold and rotate
state
Change-Id: I967d9ac1af963c6dcdac631a4fba9631a8d5662c
2024-05-14 09:41:30 +00:00
Ze Li
a24476b786
Merge "[ConnectedDevicePage] Clean up flag enable_saved_devices_order_by_recency" into main
2024-05-14 06:59:12 +00:00
Jerry Shi
9884f1ccf4
Fix the issue the if primary provider is disabled by work admin, it
...
should be removed from the settings' storage.
Test: locally built and tested
Bug: 337040395
Change-Id: Ic572cd87f571d93ee0e7fa29157172444c7c36ce
2024-05-13 23:45:54 -07:00
Ze Li
9d696fe4d8
[ConnectedDevicePage] Clean up flag enable_saved_devices_order_by_recency
...
Test: atest PreviouslyConnectedDevicePreferenceControllerTest SavedDeviceGroupControllerTest
Bug: 340145121
Change-Id: I2fd6d506b343332edceb0235c1e36345d74cbf55
2024-05-14 11:34:43 +08:00
Song Chun Fan
4c02f29871
Merge "[Install-unknown-apps] Hide apps of system or root UID" into main
2024-05-14 03:04:13 +00:00
Guojing Yuan
a12f47259f
Merge "Temporarily disable perm sync toggle" into main
2024-05-14 02:45:12 +00:00
Hao Dong
76b3bc8a20
Merge "Override package name for logo in ConfirmDeviceCredentialActivity." into main
2024-05-14 01:18:03 +00:00
Simon Wingrove
26dc66204c
Merge "Update access strings per UXW" into main
2024-05-13 21:36:49 +00:00
Bill Yi
90e49e44eb
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-05-13 20:34:55 +00:00
Bill Yi
5c526869e4
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-05-13 20:34:55 +00:00
Bill Yi
9ce4e1133c
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-05-13 20:34:55 +00:00
Treehugger Robot
2dbb27de91
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 75779c3fc2
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27318896
Change-Id: I4907e5bab14613058bccad914d159259a6baf699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-13 18:34:56 +00:00
Bill Yi
a483fa0f13
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9f186e2b09
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27318896
Change-Id: Ieb47c33d304dff372f76cc0042414a2affe25626
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-13 18:34:54 +00:00
Treehugger Robot
d8d711b1e2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: fd5d889807
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27318856
Change-Id: I5c691f0b94c3846a787383bf3b54ee5de7a528c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-13 18:34:52 +00:00
Bill Yi
d154165bc4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc401c3cb3
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27318856
Change-Id: I8668067aaa931ec2ef2ef9779f00d99c5b5a41af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-13 18:34:48 +00:00
Bill Yi
e3d745eb5e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: abc9a7413b
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27318474
Change-Id: Ifdd57d8f8c49d2714f4afc65176a39ea2074f999
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-13 18:34:37 +00:00
Treehugger Robot
3fca6b99ba
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: c98da894f0
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27318472
Change-Id: I97fce37c0ab50ac219df59c4d1eee7ae53244778
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-13 18:30:52 +00:00
Bill Yi
a6ee2c107a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75a4637eba
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27318472
Change-Id: Ifee6a5c6d8c10962ed3062abe701f3e4a9496afd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-13 18:30:48 +00:00
Treehugger Robot
c98da894f0
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-05-13 18:28:11 +00:00
Bill Yi
fc84fc7e6a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 163789e60e
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27318855
Change-Id: Ibf952ad2ef7d8049ebe7345dde03f57e68e8d5f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-13 18:22:33 +00:00
Treehugger Robot
75779c3fc2
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-05-13 18:16:20 +00:00
Treehugger Robot
fd5d889807
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-05-13 18:16:20 +00:00
Treehugger Robot
eab78d0ef4
Merge "Update Setting's Robolectric tests' instructions" into main am: 2fcc3a20e5
am: 2626849471
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3083379
Change-Id: I1d61a4854fbe43e4eb6840680b0355890ebc386b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-13 18:07:54 +00:00
Treehugger Robot
2626849471
Merge "Update Setting's Robolectric tests' instructions" into main am: 2fcc3a20e5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3083379
Change-Id: I63bc87d3d5af1887be7cbe8b1d0d314b82efa7b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-13 17:51:04 +00:00
Treehugger Robot
2fcc3a20e5
Merge "Update Setting's Robolectric tests' instructions" into main
2024-05-13 17:36:07 +00:00
David Liu
ae68cfca44
Merge "Set noparent to avoid it recursively looks up. Android biometric team should approve all change in this subdirectories." into main am: 7220a11daf
am: aa9702134d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3080723
Change-Id: Ia7c3895dd1f4baef3b64c26fa0fa2e46af333c49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-13 17:29:32 +00:00
Guojing Yuan
9d84a8deb4
Temporarily disable perm sync toggle
...
Bug: 338469649
Test: unit test
Change-Id: Ie9d0c76c9b60129466c4a4f0c87a04d769918e5c
2024-05-13 17:19:12 +00:00
David Liu
28da3e3b34
Set noparent to avoid it recursively looks up. Android biometric team should approve all change in this subdirectories.
...
Bug: 339519091
(cherry picked from https://android-review.googlesource.com/q/commit:836e14e665e5f0731a0a2925c2b0cf5684841240 )
Merged-In: Ib5bdc23660cc18af0f57ffdec1dbf582db734a43
Change-Id: Ib5bdc23660cc18af0f57ffdec1dbf582db734a43
2024-05-13 16:53:23 +00:00