Commit Graph

419 Commits

Author SHA1 Message Date
Simon Wingrove
26dc66204c Merge "Update access strings per UXW" into main 2024-05-13 21:36:49 +00:00
Chaohui Wang
b63ed17b94 Merge "Use DataUsageFormatter to format app data usage" into main 2024-05-13 08:06:38 +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
Simon Wingrove
82f4844bd7 Update access strings per UXW
Bug: 338390125
Test: Builds
Flag: EXEMPT resource only update
Change-Id: I4719a37bd63b46c51ae4cf3009abaf920d624697
2024-05-10 14:31:27 +00:00
Chaohui Wang
59e2bce852 Merge "Fix empty network scan result" into main 2024-05-10 12:03:26 +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
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
Chaohui Wang
8c507e871b Catch exception in telephonyRepository.isDataEnabledFlow
And migrate BillingCycleRepository to use it.

Fix: 339197552
Test: manual - on data usage
Test: unit test
Change-Id: Ieac295f37fdbf75d184d66ea11f170652af3ec5f
2024-05-09 15:49:26 +00:00
Chaohui Wang
5a85f6a72f Reduce mobileDataEnabledFlow_forSubIdNotChanged flaky
Bug: 338300477
Test: unit test
Change-Id: Id45e5228b60581b00d92e38f553a22631fb5c9b2
2024-05-09 14:29:30 +00:00
Chaohui Wang
46a70d0369 Merge "Fix data usage when policy has no cycle" into 24D1-dev am: bb90a2c5c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27209264

Change-Id: Ib349fb3eed75dc0d399d9a07355e170e30d1d985
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 08:56:39 +00:00
Chaohui Wang
33df5bb68b Fix isInCallFlow when no active subscription am: c63f06d4c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27205448

Change-Id: I5a58046c3e7ed2a1164648516248b39ee4feb5ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 14:48:55 +00:00
Chaohui Wang
107cca7a77 Fix data usage when policy has no cycle
Fallback to four weeks, as the same as no policy.

Fix: 336108815
Test: manual - on DataUsageList
Test: unit test
Change-Id: I63140a13ea3f3ee790cc911432fbdfd6247f7318
2024-05-07 14:22:35 +00:00
Chaohui Wang
c63f06d4c8 Fix isInCallFlow when no active subscription
Direct emit false in this case to fix.

Fix: 338484668
Test: manual - on SIMs
Test: unit test
Change-Id: I5286701160d95b1c06e577db6232f7e70f040cdb
2024-05-07 10:57:24 +00:00
Chaohui Wang
ad9c64fcdc Merge "Reapply "Create CallStateRepository.isInCallFlow"" into 24D1-dev am: bbc3a352e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27150958

Change-Id: I8398dcad2f0c0da66cf9c579c5adb5f4c91c2e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-30 08:12:16 +00:00
Chaohui Wang
bbc3a352e3 Merge "Reapply "Create CallStateRepository.isInCallFlow"" into 24D1-dev 2024-04-30 07:47:30 +00:00
Tom Hsu
219fb8a3f6 Merge "Revert^2 "Add a new warning dialog for Satellite mode"" into 24D1-dev am: 0a8d830616
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27150955

Change-Id: I02b98dfea84be429e9a46dc8d0e3846dda29f203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-30 07:24:09 +00:00
Tom Hsu
0a8d830616 Merge "Revert^2 "Add a new warning dialog for Satellite mode"" into 24D1-dev 2024-04-30 07:05:49 +00:00
Chaohui Wang
7bbd8fa4e3 Reapply "Create CallStateRepository.isInCallFlow"
This reverts commit 93e4c65d3d.

Fixed the test by cherry-pick change
I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0.

Bug: 336209156
Test: manual - on MobileNetworkSwitchController
Test: atest SubscriptionInfoListViewModelTest
Change-Id: Id606d6ee90acd8a98de706d8533fed0aac96bff4
2024-04-30 12:33:54 +08:00
Chaohui Wang
f97e76bc3f Fix SubscriptionInfoListViewModelTest
Fix: 329160337
Test: unit test
Change-Id: I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0
(cherry picked from commit 10f5bdabb4)
Merged-In: I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0
2024-04-30 03:32:08 +00:00
Tom Hsu
1b308f5df8 Revert^2 "Add a new warning dialog for Satellite mode"
This reverts commit 15c90207e2.

