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
Fan Wu
4fc959d8c1
Ignore LinkifyUtilsTest to investigate on ClassNotFoundException
...
Bug: 340657656
Test: atest
Change-Id: I7837b5eead0e58f47719cd250b3270cd344c3e59
2024-05-15 03:59:05 +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
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
David Liu
aa9702134d
Merge "Set noparent to avoid it recursively looks up. Android biometric team should approve all change in this subdirectories." into main am: 7220a11daf
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3080723
Change-Id: Ia661424fd58c58f580305bd1c861e26912e8a0f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-13 16:46:40 +00:00
David Liu
7220a11daf
Merge "Set noparent to avoid it recursively looks up. Android biometric team should approve all change in this subdirectories." into main
2024-05-13 16:23:57 +00:00
Hao Dong
3b9c3cf530
Override package name for logo in ConfirmDeviceCredentialActivity.
...
Test: TODO
Flag: ACONFIG android.hardware.biometrics.custom_biometric_prompt NEXTFOOD
Bug: 337082634
Change-Id: If0c4851c8c0cb0fae01e9f30d6a6486f2ab2c71f
2024-05-13 15:31:20 +00:00
Treehugger Robot
7b4b26b3af
Merge "[Thread] fix flaky Thread settings tests" into main am: 5a7eeea1e1
am: 0b6c1a781a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3081385
Change-Id: I45f9dc9a23cd804f311124c90ac612d7b2efa780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-13 10:02:30 +00:00
Treehugger Robot
0b6c1a781a
Merge "[Thread] fix flaky Thread settings tests" into main am: 5a7eeea1e1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3081385
Change-Id: I2b5665c65fdceed258a0c902be8fd3f8ff3703b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-13 09:46:16 +00:00
Treehugger Robot
5a7eeea1e1
Merge "[Thread] fix flaky Thread settings tests" into main
2024-05-13 09:21:28 +00:00
Kangping Dong
253be810ae
[Thread] fix flaky Thread settings tests
...
This fix the flaky issue by using the directExecutor()
Bug: 340148095
Change-Id: Ib0ed0f660828ec3c2601b4fc0b3360e891eb48af
2024-05-13 16:14:56 +08:00
Chaohui Wang
b63ed17b94
Merge "Use DataUsageFormatter to format app data usage" into main
2024-05-13 08:06:38 +00:00
Weng Su
ec4db174a8
Merge "Remove Instant Hotspot from Settings search" into main
2024-05-13 06:54:59 +00:00
Chaohui Wang
7ca1ceb722
Use DataUsageFormatter to format app data usage
...
Use the new unitsContentDescription from Formatter.formatBytes()
Fix: 318780411
Test: manual - on AppDataUsage
Test: unit test
Change-Id: I55079c83db2e46a48f49f746f2371825ec0bb029
2024-05-13 12:41:27 +08:00
Chaohui Wang
881c19480a
Fix isSubscriptionEnabledFlow crash
...
When INVALID_SUBSCRIPTION_ID.
Fix: 338014486
Test: unit test
Change-Id: I97b5f005fb99473c2712f9643704a35cfaeecfac
2024-05-13 11:25:46 +08:00