Commit Graph

52676 Commits

Author SHA1 Message Date
Treehugger Robot
29ad4163c2 Merge "When erasing an eSIM, verify the device screen PIN lock if one is set." into 24D1-dev 2024-04-18 17:46:59 +00:00
Rafael Higuera Silva
6389239f76 Merge "Add logic to log interaction of RAC warning dialog." into 24D1-dev 2024-04-18 16:28:38 +00:00
Meng Wang
63d10cc4ba When erasing an eSIM, verify the device screen PIN lock if one is set.
SIM PIN lock existence isn't checked anymore.

Bug: 329202869
Test: manual - see b/329202869#comment41
Merged-In: I2c4d2b7e224973c4afa75573e05afe7607d2ae6b
Change-Id: I2c4d2b7e224973c4afa75573e05afe7607d2ae6b
(cherry picked from commit f4462ac5c2)
2024-04-17 22:16:46 +00:00
Treehugger Robot
f02cfc9526 Merge "Add logic to log interaction of RAC warning dialog." into 24D1-dev 2024-04-17 17:30:24 +00:00
Samuel Huang
efe0ce2b2f Merge "Disable SIM On/Off operation when device is in Satellite Enabled Mode" into 24D1-dev 2024-04-17 07:44:44 +00:00
Vaibhav Devmurari
50a16b9fef Merge "Modify PK Settings page to make it more user friendly" into 24D1-dev 2024-04-16 13:26:07 +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
YK Hung
67df73a1fd Merge "Add charging string V2 for settings" into 24D1-dev 2024-04-16 01:25:31 +00:00
Pajace Chen
d9b44a8b9c Add charging string V2 for settings
Apply charging string V2 for settings

Bug: 328546483
Test: Manual test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6f3c97f60a966a8ec357ba4d15b19d9d7a04b34d)
Merged-In: Ic68bf4231da81d865faa285bca97a929abe26a42
Change-Id: Ic68bf4231da81d865faa285bca97a929abe26a42
2024-04-12 06:23:55 +00:00
songferngwang
428aaacefa Fix the settings crash
When the user select mobile network settings item with subid=-1 in
the search list, then some of objects are not initialized.

Bug: 325956182
Test: atest AutoSelectPreferenceControllerTest
atest MobileNetworkPhoneNumberPreferenceControllerTest
atest MobileNetworkSpnPreferenceControllerTest
atest MobileNetworkImeiPreferenceControllerTest
atest WifiCallingPreferenceControllerTest

Change-Id: I17c24b6f542392f018c65b689862f9735fad4b9f
(cherry picked from commit e0b5de28ae)
2024-04-12 06:07:21 +00:00
Neil Fuller
a39c14c08e Restore enterprise policy checks
Restore enterprise policy checks removed by commit
fdab44f9e7 and not since restored by other
changes.

Bug: 325886855
Bug: 316584466
Bug: 235445309
Test: Treehugger only
Change-Id: Id3d79805bb2289b84ad34ac05a97e50f0410502f
(cherry picked from commit 5d80553a15)
2024-04-11 12:48:51 +00:00
Samuel Huang
f2ed0ec752 Avoid SIM card on/off dialog pop-up if satellite is enabled
In order to support Satellite SOS, device will have two modems, one for TN, one for NTN(satellite).

When device switches to satellite mode, PSS only disables TN eSIM (and not TN PSIM). Since NTN image only supports eSIM, there is no need to disable TN PSIM before switching to NTN image. Somehow device is seeing that TN PSIM is available and is showing the user to enable it. So we need to handle it by not showing this dialog during satellite mode enabled.

Bug: 330585109
Test: atest, manual
Change-Id: I9781b7e1cef8f7f10e7ecdbb23ca729da4d06eba
2024-04-11 05:20:53 +00:00
Rafael Higuera Silva
268fa16d5b Add logic to log interaction of RAC warning dialog.
Bug: 326618987
Test: make, atest EuiccRacConnectivityDialogFragmentTest
Change-Id: Iccec9245da27d525cfb3d74504ab86859e152a6e
Merged-In: Iccec9245da27d525cfb3d74504ab86859e152a6e
(cherry picked from commit ea0453e5f6)
2024-04-10 16:26:06 +00:00
Song Chun Fan
844d2f4c67 [Settings/Archive] remove all checks for the archiving system property
No longer needed