Reason for revert: ag/27138142 shall fix the crash instead of reverted one.

Change-Id: Icf46fda7af9c9bb6921bc10de0f9c93926f42fac
2024-04-30 02:17:15 +00:00
Priyanka Advani
fe0eedf1e3 Merge "Revert "Create CallStateRepository.isInCallFlow"" into 24D1-dev am: 134635786f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27145129

Change-Id: Ica49442da20fcea404ad95a2591506991a8e55b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 22:48:38 +00:00
Priyanka Advani
93e4c65d3d Revert "Create CallStateRepository.isInCallFlow"
This reverts commit 6142ad927e.

Reason for revert: Droid-monitor created revert due to Build breakage in b/337914519. Will be verifying through ABTD before submission.

Change-Id: I300d5397de156fd0815965cfd99f0814f1365ffc
2024-04-29 20:31:15 +00:00
Chaohui Wang
e4e6f0ecf4 Merge "Create CallStateRepository.isInCallFlow" into 24D1-dev am: ac55241fc5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27139248

Change-Id: Ie5cde4ca5e04167a63fd41adfb5ccd1376a0d870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 12:51:24 +00:00
Tom Hsu
b5391d1d3f Merge "Revert "Add a new warning dialog for Satellite mode"" into 24D1-dev am: 45549d928b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27139078

Change-Id: Ib7b007734f3916b5caf652a79708f20f8df90bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 12:51:08 +00:00
ELIYAZ MOMIN
15c90207e2 Revert "Add a new warning dialog for Satellite mode"
This reverts commit 680d062c77.

Reason for revert: <Potential culprit for b/337796129  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
>

Change-Id: I6fbb7a0587fbb474012e1a97a75c036420500f99
2024-04-29 11:37:35 +00:00
Tom Hsu
71e0980f4c Merge "Add a new warning dialog for Satellite mode" into 24D1-dev am: cec2f402a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27113656

Change-Id: I4962f1906eb66b54385d459fc2a3cc987ee74b84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 11:17:30 +00:00
Chaohui Wang
6142ad927e Create CallStateRepository.isInCallFlow
Which will emit true if any active sub is in call.

And also create SubscriptionActivationRepository to use isInCallFlow.

Bug: 336209156
Test: manual - on MobileNetworkSwitchController
Test: unit test
Change-Id: I75460bf17961349557ac1e19e7f6b15249f3d7b0
2024-04-29 10:15:13 +00:00
tomhsu
680d062c77 Add a new warning dialog for Satellite mode
Bug: 337154438
Test: atest pass.
Test: Maunal test pass.
Change-Id: I33dbf3502c780cedd5422e2b44678ecb9a22a662
2024-04-29 08:37:28 +00:00
Ivan Chiang
dade97f27c Merge "Add the different summary for the app store details" into main 2024-04-29 04:26:18 +00:00
Manish Singh
544fa52e1a Merge "Don't show uninstall for all users" into main 2024-04-25 09:30:05 +00:00
Chaohui Wang
446e0a18d1 Refresh the preferred APN after "Reset to default"
Previously, ApnSettings will updated the preferred APN selection when
data connection changes, but this is not the source of truth.

Observe the preferred APN directly to fix.

Fix: 257316932
Test: manual - on ApnSettings
Test: unit test
Change-Id: Ie323316ab8f7fa63edf5cf90633bcdd4486728c4
2024-04-25 11:14:21 +08:00
Ivan Chiang
6afb9ece62 Add the different summary for the app store details
When the initiating package is different from the installing package,
show the different summary. E.g WebApk

Test: atest AppInstallerInfoPreferenceTest
Bug: 329140383
Change-Id: Icd5559bce06c059844269d70926b3c0b39589edb
2024-04-25 02:41:33 +00:00
Paulz Chen
a2187ca756 Merge "Reland add FeatureProvider for SyncAcrossDevices Settings integration." into main 2024-04-24 02:27:31 +00:00
paulzhchen
5f391359e3 Reland add FeatureProvider for SyncAcrossDevices Settings integration.
Prior CL ag/26930404 was reverted because an unused class was
trimmed in AOSP, causing test cases to throw NoClassDefFoundError
exceptions. This CL combines ag/26930404 and ag/26995936 to address
the failure.

