Commit Graph

21940 Commits

Author SHA1 Message Date
Chaohui Wang
ffcbbd375a Clean up MobileNetworkSummaryStatus
Fix: 338904413
Test: m Settings
Change-Id: Ic26bf7833c8fbdbeffc4f47dcd6dcd6191394e1b
2024-05-06 07:26:06 +00:00
Fan Wu
45cf636b1a Merge "Update test looper mode to INSTRUMENTATION" into main 2024-05-06 03:08:27 +00:00
Pajace Chen
c7f595814b Merge "Fix test case failed issue" into 24D1-dev am: df8dc5dc61
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27200838

Change-Id: I988aa8852b922f9a05a2352850d803ea3feb7e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 02:37:33 +00:00
Jason Chiu
41bd910d11 Merge "Check whether the user is a sub profile before starting Settings homepage" into main 2024-05-03 02:14:26 +00:00
Pajace Chen
df8dc5dc61 Merge "Fix test case failed issue" into 24D1-dev 2024-05-03 02:08:09 +00:00
pajacechen
1d03a55ea8 Fix test case failed issue
This test case is not really failed, it doesn't break the functionality
of production code. The reason for failure is caused by the timeZone.
A different timezone could result in a different time string.
So, ignore this test case for now.

Test: Unit Test
Fix: 338343937
Change-Id: Iab0f6f2d454f226568ac09a49ae5372f3a9bc88f
2024-05-03 01:59:40 +00:00
Jason Chiu
bd74caeb99 Check whether the user is a sub profile before starting Settings homepage
Fix: 336449492
Test: atest SettingsHomepageActivityTest LocationInjectedServicesPreferenceControllerTest UserDetailsSettingsTest ActionDisabledByAdminDialogHelperTest ProfileSelectFragmentTest ProfileSelectLocationFragmentTest
- Start a managed app's info page
- Start a private app's info page
- Switch to a secondary user and start Settings
- Switch to the guest user and start Settings

Change-Id: I1c7c95d95c4739d70839a742ebc4e72b59b1d555
2024-05-02 10:17:28 +08:00
Treehugger Robot
72ba6ec2ca Merge "Rename Multiple users page to Users" into main 2024-05-01 09:47:56 +00:00
Treehugger Robot
b48c66ebea Merge "settings: Make use of ACTION_NETWORK_PROVIDER_SETTINGS" into main 2024-04-30 21:44:24 +00:00
Joshua Mccloskey
968015c4e6 Merge "Restart fingerprint auth on cancel." into main 2024-04-30 20:51:44 +00:00
Tetiana Meronyk
177e852ea9 Rename Multiple users page to Users
Ensure it is still searchable by "multiple users" prompt.

Bug: 336764972
Test: manual
Change-Id: I1126bfe601b75532882d6158d82be1a3b566aefc
2024-04-30 18:48:40 +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
Joshua McCloskey
4efd4c16f9 Restart fingerprint auth on cancel.
Test: atest FingerprintSettingsFragmentTest
Fixes: 336572954
Change-Id: Ie64d509caf052271a141e466f5c840e92f5dc119
2024-04-29 22:30:23 +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
Tom Hsu
45549d928b Merge "Revert "Add a new warning dialog for Satellite mode"" into 24D1-dev 2024-04-29 12:34:55 +00:00
Manish Singh
0f4d761d93 Merge "Don't send data for non-main users" into main 2024-04-29 11:51:46 +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
Tom Hsu
cec2f402a9 Merge "Add a new warning dialog for Satellite mode" into 24D1-dev 2024-04-29 10:57:55 +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
Fan Wu
ada799e155 Update test looper mode to INSTRUMENTATION
Bug: 337171922

Test: atest
Change-Id: Ifb02a3be4e91383a3c1d9b8fe598aa50a8d877f9
2024-04-28 07:55:34 +00:00
Treehugger Robot
3b62993c27 Merge "Remove redundant call to SetFlagsRule.initAllFlagsToReleaseConfigDefault()" into main am: 4ab7d5bacc am: 4e01eba72c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3058523

Change-Id: I70d317584f659878fa7e4ad36a2a3b32cff6b14a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 13:02:14 +00:00
Fan Wu
e82d0e94d4 Merge "Remove all remaining usages of LooperMode.LEGACY" into main 2024-04-26 10:07:21 +00:00
Samuel Huang
9b8558394c Fix the "Use this SIM" switch does not disable during phone calls am: 4f454b43c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27105181

