Zoey Chen
a87affdb82
[Settings] Change the way in MobileNetworkSummaryController for getting the subscription info from room db
...
Bug: 236919685
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkSummaryControllerTest
Change-Id: If417b792224261ad1965196d3675f28f55448fd6
2022-10-14 12:19:16 +00:00
SongFerng Wang
bd131dafc2
Merge "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1" into tm-qpr-dev am: da58404ea6 am: 97d375875a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20064005
Change-Id: Ie22a7f98e2c52bcf03acdc5910cbdd762f5bba84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-07 14:42:32 +00:00
SongFerng Wang
97d375875a
Merge "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1" into tm-qpr-dev am: da58404ea6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20064005
Change-Id: Id8b05f8faaadee52922e785b6e15c40eb1dd12de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-07 14:09:58 +00:00
SongFerng Wang
da58404ea6
Merge "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1" into tm-qpr-dev
2022-10-07 11:04:22 +00:00
Zoey Chen
67ad5a31d7
[Settings] Add the repository for room database
...
Bug: 236919685
Test: manual
Change-Id: I7f32e4eb6a976091e285ef43abcd45a9d16a6ca9
2022-10-05 17:16:41 +00:00
Joonhun Shin
23f15f80e1
Merge "changed return value METRICS_CATEGORY_UNKNOWN to SETTINGS_CONTACT_DISCOVERY"
2022-09-30 05:14:41 +00:00
SongFerngWang
078ecbd765
[MEP] psim->esim, don't skip carrierConfigChanged with subId -1
...
After simSlotMapping from psim to esim, since the esim can not be
enabled by the modem, the UI start to enable the esim. Therefore,
when receiver receive the first carrier config changed, UI can
exit waiting state, and then start to enable esim.
Bug: 246556280
Test: Build pass. Verify by QA
Change-Id: I4b8b2f3d1dd014fc1ddb92ebffa614d6daf9d142
2022-09-29 17:46:24 +08:00
TreeHugger Robot
e7e1f37321
Merge "Restrict Wi-Fi configuration if settings UI is restricted" into tm-qpr-dev am: ee21072a5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20063305
Change-Id: I3e4661df4a20415b44390eb6484811e3073e9f58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 17:32:08 +00:00
Weng Su
6629b12a08
Restrict Wi-Fi configuration if settings UI is restricted
...
- Don't launch W-Fi configuration settings if the settings UI is restricted (including guest users).
Bug: 246301667
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Merged-In: Id82498f41765f955e01bb311bb221d26f9574f31
Change-Id: Id82498f41765f955e01bb311bb221d26f9574f31
(cherry picked from commit aaa65fc6f0 )
2022-09-27 14:31:09 +00:00
TreeHugger Robot
934dfd746d
Merge "Restrict Wi-Fi configuration if settings UI is restricted"
2022-09-27 07:50:15 +00:00
TreeHugger Robot
ce71a7bba1
Merge "Separate Tether summary "Off" to dedicated string ID"
2022-09-27 07:44:19 +00:00
Weng Su
aaa65fc6f0
Restrict Wi-Fi configuration if settings UI is restricted
...
- Don't launch W-Fi configuration settings if the settings UI is restricted (including guest users).
Bug: 246301667
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: Id82498f41765f955e01bb311bb221d26f9574f31
2022-09-26 03:35:12 +08:00
Weng Su
d0cd5492e4
Separate Tether summary "Off" to dedicated string ID
...
- Separate Tether summary "Off" to dedicated string ID for special language translation
Bug: 228573128
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=TetherPreferenceControllerTest
Change-Id: I0615eb03d6329ef73b714af39e78836ae17ea408
2022-09-24 23:03:53 +08:00
Tom Hsu
f2a63608ba
Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90 am: 7e610abd3c am: 7c813dced4 am: 1a4f16cd70 am: db0ec844f2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845
Change-Id: I399a80e1e609a14c2f6c821e8e3df36fa8983dc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 17:12:22 +00:00
Tom Hsu
db0ec844f2
Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90 am: 7e610abd3c am: 7c813dced4 am: 1a4f16cd70
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845
Change-Id: Idc4f0c59df19b6f0cc9a8a1db70ba546f12fafaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 08:40:25 +00:00
Tom Hsu
1a4f16cd70
Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90 am: 7e610abd3c am: 7c813dced4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845
Change-Id: Iaccb8b8c54a5f84ed3ca6fec869ba0153f4eb623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 07:59:37 +00:00
tom hsu
3d138b372b
[Settings] Update UI when bluetooth connection is down.
...
- When Airplane mode on, all connection shall be disconnected. In
current design, when bluebooth disconnected, network page in Settings
does not udpate the UI.
Bug: b/246925011
Test: Maunal
Change-Id: I1bf56e96737157d8e76057028b22e94e0e8d76e4
2022-09-22 19:34:35 +08:00
joonhunshin
793f5d0a79
changed return value METRICS_CATEGORY_UNKNOWN to SETTINGS_CONTACT_DISCOVERY
...
return SETTINGS_CONTACT_DISCOVERY for getMetricsCategory() instead of METRICS_CATEGORY_UNKNOWN
Bug: 246514073
Test: atest ContactDiscoveryDialogFragmentTest
Change-Id: I2b1512543254641f598727ae9af2a5e989bb3df7
2022-09-21 00:46:34 +00:00
Bonian Chen
78d6c6596e
[Settings] Remove unreferenced method
...
Remove unreferenced method.
Bug: 247783516
Change-Id: I96c04d6cda3478e843134f43119f1ad7d62877a2
Test: build pass
2022-09-20 15:02:34 +00:00
Chaohui Wang
7ef27fbe85
Clean up some UnusedResources detected by lint 4
...
Bug: 234570979
Test: Manual with Settings App
Change-Id: Icc21ef3bedc7a39e7841271f51b77e9b543f6f0f
2022-09-13 20:00:38 +08:00
Rambo Wang
145c954a33
Hide roaming option when carriers force all networks as HOME networks
...
This change will hide roaming option in carrier's network setting
if the carrier overrrides the carrier config force_home_network_bool
to true.
Some carriers, like google Fi, has no concept of roaming. The carrier
config force_home_network_bool is overridden to true to treat all
cellular networks as home networks. There is no actually impact when
user turn on/off the roaming option in network setting. Leaving an
unused option just confuse many end users.
Bug: 79424760
Test: make && make RunSettingsRoboTests
Test: activate Fi service and make sure no roaming option
Test: activate VZW service and make sure roaming option is present
Test: override the cc config with adb command to make sure the roaming
option is always correctly shown/hidden on the cc key values
Change-Id: If6d0f7e3a5edea368b3a725afd9a2b4d1ad686ed
2022-09-09 12:28:40 -05:00
Bill Yi
042554a0e4
Merge TP1A.220905.004 to aosp-master - DO NOT MERGE
...
Merged-In: Id0c4e3c68ee40e5d0d57449b531228b31f2246ac
Merged-In: Ib71b6904b5c85b3d9f96563bd38bbf2d0305127d
Change-Id: I186ff56c007d17ad650b64facfbd4862cc06bf9a
2022-09-08 14:23:20 -07:00
Bonian Chen
6af2fb8578
Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev am: 45051bb169
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746893
Change-Id: If948deb5fc93c3654e474bd4d4d588859affbfa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-27 04:12:07 +00:00
TreeHugger Robot
66a56fdd37
Merge "Remove duplicate strings."
2022-08-26 17:52:54 +00:00
Bonian Chen
06664b8c37
Merge "[Settings] Not allow APN delete when adding is not an option" into tm-qpr-dev am: d2644b4ea9 am: 90a36213bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739248
Change-Id: Ibf866ba9ee70e2ada74c283f5e079d2136a61173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 11:36:54 +00:00
Bonian Chen
90a36213bb
Merge "[Settings] Not allow APN delete when adding is not an option" into tm-qpr-dev am: d2644b4ea9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739248
Change-Id: Id550ed73ab4e6dd7c01504eaf315de23598aff01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 11:17:02 +00:00
Bonian Chen
8c6c1ca236
[Settings] Not allow APN delete when adding is not an option
...
When not allowing APN to add, user may not be able to recover easily
when delete it.
Therefore, avoid from APN to be deleted when adding is not allowed.
Bug: 243664439
Bug: 200875858
Test: local, robolectric
Change-Id: I5cf984000244b4ad901c6a4977a1368279323e0a
2022-08-26 08:52:42 +00:00
Bonian Chen
9202260a42
[Settings] Not allow APN delete when adding is not an option
...
When not allowing APN to add, user may not be able to recover easily
when delete it.
Therefore, avoid from APN to be deleted when adding is not allowed.
Bug: 200875858
Test: local, robolectric
Change-Id: I5cf984000244b4ad901c6a4977a1368279323e0a
2022-08-26 08:50:51 +00:00
Kweku Adams
5949fccc7a
Remove duplicate strings.
...
"Yes" and "no" were redefined many times with no clear benefit, so this
consolidates them into one definition.
Bug: 243843096
Test: Build, install, and open the Settings app
Test: atest SettingsRoboTests
Change-Id: I5f84d09f223efd478461ded93aeac82bf7b128d8
2022-08-26 00:07:08 +00:00
SongFerngWang
34dac9cb73
[MEP] Hide the preferred SIM dialog when the user has replaced the SIM
...
Since there is the race condition and it causes UI hides the preferred
SIM dialog. Therefore, to hide the preferred SIM dialog under the
specific condition which the user has replaced the SIM during the
SIM switching.
Bug: 238061853
Test: Manually testing. Device has the psim+esim and the esim's mobile
data on. The tester disables the esim and then UI shows the preferred
SIM dialog.
Change-Id: I01e7d60170c5053730fd3113abd914fb5c0d11c9
(cherry picked from commit 286dce6b6e )
Merged-In: I01e7d60170c5053730fd3113abd914fb5c0d11c9
2022-07-29 22:35:50 +00:00
Bonian Chen
db4a6cf215
resolve merge conflicts of 81d1cd0871 to stage-aosp-master am: 4ec8323bad am: 244f21d9d7 am: 8097546f46 am: 1e744b4e66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19465627
Change-Id: I056de36c838732748f0cf445075ae87f4269a2e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-29 11:09:22 +00:00
Bonian Chen
1e744b4e66
resolve merge conflicts of 81d1cd0871 to stage-aosp-master am: 4ec8323bad am: 244f21d9d7 am: 8097546f46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19465627
Change-Id: I0ed7b6a1178d1827079723b7d3283cbb91981b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-29 10:43:54 +00:00
Bonian Chen
8097546f46
resolve merge conflicts of 81d1cd0871 to stage-aosp-master am: 4ec8323bad am: 244f21d9d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19465627
Change-Id: Ifabb14e5aadcbaf55095c5fccea5adabc0da5b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-29 10:27:37 +00:00
Bonian Chen
244f21d9d7
resolve merge conflicts of 81d1cd0871 to stage-aosp-master am: 4ec8323bad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19465627
Change-Id: I1c79864417df3c542538634621cb0458a892d926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-29 10:11:11 +00:00
Bonian Chen
4ec8323bad
resolve merge conflicts of 81d1cd0871 to stage-aosp-master
...
Test: Build pass this conflict resolution.
Bug: None
Change-Id: Iaacaeaa579025deee52b29b4b1245fc7c0fa0346
2022-07-29 07:34:35 +00:00
LuK1337
988a76f5bb
Settings: Make NetworkScanHelper max search time customizable
...
Default max search time (300) fails on some devices.
Test: Network scan works on OnePlus 9 after overlaying
max network scan search time to 254.
Change-Id: Ia0038fac6d2000748e0aa08fd6a53f11876728d7
2022-07-25 17:44:40 -07:00
Zoey Chen
a3ba183165
[Settings] Add NPE protection for the bundle
...
Bug: 238980691
Change-Id: I0f5e79ab83701552bc92b07ebdc0ee90b700721f
Test: atest EnabledNetworkModePreferenceControllerTest
2022-07-14 11:10:51 +00:00
Zoey Chen
44bc703bf2
[Settings] Add NPE protection for the bundle
...
Bug: 238980691
Test: atest MobileNetworkIntentConverterTest
Change-Id: I39d0f86725f6b0ef477425fb901bb274f31c6d78
2022-07-14 08:32:02 +00:00
SongFerng Wang
7e9cc3d674
Merge "[WFC] The WFC UI did not refresh after the subscriptionInfoChanged" into tm-qpr-dev am: dc6f2df00e am: b59e099ce6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19222900
Change-Id: I6fa2ffc12e93706cea00d39b35e222ef951527c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-13 17:42:41 +00:00
SongFerng Wang
b59e099ce6
Merge "[WFC] The WFC UI did not refresh after the subscriptionInfoChanged" into tm-qpr-dev am: dc6f2df00e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19222900
Change-Id: Id4d3e4fe19aa697fb465d5d572cbb3ed7cf6be41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-13 17:26:05 +00:00
SongFerng Wang
dc6f2df00e
Merge "[WFC] The WFC UI did not refresh after the subscriptionInfoChanged" into tm-qpr-dev
2022-07-13 17:15:12 +00:00
SongFerngWang
d9bc33e3b5
[WFC] The WFC UI did not refresh after the subscriptionInfoChanged
...
Add the listener for subscriptionInfoChanged and update the Visible
of the category.
Bug: 233783112
Test: atest NetworkProviderWifiCallingGroupTest
Change-Id: I7698915abb2f3b0ba2b40d8e78fe4e3302756c91
2022-07-12 14:58:50 +08:00
SongFerngWang
4a48dc5e96
[MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e am: 289796e9a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541
Change-Id: Ib1c261e07e1878b60bd067694e19eea92bb11866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-08 20:45:47 +00:00
SongFerngWang
5ed0fddd7b
[MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e am: 9712359f25 am: c559d2fc15
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541
Change-Id: Id8bee70ff8e6315d4238191ef69616f738e1d84a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-08 19:57:32 +00:00
SongFerngWang
c559d2fc15
[MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e am: 9712359f25
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541
Change-Id: Id45fdf5085bcbf49084accf95ffe46098668b74d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-08 19:25:25 +00:00
SongFerngWang
6ccb6d8ec0
[MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e am: cf15fcf81d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541
Change-Id: I94eced800099a0df633c3e852f68edff83f74d43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-08 19:24:47 +00:00
SongFerngWang
289796e9a3
[MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541
Change-Id: I6b76e6a4efe1dcd72c18e503dd3af853c8536276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-08 19:08:48 +00:00
SongFerngWang
9712359f25
[MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541
Change-Id: I7c0faaee0483eab1f36f6ba5646366f2ab523318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-08 19:07:19 +00:00
SongFerngWang
286dce6b6e
[MEP] Hide the preferred SIM dialog when the user has replaced the SIM
...
Since there is the race condition and it causes UI hides the preferred
SIM dialog. Therefore, to hide the preferred SIM dialog under the
specific condition which the user has replaced the SIM during the
SIM switching.
Bug: 238061853
Test: Manually testing. Device has the psim+esim and the esim's mobile
data on. The tester disables the esim and then UI shows the preferred
SIM dialog.
Change-Id: I01e7d60170c5053730fd3113abd914fb5c0d11c9
2022-07-07 08:39:03 +00:00
Bonian Chen
0805e9efbf
Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: b88828b155 am: 4e2c3689e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528
Change-Id: I321210e16c994d86824d952d04e7bb9a98e462d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 05:00:56 +00:00