Bug: 330498032
Test: atest FakeFeatureFactory, atest SyncAcrossDevicesPreferenceControllerTest
Change-Id: I0a7ebccdebcad20e06d7542d7c4a0005885f393b
2024-04-24 02:02:35 +00:00
Manish Singh
9229860d60 Don't show uninstall for all users
when the only profiles that have the package are hidden in quiet mode

Fix: 334041279
Test: atest AppInfoSettingsMoreOptionsTest
Test: manual
Change-Id: Ic8e594eb1db5bed926783a244a24e24c4435f04e
2024-04-23 16:54:09 +00:00
YK Hung
ed1789a0d3 Merge "Fix AppBatteryPreferenceTest flaky" into main 2024-04-23 16:13:06 +00:00
Chaohui Wang
23c66d1278 Fix AppBatteryPreferenceTest flaky
Bug: 335887683
Test: unit test
Change-Id: I5a1753835d2d47712ea249081c9a77c455eb3291
2024-04-23 17:53:25 +08:00
Pechetty Sravani
dbb7d1772b Merge "Revert "Add FeatureProvider for SyncAcrossDevices Settings integ..."" into main 2024-04-23 09:12:48 +00:00
Pechetty Sravani
ea26f2d729 Revert "Add FeatureProvider for SyncAcrossDevices Settings integ..."
Revert submission 26930404-syncacrossdevices

Reason for revert: Potential culprit for b/336431732- verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:26930404-syncacrossdevices

Change-Id: I9da0de82978fa6984a4636e0c9ccc891d9287fd2
2024-04-23 07:43:47 +00:00
Paulz Chen
319245cdbe Merge "Add FeatureProvider for SyncAcrossDevices Settings integration." into main 2024-04-22 23:52:23 +00:00
paulzhchen
132e7341ea Add FeatureProvider for SyncAcrossDevices Settings integration.
Bug: 330498032
Test: FakeFeatureFactory
Change-Id: Iccf7ca4411a03d29e9eeba6c1544ccbd95b97654
2024-04-22 06:58:31 +00:00
Chaohui Wang
07335514c4 Create AppDataUsageSummaryController
Content description for usage will be added later.

Bug: 318780411
Test: manual - on AppDataUsage
Test: unit test
Change-Id: I3990218395dfd7553554346ea8ef00368ba57589
2024-04-22 04:58:49 +00:00
Varun Shah
74668d1e7e Merge "Remove RUN_BACKUP_JOBS special app access page." into main 2024-04-19 17:41:28 +00:00
Jakob Schneider
d18aba0792 Merge "Handle PackageManager.NameNotFoundException thrown from PackageManager.isAppArchivable as false" into main 2024-04-16 10:02:32 +00:00
Samuel Huang
316e7bf3e6 Disable SIM On/Off operation when device is in Satellite Enabled Mode
Cherry-picking ag/26965536 into the 24D1-dev branch caused conflicts. Therefore, manually create this CL to migrate the MobileNetworkSwitchController to Kotlin and utilize Compose.

Bug: 315928920
Test: atest, manual
Change-Id: I215b5a4615a3b3da6fc160f76c85c814210cc3ef
Merged-In: I7aaaf43b4c449129197e7cc92565d274ffdd2d8c
2024-04-16 09:52:00 +00:00
SongFerng Wang
7eaa2b1661 Merge "Add the mobile data into new SIMs page" into main 2024-04-16 08:54:26 +00:00
songferngwang
e471604d32 Add the mobile data into new SIMs page
Bug: 329584989
Test: verify UI.
atest TelephonyRepositoryTest

Change-Id: Ia00ac287ffd0d15ba0c9350b731c3afc1a04b7a0
2024-04-16 07:20:21 +00:00
Varun Shah
321e08e538 Remove RUN_BACKUP_JOBS special app access page.
Bug: 333624438
Test: visual
Change-Id: Ib01bd6556768a943ae7fae013c6ccb82b1b96697
2024-04-16 01:02:49 +00:00
Mark Kim
88dc6c43c3 Handle PackageManager.NameNotFoundException thrown from
`PackageManager.isAppArchivable` as false

Test: AppArchiveButtonTest
Bug: 333465028
Change-Id: I4ecbdabbf3869615834eda5c3fbe489c5ad9eadb
2024-04-15 20:05:03 +00:00