BUG: 331165939
Test: builds
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6ae958abd26ed77ecd4d3fb1720bb912553da2ea)
Merged-In: I24bc9a3d7503da1606d29eb3dfa963b0e6bf9d3e
Change-Id: I24bc9a3d7503da1606d29eb3dfa963b0e6bf9d3e
2024-04-09 18:08:41 +00:00
Rafael Higuera Silva
5405aa17a1 Add logic to log interaction of RAC warning dialog.
Bug: 326618987
Test: make, atest EuiccRacConnectivityDialogActivityTest
Change-Id: If4e3285b3715e9630d4932d4bf1bcb71e4167cff
Merged-In: If4e3285b3715e9630d4932d4bf1bcb71e4167cff
2024-04-09 17:14:35 +00:00
Vaibhav Devmurari
28e20afb08 Modify PK Settings page to make it more user friendly
PK Settings page:
    - Show current PK layout selected for the current user profile and current IME language instead of a list of IMEs

PK layout mapping page:
    - Show IME name in header only if multiple active IMEs
    - Show the PK layout selection criteria (Automatic v/s User selected)

Bug: 325925410
Bug: 326195401
Test: manual
Change-Id: I93a2e169742a800fa116fa5d55e1a91e5548cebb
Merged-In: I93a2e169742a800fa116fa5d55e1a91e5548cebb
2024-04-09 10:42:57 +00:00
Rafael Higuera Silva
f6e0b08fc6 Merge "Add new warning dialogue when user is Resetting mobile network settings." into 24D1-dev 2024-04-05 23:43:02 +00:00
Rafael Higuera Silva
363535192d Add new warning dialogue when user is Resetting mobile network settings.
If the user is reseting mobile network settings and have all these
conditions:
- No Wi-fi
- Has check to delete all eSIMs
- Has a least one RAC sim carrier
Then show the warning dialogue.

Test: make, manually test, atest SubSettingLauncherTest, atest ResetNetworkTest,  atest SubscriptionUtilTest
Bug: 328649510
Merged-In: I47d9b868b649b259d5e4008ec742317d2cb7cf51
Change-Id: I47d9b868b649b259d5e4008ec742317d2cb7cf51
(cherry picked from commit 147cc19b53)
2024-04-05 21:39:13 +00:00
Hakjun Choi
df0ea6c723 Merge "Make satellite more info url carrier configurable" into 24D1-dev 2024-04-02 23:03:24 +00:00
Treehugger Robot
214646a032 Merge "Add new dialogue when user is going to delete multiple sims where aleast on of them use RAC." into 24D1-dev 2024-04-01 21:56:24 +00:00
Hakjun Choi
3c54876db7 Make satellite more info url carrier configurable
guidance url link are vary per each carrier, therefore makes it carrier configurable

Bug: 330948681
Test: manually test whether URL works as intended on pixel with TMO/SKT SIM
Change-Id: I062b1e9267c6edf3289d85dc58f9ab2d9cff64d8
2024-03-28 23:24:14 +00:00
Hakjun Choi
e479584d52 Merge "Add carrier satellite feature flag into filter out logic in Settings" into 24D1-dev 2024-03-28 19:53:12 +00:00
Andy Wickham
b970322d4c Merge "Allows for system navigation settings to be added dynamically." into 24D1-dev 2024-03-27 23:56:24 +00:00
Hakjun Choi
7a4d0284cc Add carrier satellite feature flag into filter out logic in Settings
Null object reference exception happend when carrier satellite feature is disabled. whille filtering out satellite plmns from scanned plmns

Bug: 331182758
Test: atest NetworkSelectSettingsTest, manually test with feature enabled/disabled on pixel
Change-Id: I394e86ee9c26efdc9920006e0b8ca015500d5162
2024-03-27 00:23:03 +00:00
Vincent Wang
8cc6c89e4b Merge "Fix Settings crash after clicking "Add Fingerprint"" into 24D1-dev 2024-03-26 06:05:32 +00:00
Vincent Wang
d5b1bf7554 Fix Settings crash after clicking "Add Fingerprint"
Bug: b/331136606
Test: 1.Add 1 Fingerprint
      2. adb shell am start -a android.settings.FINGERPRINT_SETTINGS
      3. input correct pin/pattern/password
      4. Click Add Fingerprint cehck if Setting work correctly
