PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
140,238 Commits 1 Branch 0 Tags
d8d711b1e28a8f4c11b624f4f227e19a2ba22dfb
Commit Graph

140238 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Pawan Wagh
3e4a37adbb Merge "UI and error message fixes for 16k developer option" into main am: e550896658 am: 588dbe4b31 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3079811

Change-Id: Ie63bca803a77b8f3468e68050898934cc8b9e1b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-11 03:50:47 +00:00
Pawan Wagh
588dbe4b31 Merge "UI and error message fixes for 16k developer option" into main am: e550896658 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3079811

Change-Id: Id0bf33ca5fce8a964cb7b4ae0365c318993b2b3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-11 03:32:02 +00:00
Pawan Wagh
e550896658 Merge "UI and error message fixes for 16k developer option" into main 2024-05-11 03:06:28 +00:00
Chun-Ku Lin
01463cac05 Update Setting's Robolectric tests' instructions 
Test: N/A

Change-Id: I00a0b3ac910caaeb35f66762a9d67610b9180ff6
 2024-05-11 02:29:57 +00:00
Fan Wu
f44ea077d6 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. 
Bug: 339533415

Test: atest and presubmit
Change-Id: Icdc94195f3b4dda4e523d4b7498698a5ada198ea
 2024-05-11 01:37:13 +00:00
Treehugger Robot
02e0dc41cf Merge "Apply lineBreakWordStyle and hyphenationFrequency in EditShortcutScreen" into main 2024-05-10 23:27:57 +00:00
Treehugger Robot
619af9349d Merge "Don't overwrite the system global gender settings" into main 2024-05-10 18:45:07 +00:00
Marcus Ge
fd0dd5dfdd Merge "[Contrast] Migrate contrast settings into Display" into main 2024-05-10 15:23:47 +00:00
Chaohui Wang
59e2bce852 Merge "Fix empty network scan result" into main 2024-05-10 12:03:26 +00:00
Manish Singh
544f85c262 Merge "Move mock init before fragment is created" into main 2024-05-10 11:50:05 +00:00
Treehugger Robot
2d4ef85b2f Merge "[Thread] fix Thread unit test failures" into main am: bb5bb304aa am: fc2d8c650f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3081467

Change-Id: I62d9d558c43a610daea3d0628488a3699568d60e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-10 10:58:34 +00:00
Treehugger Robot
fc2d8c650f Merge "[Thread] fix Thread unit test failures" into main am: bb5bb304aa 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3081467

Change-Id: I615a740f9141e2c16a8e4a9c674a52e1e55b0e99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-10 10:45:37 +00:00
Treehugger Robot
bb5bb304aa Merge "[Thread] fix Thread unit test failures" into main 2024-05-10 10:18:40 +00:00
Mill Chen
f5ad0734a7 Merge "Deprecate Settings panels and its infrastructure" into main 2024-05-10 10:02:51 +00:00
Chaohui Wang
0514c664fa [automerger skipped] Merge "Use permission com.android.settings.BATTERY_DATA" into main am: 51fe6894f9 am: 5998074b89 -s ours 
am skip reason: Merged-In I5a1753835d2d47712ea249081c9a77c455eb3291 with SHA-1 23c66d1278 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3078823

Change-Id: Ib45d2607321b73f15a788b0411334c9fff58a460
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-10 09:56:21 +00:00
Chaohui Wang
5998074b89 Merge "Use permission com.android.settings.BATTERY_DATA" into main am: 51fe6894f9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3078823

Change-Id: I1fac29bf240989aa4528b4abdaf77c94d9d1b08a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-10 09:37:56 +00:00
Manish Singh
07fec29f7c Merge "Support multi-pane deeplink in PrivateSpaceAuthenticationActivity" into main 2024-05-10 09:29:30 +00:00
Chaohui Wang
51fe6894f9 Merge "Use permission com.android.settings.BATTERY_DATA" into main 2024-05-10 09:15:47 +00:00
Manish Singh
7b5c1bf766 Move mock init before fragment is created 
Bug: 336518132
Test: atest PrivateSpaceDeletionProgressFragmentTest
Change-Id: Ic7d81e59515ad9ad1a354fff8884133e7cc8ea64
 2024-05-10 09:11:49 +00:00
Kangping Dong
257e164562 [Thread] fix Thread unit test failures 
It looks like SettingsUnitTests is not in presubmit and the existing Thread settings unit tests are failing in postsubmit.

This commit fixes two small issues:
1. The default Thread enabled state in FakeThreadNetworkController and ThreadNetworkToggleController is not consistent
2. The executor in ThreadNetworkToggleControllerTest is reusing the main thread which could result in flaky as the callbacks are not guaranteed to be invoked before the API returns

Bug: 339767488
Bug: 339145155
Test: atest SettingsUnitTests:com.android.settings.connecteddevice.threadnetwork.ThreadNetworkToggleControllerTest
Change-Id: Id8b453cf6d7bef698d08dbf106e48250369d0832
 2024-05-10 17:10:50 +08:00
Chaohui Wang
df5e5ac130 Merge "No show DisableSimFooterPreference when sub not found" into main 2024-05-10 08:54:31 +00:00