Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,296 Commits 1 Branch 0 Tags
c9e77368f0440e42f524094819798a550362c3ed
Commit Graph

2324 Commits

Author SHA1 Message Date
Daniel Chapin
c9e77368f0 Merge "Fix crash for DefaultSubscriptionController" into tm-dev am: fa878f2f26 am: 1c432c5a1e am: 3a1eb1da63 am: 9777c5af1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18573290

Change-Id: I9bfc1736c04bbd71861c218a44bba356c45edc94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 01:47:25 +00:00
Chaohui Wang
2e34038233 Fix crash for DefaultSubscriptionController 
setSummaryProvider() is used instead of setSummary() in
Ia24d88817c99db7ed3fc264dbc9c10e0a09d8a39, but there is still a place
using the setSummary(), mixing these two will lead to crash.

Change it to setSummaryProvider() to prevent crash.

Fix: 233295254
Fix: 233712251
Test: manual
Change-Id: I4627545711b848009c3bd7179f0368ff82e62697
 2022-05-24 16:51:51 +00:00
TreeHugger Robot
5a998c5021 Merge "Fix crash when operator name contains %" into tm-dev am: 39eb991aa7 am: c59c58e1d3 am: 768cc4e9a8 am: 06bd83a1e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556455

Change-Id: Ic5d11591003d07b4bf1585fbac29f5a1818fcdca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 16:36:10 +00:00
Chaohui Wang
02eb0aa980 Fix crash when operator name contains % 
Currently, cannot use ListPreference.setSummary() when the summary
contains user generated string, because ListPreference.getSummary() is
using String.format() to format the summary when the summary is set by
ListPreference.setSummary().

Use preference.setSummaryProvider() instead, which is recommended for
ListPreference.

Fix: 233295254
Test: manual
Change-Id: Ia24d88817c99db7ed3fc264dbc9c10e0a09d8a39
 2022-05-23 19:02:20 +08:00
TreeHugger Robot
00ef8da5f4 Merge "Show mobile data icon with carrier Wi-Fi level in Settings" into tm-dev am: f16c90f91d am: dd1ad333a8 am: 2b09ae4f4e am: facd82dd9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18467044

Change-Id: I897e405bb5874ec8d3f956d9bf312a3e8c924f8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:55:49 +00:00
SongFerngWang
5031a2b55a The settings crash when it add the RTL mark on MEP message am: 7de5f99847 am: ee2536f3f5 am: 4b1585ebe7 am: 11ea0c10e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482929

Change-Id: I011c909ec2b0d3177b0dab9e22c846662259efab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:25:08 +00:00
TreeHugger Robot
f16c90f91d Merge "Show mobile data icon with carrier Wi-Fi level in Settings" into tm-dev 2022-05-20 11:21:18 +00:00
Weng Su
f8f2d17b66 Show mobile data icon with carrier Wi-Fi level in Settings 
- If carrier Wi-Fi is active then use carrier Wi-Fi level instead of
  mobile data level.

- If carrier Wi-Fi level is less than min-level, use min-level instead.

Bug: 222885558
Test: manual test
atest -c SubscriptionsPreferenceControllerTest \
         WifiPickerTrackerHelperTest

Change-Id: I46ba5129357bae47e5e44dcbbb26e6673581fdc8
 2022-05-20 16:02:47 +08:00
SongFerngWang
7de5f99847 The settings crash when it add the RTL mark on MEP message 
The MEP message string is one line, so it did not need to add more
RTL marks.
hsv: https://hsv.googleplex.com/5694452275347456

Bug: 233082642
Test: manually test and take the hsv.
Change-Id: Iad4d469eb6a74805f3c8d5fe5c7eacea1e7a25d3
 2022-05-20 12:15:06 +08:00
Bonian Chen
30108e8050 Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383 am: 2034695af7 am: d84a2b10f8 am: f2b70c1a08 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347

Change-Id: I648d520f750513407d1adb572b5d5b47f1a1e9f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 12:07:51 +00:00
Bonian Chen
c2719b2924 Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e am: 7e7ef59813 am: cb9e5a8076 am: 08628287f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157

Change-Id: I3c507f4faf2739ec6b9fc1661ebe64208b64684e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 12:07:07 +00:00
Bonian Chen
08b7f53383 Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev 2022-05-19 10:28:21 +00:00
Bonian Chen
fa6c9f3a53 [Settings] Stop network mode query when changing config 
Changing the configuration of network mode could take a long time.
In some cases, it blocks the query operation.
This is a change to stop query operation from execution during the time
when configuration is changing.