Change-Id: I076ed7488729a24aea9b47a843b7785e128f6791
2024-03-26 02:09:28 +00:00
Rafael Higuera Silva
496075f1be Add new dialogue when user is going to delete multiple sims where aleast on of them use RAC.
Test: make, manually test, atest com.android.settings.network, atest SubscriptionUtilTest
Bug: 328649505
Change-Id: I0c6fb7b5407179ec6850ece47f486b64759e2d1c
(cherry picked from commit 9ac44b3aae)
2024-03-24 23:46:53 +00:00
Andy Wickham
9aa1c402ae Allows for system navigation settings to be added dynamically.
This allows for controller-backed preferences to be added or
overridden via xml.

Similarly, if the controllers cause all of the preferences for
2 or 3 button nav to be unavailable, we hide the settings button.

Bug: 324036308
Test: Manual and unit tests
Flag: NA
Change-Id: I2371f3173076172489966728ac69c8767570cd56
Merged-In: I2371f3173076172489966728ac69c8767570cd56
2024-03-21 20:31:06 +00:00
Lynn Yeh
4115a9a278 Merge "Fix toolbar keyboard navigation and touch." into 24D1-dev 2024-03-20 07:56:36 +00:00
Vincent Wang
177867af12 Merge "Show calibtation result in FingerprintSettings & EnrollEnrolling if results are available" into 24D1-dev 2024-03-19 05:37:39 +00:00
George Chang
1df6f6a976 Merge "Revert "settings(dev): Remove NFC stack logging control"" into 24D1-dev 2024-03-19 05:06:34 +00:00
Vincent Wang
118abc5568 Show calibtation result in FingerprintSettings & EnrollEnrolling
if results are available

Bug: b/326155807
Test: Enroll multiple fingerprints and check if
        calibration isn't triggered.

Change-Id: I006db64f001fb70d2bb294a15a2d3efc77e2da25
Merged-In: I006db64f001fb70d2bb294a15a2d3efc77e2da25
2024-03-19 02:32:58 +00:00
Chaohui Wang
67579d564b New countryIfOriginLabel
And display this label as fallback when Regulatory Image is missing.

Bug: 329378943
Test: manual - on SIMs
Test: unit test
Change-Id: I0b8851da20face9ca444b3e6456a4a662b944b65
Merged-In: I0b8851da20face9ca444b3e6456a4a662b944b65
2024-03-15 09:23:31 +00:00
David Liu
033080b61d Fix toolbar keyboard navigation and touch.
- toolbar default has touchscreenBlocksFocus enabled which make toolbar not focusable when touch screen present. Explicitly set touchscreenBlocksFocus to false make the toolbar can be focus when keyboard navigation.
- Remove focusableInTouchMode which breaks normal touch control. Read https://android-developers.googleblog.com/2008/12/touch-mode.html for more details.

Fix: 327025582
Fix: 324420544
Test: manual test with keyboard and touch navigation

Change-Id: I6cad869e3a51926405a6f3ae894daa5416050bf8
(cherry picked from commit 9b63fbb772)
2024-03-15 06:40:57 +00:00
George Chang
b5d57eaa58 Revert "settings(dev): Remove NFC stack logging control"
This reverts commit a5bd1cf34f.

Bug: 329776725
Test: manual turn on/off debug logging.
Merged-In: I3c6026e230c7d35f04d9771442fadbf040a84b94
Change-Id: Ica004bb5f22636777287acfe1226b0f6a650d4f7
2024-03-15 05:55:41 +00:00
Chaohui Wang
bfb4086689 Update the summary when Wi-Fi calling ready
Since the correct summary can only be got after Wi-Fi calling ready.

Fix: 325414275
Test: manual - on Mobile Settings
Change-Id: Ida94fd0a86f2130b9f0dded82fe18efd3ffc0c27
Merged-In: Ida94fd0a86f2130b9f0dded82fe18efd3ffc0c27
2024-03-14 15:11:40 +08:00
Wilson Wu
7fe0754011 Fix keyboard vibration settings delay
The default settings observer delay is 10s for
background service. It cause the apps get the
settings update delay and lead a unsync behavior.

Update the settings change without delay.

