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

140219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Chaohui Wang
6e4ac4bdc0 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
 2024-05-10 16:19:40 +08:00
Kangping Dong
8231d00bb9 [automerger skipped] Merge "[Thread] update Thread settings screen" into main am: ba221ea50c am: 0ff02951c2 -s ours 
am skip reason: Merged-In Iffbb2471f5a28ec57d30a378f22642fe6ac0b9cc with SHA-1 d454ac2963 is already in history

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

Change-Id: I1485a97ef7f9d83ccdf30410651d07ed15384ded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-10 07:16:22 +00:00
Chaohui Wang
e216fd4248 No show DisableSimFooterPreference when sub not found 
DisableSimFooterPreferenceController.getAvailabilityStatus() used to
return AVAILABLE when the subscription is not found in selectable
subscription info list.

Return CONDITIONALLY_UNAVAILABLE in this case to fix.

Bug: 336232487
Test: manual - on Mobile Settings
Change-Id: I88642fc9853ce6603a78dfdc0e5fed1da1553adc
 2024-05-10 15:08:53 +08:00
Tom Hsu
1e2c0b68e6 [automerger skipped] Merge "Expose SatelliteWarningDialogActivity" into 24D1-dev am: 580ef265ce -s ours 
am skip reason: Merged-In I530c554433d99b4732416b8f1b83677ddc0ff6d8 with SHA-1 a50dd92e49 is already in history

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

Change-Id: Icc8dc8b0f6d9764c0da7366fdf7a8ed24b401de8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-10 07:02:31 +00:00
tomhsu
5d41cc2d8b [automerger skipped] Expose SatelliteWarningDialogActivity am: 180b2d9561 -s ours 
am skip reason: Merged-In I530c554433d99b4732416b8f1b83677ddc0ff6d8 with SHA-1 a50dd92e49 is already in history

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

Change-Id: I105118a7e027b8c3231364745dcbe7b9ce60bc55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-10 07:02:26 +00:00
Kangping Dong
0ff02951c2 Merge "[Thread] update Thread settings screen" into main am: ba221ea50c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3074147

Change-Id: Ib9437a53f2e94a27b22b0b38e30f7dee1a96c741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-10 07:02:06 +00:00
Tom Hsu
580ef265ce Merge "Expose SatelliteWarningDialogActivity" into 24D1-dev 2024-05-10 06:46:57 +00:00
Kangping Dong
ba221ea50c Merge "[Thread] update Thread settings screen" into main 2024-05-10 06:38:45 +00:00
YK Hung
211afbea96 Merge changes from topic "timestamp_update" into main 
* changes:
  Update database clear & job refresh mechanism for time zone change intent
  Update database clear & job refresh mechanism for time change intent
  Update time format for the first timestamp on usage chartview.
 2024-05-10 04:46:11 +00:00
mxyyiyi
d3ce90347b Update database clear & job refresh mechanism for time zone change intent 
- Clear database and reset periodic job
- Take a snapshot of current battery usage stats

Bug: 336423923
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Change-Id: I4aade9db950b508e2190605371f246904f131da3
 2024-05-10 11:22:58 +08:00
mxyyiyi
798340fafd Update database clear & job refresh mechanism for time change intent 
- Ignore time change intent for time format update
- Clear data after current time in DB and refresh periodic job
- Take a snapshot of current battery usage stats if no periodic job in DB

Bug: 336423923
Bug: 314921894
Fix: 314921894
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusagei
Change-Id: Iec0f5e8e97f18c4603de711a5884336ba0af23a9
 2024-05-10 11:22:47 +08:00
Chaohui Wang
8daf33572a Merge "Catch exception in telephonyRepository.isDataEnabledFlow" into main 2024-05-10 03:02:34 +00:00
Treehugger Robot
baabc09114 [automerger skipped] Merge "Fix the flicker in the Lock screen page" into 24D1-dev am: 6f6629e6cd -s ours 
am skip reason: Merged-In Icb7714c19ae73d15bccc9b6976a10cf343a16f53 with SHA-1 753a5565cb is already in history

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

Change-Id: I5d4490488c228c822f3cd4d05c7fda220e25b98f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-10 03:01:21 +00:00
sunnyshao
83bc8e1d2d [automerger skipped] Fix the flicker in the Lock screen page am: 33aba0a694 -s ours 
am skip reason: Merged-In Icb7714c19ae73d15bccc9b6976a10cf343a16f53 with SHA-1 753a5565cb is already in history

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

Change-Id: Id41103b79fca0c56aff8f2e42e6366b12c51ab6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-10 03:01:16 +00:00
mxyyiyi
658bc03d4f Update time format for the first timestamp on usage chartview. 
- If usage data start from the time-change event rather than full-charged event
[Before] https://screenshot.googleplex.com/BokAvKHXmt2Mmwn
[After] https://screenshot.googleplex.com/8thpgVrVt8kqo37

Bug: 336423923
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Change-Id: I66f8b384938f55852e28bd9f50d1a99c7fc9e41b
 2024-05-10 10:51:21 +08:00
Treehugger Robot
6f6629e6cd Merge "Fix the flicker in the Lock screen page" into 24D1-dev 2024-05-10 02:44:25 +00:00
Kangping Dong
da0be0f6f4 Merge "[Thread] update Thread settings screen" into main 2024-05-10 02:39:46 +00:00
Edgar Wang
f437bec1bc Merge "Homepage UX revamp" into main 2024-05-10 00:57:01 +00:00