Change-Id: I2be1b144aa7d1d120692ccfece3c921e488fc308
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 09:13:17 +00:00
Fan Wu
14c9806612 Remove all remaining usages of LooperMode.LEGACY
Also temporarily ignore UwbPreferenceControllerTest due to unfinished tasks on main thread, see b/337171922 for more detail

Bug: 330824314

Test: atest
Change-Id: I45219fee8094b38790faf8d778e8a1ddeb7c7aaa
2024-04-26 07:11:26 +00:00
Samuel Huang
4f454b43c6 Fix the "Use this SIM" switch does not disable during phone calls
If the registration failed (e.g., device doesn't support satellite), SatelliteManager will not emit the current state by callback. We send `false` value by ourself to make sure the flow has initial value.

Bug: 315928920
Test: atest, manual
Change-Id: Ic87f71bc576cfb1f8e4053c5784fca401adaec08
2024-04-26 05:54:40 +00:00
Treehugger Robot
984039eec8 Merge "Provide different ways to detect battery defender." into main 2024-04-26 04:18:55 +00:00
Samuel Huang
a94bfd4a47 Merge "Ignore ACTION_PRIMARY_SUBSCRIPTION_LIST_CHANGED event if satellite session is started" into 24D1-dev am: fea80bf236
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27071155

Change-Id: Idcbc71555ddbebbd28553530ca8ddd6e364635ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 03:22:25 +00:00
Yiling Chuang
11e810e7a7 Provide different ways to detect battery defender.
Bug: 335567248
Test: robotests
Change-Id: Ie1d3d7da99fa698468ffd124410cfd3b56bc0c34
2024-04-26 03:10:51 +00:00
Samuel Huang
fea80bf236 Merge "Ignore ACTION_PRIMARY_SUBSCRIPTION_LIST_CHANGED event if satellite session is started" into 24D1-dev 2024-04-26 03:08:53 +00:00
Rafael Higuera Silva
1d307afd95 Merge "Extract and fix logic for showing rac dialog." into 24D1-dev am: 958b737fcc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27072479

Change-Id: I9f5c4c8dea3c7aebc73b5121d6ace7aca22c1dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-25 19:07:24 +00:00
Samuel Huang
faa640e8fc Ignore ACTION_PRIMARY_SUBSCRIPTION_LIST_CHANGED event if satellite session is started
When satellite session is started, we need to suppress the 'Choose SIM for mobile data' and 'Update preferred SIM' dialogs to prevent user turn on SIM.

Bug: 334139957
Test: atest, manual
Change-Id: Id56a98f3d1cfd38875173a643c992393d3dbeec8
2024-04-25 13:34:43 +00:00
Manish Singh
50b5bae531 Don't send data for non-main users
This is a regression caused by ag/26661827

Fix: 333872544
Test: manual
Test: atest PrivateSpaceSafetySourceTest
Change-Id: I0465899af3745fa39eab8806dbceb347d70b0aa3
2024-04-25 12:23:40 +00:00
Angela Wang
93f4595b4e Merge "Update string resource for HA summary" into main 2024-04-25 12:11:26 +00:00
Joseph Vincent
19d7d5be78 Merge "Mock LockPatternUtils.isSecure() method in test setup" into main 2024-04-25 11:53:15 +00:00
josephpv
6655fcd04e Mock LockPatternUtils.isSecure() method in test setup
Added mockd for LockPatternUtils class in test setup as per the comment
in b/323649600#comment7 to handle for the test failure bug.
The tests are passing locally without this.

Bug: 336518132
Test: atest com.android.settings.privatespace
Change-Id: Ie042bb7dd6edefef094d3b658946ff6eaaa6f801
2024-04-25 10:13:35 +00:00
Manish Singh
544fa52e1a Merge "Don't show uninstall for all users" into main 2024-04-25 09:30:05 +00:00
Angela Wang
14a708a2ad Update string resource for HA summary
Update the message format to align with existing pattern.

Bug: 333912856
Bug: 307705966
Test: atest AccessibilityHearingAidPreferenceControllerTest
Change-Id: Ib8b38e6dc0df732c16f976911597076f6f92ed25
2024-04-25 07:55:34 +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