Bug: 327094397
Test: Manual test with bug steps
Test: atest KeyboardVibrationTogglePreferenceControllerTest
Change-Id: Ib1c23ec9e1442e8397c7a36ffa157594ac64a9b3
(cherry picked from commit f2174611b8)
Merged-In: Ib1c23ec9e1442e8397c7a36ffa157594ac64a9b3
2024-03-14 02:40:12 +00:00
Jacky Wang
081dbac72e Reset app preferences does not trigger backup for App battery usages
Bug: 328712606
Fix: 328712606
Test: UT && Verify logcat when change/reset App battery usages
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ef8a51fac85eedee8f9509b9f7c002281c1ae093)
Merged-In: Ia3917c8dc2654185f5f048c048362fd47379b7d1
Change-Id: Ia3917c8dc2654185f5f048c048362fd47379b7d1
2024-03-13 03:23:50 +00:00
Jacky Wang
b03de69d79 Sort applications to avoid backup data change
Bug: 328698829
Fix: 328698829
Test: Manual test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ea8ed47d070be8b74297f1ca330dfdf9b196ec29)
Merged-In: I0e5bf1145d972db136bbd85571f015b4ab6fb171
Change-Id: I0e5bf1145d972db136bbd85571f015b4ab6fb171
2024-03-13 03:23:34 +00:00
Jacky Wang
85e130ad7a [DataStore] Support backup data state computation
Bug: 325144964
Test: Manual tests
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5847d50e7bcab7d45d03351df802fb1228226aa5)
Merged-In: I8ad4f2788f9f364eceb1bca841830e1f3a68fe77
Change-Id: I8ad4f2788f9f364eceb1bca841830e1f3a68fe77
2024-03-13 03:23:27 +00:00
Jacky Wang
a76aade27e [DataStore] Support backup data with compression
Bug: 325144964
Test: Manual tests
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:23821a69f31c5712cb369bfdd7776a66926dc5ac)
Merged-In: Id73a30c2b58fafa6d9d1cbe247a6d9c38397394b
Change-Id: Id73a30c2b58fafa6d9d1cbe247a6d9c38397394b
2024-03-13 03:23:19 +00:00
Jacky Wang
11c9f1bff4 [DataStore] Migrate LocaleNotification SharedPreferences to BackupRestoreStorage
Bug: 325144964
Test: Manual tests
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cc0a94d73247fa81eff0054a0dcf06e99c45adb1)
Merged-In: I195ee91f29030fcfe7176ed0c18fb2e2d0d40257
Change-Id: I195ee91f29030fcfe7176ed0c18fb2e2d0d40257
2024-03-13 03:23:12 +00:00
Wilson Wu
81f2587fd4 Add fixed amplitude check for keyboard vibration
Make sure the keybaord vibration settings only show
up when fixed amplitude provided to avoid any unsync
behavior with platform.

Bug: 326027376
Test: atest KeyboardVibrationTogglePreferenceControllerTest
Change-Id: I3b4e06660e3eaa6ce537b72831073f092cba37e2
2024-03-08 11:22:34 +00:00
Graciela Wissen Putri
a0f573a35e Follow config overlay's order of aspect ratio options
Fix flaky UserAspectRatioAppsPageProviderTest by using advanceUntilIdle
to make sure all coroutines are finished before asserting.

Bug: 325911424
Test: atest UserAspectRatioDetailsTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:32815ad699448c5c5b1f38df6d2d2a881d4251c1)
Merged-In: I83e9a7f31536c1a006789722b0310f3364d14337
Change-Id: I83e9a7f31536c1a006789722b0310f3364d14337
2024-03-05 17:11:59 +00:00
SongFerng Wang
71c6c3e557 Merge changes I96574a79,I74681222 into main
* changes:
  Fix the testcase failed
  Add the log for SidecarFragment
2024-03-04 12:27:37 +00:00
Charlotte Lu
3b856490e8 Merge "Change WepNetworkDialogActivity exported="true"." into main 2024-03-04 10:15:53 +00:00
songferngwang
0d7d180246 Add the log for SidecarFragment
The system miss the SidecarFragment result, so the settings did not
active the esim.

Bug: 302505660
Test: NA
Change-Id: I746812220fed001eddc7d4aeeaf7aa0b04b86692
2024-03-04 10:10:30 +00:00
Zaiyue Xue
62132fffb2 Merge "Update the logic for logging anomaly information to WW." into main 2024-03-04 08:00:08 +00:00
Zaiyue Xue
a399c73ba0 Merge "Fix anomaly is not logged in non-debug mode." into main 2024-03-04 07:55:18 +00:00
Chaohui Wang
66dacdf050 Merge "Create phoneNumberFlow" into main 2024-03-04 07:48:37 +00:00