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
David Anderson
29f9abcd8b
Add Device Diagnostics to Settings.
...
The new option will only appear if (1) the flag is enabled and (2)
DeviceDiagnostics.apk is landed on the device (which it is by default on
AOSP).
Bug: 309886423
Test: Build AOSP Pixel and launch Settings
Change-Id: If01d231664a301ff289d4da61445bf65a7506fdb
2024-05-14 04:46:02 +00: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
Bill Yi
9f186e2b09
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I88ddb0e7dc30d084c5156759a363b0793c1e405d
2024-05-12 17:33:41 -07:00
Bill Yi
7abd589f90
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie92111dce1b19f4e21cb12f3ddc10444f5bd639c
2024-05-12 17:32:46 -07:00
Bill Yi
abc9a7413b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5f2d28351f89a4428ee3dd37d515d0b32bc79387
2024-05-12 17:30:31 -07:00
Bill Yi
eb0d61ebf1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I917e19b5e146ac8415ba6a302e8ea721b7e1c0e2
2024-05-12 17:28:35 -07:00
Bill Yi
bc401c3cb3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iabf9cc384edabd73c43f64406904f033203d0606
2024-05-12 17:26:55 -07:00
Bill Yi
e1ee6d8bfe
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id0c0db0dd782cfeb420a1b3333cddfca2ab03196
2024-05-12 17:26:04 -07:00
Bill Yi
163789e60e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib3d12bcc4aa3efbcab08a95474711bd73f1c3448
2024-05-12 17:24:24 -07:00
Bill Yi
75a4637eba
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1d6f65dc534d84befba2f14868ec94f2d9b83962
2024-05-12 17:22:52 -07:00
Weng Su
3dc7837617
Remove Instant Hotspot from Settings search
...
- If Instant Hotspot is not enabled then remove it from Settings search
Bug: 339159245
Flag: None
Test: Manual testing
atest -c WifiTetherSettingsTest
Change-Id: I0b1d34c1130b17bfc0f3f0451a10c8aba265733c
2024-05-11 20:00:02 +08:00
mxyyiyi
ee501485b8
Schedule periodic job in next full-hour timestamp under local timezone.
...
Bug:315228870
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage.PeriodicJobManagerTest
Change-Id: I1d2b298ea53c1018b5f94b5ba00692055374eef2
2024-05-11 17:36:32 +08:00
Fan Wu
67541a9444
Merge "Ignore existing failed tests and promote SettingsUnitTests to Presubmit. Exclude a few tests from Presubmit as they are failing in Presubmit but can pass locally." into main
2024-05-11 05:28:39 +00:00