Bug: 227431634
Test: local
Change-Id: Ifeb16e7e9a0ec3de970fe588a1cce6d31fbba9cd
 2022-05-17 15:25:12 +00:00
Bonian Chen
61a85eaee7 [Settings] Select RAT in between SIMs for Internet 
The internet page RAT need to be selected based on default data SIM.

Bug: 230190055
Test: local
Change-Id: I87edd7a9ddadf877b9cc0c678e3bba423666125e
 2022-05-17 18:40:06 +08:00
Chaohui Wang
399b39a559 Merge "Fix Change link is not clickable in Internet" into tm-dev am: 92caf1c737 am: 2fdf37432e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18367743

Change-Id: I77603e0cb4520130c738f2cd70e7b080acc441c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 10:27:37 +00:00
Chaohui Wang
b7cb887f8e Fix Change link is not clickable in Internet 
Links are not allowed in footer preference title now.

So splitting the string in to title text and change text to fix.

Fix: 232481379
Test: manual test
Change-Id: I857b33ac06ec2fb9619da94a2947dbc25f5b28db
 2022-05-13 13:22:23 +08:00
SongFerng Wang
cfa2a1353d Merge "stop show preferred SIM card dialog during sim switch" into tm-dev am: 55ded566e3 am: f8c932edad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234803

Change-Id: If5624a814c6918a13f697344a18f7ee7346e6ea8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:37:59 +00:00
SongFerng Wang
55ded566e3 Merge "stop show preferred SIM card dialog during sim switch" into tm-dev 2022-05-11 11:17:28 +00:00
Bonian Chen
3a385ef59c Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev am: 812de51467 am: 4522fcc0e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18231805

Change-Id: I8de5f3ced9fabd0c367ed6163b142431d08bc154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:21:03 +00:00
SongFerng Wang
c19ad2c838 Merge "Reuse the active esim slot" into tm-dev am: b1613b210d am: 1b42068491 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18235422

Change-Id: I08a73a57d083e1dbb91b9e6f7a8fca29b5fb3131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:10:56 +00:00
Bonian Chen
812de51467 Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev 2022-05-10 12:35:30 +00:00
SongFerng Wang
b1613b210d Merge "Reuse the active esim slot" into tm-dev 2022-05-10 06:25:07 +00:00
Bonian Chen
4adf1b9e9d Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9 am: 1efef6337d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632

Change-Id: I32d8a019e751e4b2069a262a97e2f1f7aa5e5eaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 05:02:02 +00:00
SongFerngWang
c389149ff3 stop show preferred SIM card dialog during sim switch 
Bug: 227169390
Test: manually test
Change-Id: I242402e49b267c8cd61a85a46367c778d2d8bbf8
 2022-05-10 11:54:44 +08:00
Bonian Chen
bd971968e9 Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev 2022-05-10 02:25:51 +00:00
Bonian Chen
8b06c96fe9 [Settings] Hide some Preference entries when no mobile data support 
Hide some Preference which requires mobile data on device didn't support
it.

Bug: 221999174
Test: local
Change-Id: I7dd6e13aea0ed4467c7c7edeada564e42ea78349
 2022-05-10 01:12:23 +00:00
Bonian Chen
e0f1081739 [Settings] IMS feature checking before accessing VT IMS API 
Check IMS feature before accessing VT IMS API.o

Bug: 231248315
Test: local
Change-Id: I01b438cc79bb91ca05ba6bf57c7e38eb06e51a98
 2022-05-10 01:32:31 +08:00
SongFerngWang
42aa247383 Reuse the active esim slot 
If there is the active esim slot in SS mode, the settings should
reuse it and does not change the sim slot mapping.

Bug: 229803628
Test: manually test.
Change-Id: I6daa38f54abfaf67c7640d9dc8be0da02eb59554
 2022-05-10 01:04:20 +08:00
TreeHugger Robot
b997b7ea40 Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d5f1760bc2 am: 1ea5c4947f am: d01c722530 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I384afaacb8221af78180d27359f7f7aec56c6e6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:12:45 +00:00
TreeHugger Robot
2e6d03d0f4 Merge "Remove Wi-Fi toggle in settings search" into tm-dev 2022-05-04 15:51:34 +00:00
Weng Su
9dfbd9dab8 Remove Wi-Fi toggle in settings search 
- Remove Wi-Fi toggle preferences in settings search if Wi-Fi state is disallowed to change

- See the result screenshot in b/203168097#comment29

Bug: 203168097
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Ibe352f3ec3413fb0774de0b2bd213bb705e919e0
 2022-05-04 04:01:47 +08:00
Bonian Chen
b0706b2c60 Merge "[Settings] Fix missing part for refactor" into tm-dev am: e83d2a5e0e am: 63686f0534 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18123662

Change-Id: Ibf3a2ec14d8beffaabdfbd294b2436557f13083e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 13:43:14 +00:00
Bonian Chen
5ed53072da Merge "[Settings] Preferred network mode appears during in-call" into tm-dev am: 55d722c2b0 am: f34bb7a6e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18121902

Change-Id: I023a36f161993be3466c955c807c7d60e79c0a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 13:41:49 +00:00
Bonian Chen
e83d2a5e0e Merge "[Settings] Fix missing part for refactor" into tm-dev 2022-05-03 12:33:36 +00:00
Bonian Chen
55d722c2b0 Merge "[Settings] Preferred network mode appears during in-call" into tm-dev 2022-05-03 09:46:47 +00:00
Bonian Chen
03ea151c6a Merge "[Settings] Stop listening data connected intent for presenting reset APN dialog" into tm-dev am: 337cfe6fc0 am: 85a7283c06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090786

Change-Id: I00ca8556fb3e1b1281cf5d6ec74766a19bd7d54a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 09:18:09 +00:00
Bonian Chen
eff476375c [Settings] Fix missing part for refactor 
There're 2 missing parts in previous code refactor:
1. The API change for exiting ECM mode dialog
2. The support of onActivityResult() for PreferenceController

Bug: 226494641
Test: local
Change-Id: I0c2c313a53fbc1b7435f295f190b70653e2f6758
 2022-05-03 07:33:48 +00:00
Bonian Chen
382d27f9c7 [Settings] Preferred network mode appears during in-call 
Preferred networko mode should only presented when allowed.

Bug: 225291570
Test: local
Change-Id: I22edf0f6176a5bd3de12604895d9b14c3b015795
 2022-05-02 20:19:02 +08:00
Bonian Chen
7c0241deb5 Merge "[Settings] Rename title of SIM UI when changed" into tm-dev am: 7bdf717410 am: fd374c4dc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983870

Change-Id: I523ca044e039ca78005504c00291d2eea1fe6e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 08:32:25 +00:00
Bonian Chen
ec3264f831 [Settings] Stop listening data connected intent for presenting reset APN dialog 
Suspening the monitering of intent(TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED)
during the stage of resetting default APN, since its more like a noice
once the reset progress stared (since user pressed the menu button).

Bug: 190127964
Test: local
Change-Id: I524fb4a3b06b50706556b8e68cb36dc5efbd9a07
 2022-05-01 15:28:42 +08:00
Bonian Chen
2acd62e9c9 Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f am: 99de1117bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991

Change-Id: I6b75daebf7e38c9be53d92860e4f3b0cbc2ed225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:00:09 +00:00
Bonian Chen
7bdf717410 Merge "[Settings] Rename title of SIM UI when changed" into tm-dev 2022-04-29 15:59:32 +00:00
Bonian Chen
ba943c9b94 [Settings] Rename title of SIM UI when changed 
Title of subscription page should align with the SIM card.

Bug: 230308627
Test: local
Change-Id: Iab9ba25ac8c3faf7d37f97c8f3f3488cbaa2e228
 2022-04-29 09:10:47 +00:00
Bonian Chen
783314ae4f Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev 2022-04-28 11:05:42 +00:00
Bonian Chen
b92156c03e Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev 2022-04-27 15:57:30 +00:00
TreeHugger Robot
c28169adb9 Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev 2022-04-27 05:56:10 +00:00
Bonian Chen
8789731cde Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle" 
This reverts commit 81d230b250.

Reason for revert: merge failure in other branches

Change-Id: If8661f5f321f22df96aab54eb8ba967c232348ac
 2022-04-27 05:13:30 +00:00
Bonian Chen
4e32727c01 [Settings] Link to incorrect SIM after SIM swap 
A click to the UI presented on screen should take user to the exact SIM
that clicked instead of the first SIM presented to the end user (and
could no longer available).

Bug: 227273792
Test: local
Change-Id: If5a33f72e5730911af61f20a6a45a40cafb956d0
 2022-04-27 08:55:45 +08:00
Bonian Chen
3bddc056d8 Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" 
This reverts commit aeac0619df.

Reason for revert: merge failure in other branches

Change-Id: I601e674be41fc5d4c97bd8db54ab1982377455f1
 2022-04-27 00:03:20 +00:00
Bonian Chen
73c8e2f45a Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev 2022-04-26 10:25:31 +00:00