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

2386 Commits

Author SHA1 Message Date
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
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
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
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
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
Bonian Chen
2cb39cf969 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: 31b8174c10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: Id817b88d0210b620c398b2598a954ec544548833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 04:52:11 +00:00
Bonian Chen
4e2c3689e3 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: b88828b155 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: Ib3003b99cc802e9ade9e0602de83fbc685ece742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 04:43:51 +00:00
Bonian Chen
31b8174c10 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: I7484149765a66e9c9beeeac1bb9dd596670a6ba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 04:27:06 +00:00
Bonian Chen
b88828b155 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: I5bd96bac8e7313ec76a461a0d4e453da90ba9072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 04:25:38 +00:00
Bonian Chen
c5fc5db0e7 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev 2022-06-23 04:08:21 +00:00
Bonian Chen
c1bd6bc6e3 Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: e941740b35 am: 67556fac04 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I3aa2ebcdd16ff73296fbda1ce44441ba43bb4f39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 19:59:10 +00:00
Bonian Chen
a40112328c Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: e9cdc176a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I80200d5694abf84b7f540db8142b5f0f525cde49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 19:43:40 +00:00
Bonian Chen
67556fac04 Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: e941740b35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I8564a7c35b201d4a5022d9dcf2545a097822c4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 19:43:37 +00:00
Bonian Chen
e941740b35 Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I8c39ef8a089394c52b5a80ea98fa77f2ab0f2ab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 19:25:48 +00:00
Bonian Chen
e9cdc176a6 Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I8391c6e89654e3595a496de6da4485f27834bfda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 19:24:20 +00:00
Bonian Chen
29a00dbc31 Merge "[Settings] Adjusted the API of Settings app" into tm-dev 2022-06-22 18:59:54 +00:00
Bonian Chen
d10618d489 [Settings] Adjusted the API of Settings app 
The API of Settings app get changed in order to support large screen.
This is a fix to adopt the change related to this work.

A short brief:
1. Accept ACTION_MAIN for launching MobileNetworkActivity.
2. Support deep-link intent while MobileNetworkActivity in foreground.
3. Avoid from binding MobileNetworkActivity as a single instance.

Bug: 230047450
Bug: 234406562
Bug: 229371407
Test: local & unittest
Change-Id: Ifcb9d4c564839199d998bd503f390f021c6bf3ad
 2022-06-22 07:51:47 +08:00
TreeHugger Robot
c141388b7a Merge "Restrict ProviderModelSlice for guest user" into tm-qpr-dev am: ea9b715e78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18911434

Change-Id: I21514aba3524eeff34fccf3e31953f184f36fbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:06:53 +00:00
TreeHugger Robot
ea9b715e78 Merge "Restrict ProviderModelSlice for guest user" into tm-qpr-dev 2022-06-21 17:05:16 +00:00
SongFerngWang
4f17ad5140 Fix the NullPointException am: 5a4df243f0 am: fd583a0459 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546

Change-Id: Id3236ff87e3a57cba5ee4afdfbb329e2c83fd19c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:06:25 +00:00
SongFerngWang
5221cb21bd Fix the NullPointException am: 5a4df243f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546

Change-Id: Ifcb7bb32737ee460e8ddbcf7730426017fc018db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 07:28:03 +00:00
SongFerngWang
fd583a0459 Fix the NullPointException am: 5a4df243f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546

Change-Id: Icb8aae31d833d27bb64040af296f096471838785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 07:27:56 +00:00
Weng Su
88037e4f5e Restrict ProviderModelSlice for guest user 
- Don't show ProviderModelSlice if the user is a guest.

- Don't run background worker if the user is a guest.

Bug: 227470877
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: Id9fd50add271513c396adfbc083a9d8ea5f7771f
 2022-06-17 02:21:19 +08:00
SongFerngWang
5a4df243f0 Fix the NullPointException 
The subscriptionInfo.getCarrierName may be a null, so adding the null
checking.

Bug: 236064286
Test: build pass
Change-Id: I8f6f5ac725d6dd552ac2626725e44f52dcbf6c32
 2022-06-16 10:46:07 +08:00
SongFerng Wang
3d14d61621 Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163 am: a5a729f523 am: 95f153642c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121199

Change-Id: I1418690d52c1e74f74f5d2bbf731ab5170e2c101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 07:44:37 +00:00
SongFerng Wang
95f153642c Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163 am: a5a729f523 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121199

Change-Id: I2ed62ef98c1e81d6549ba1eb0c271ef3bf61d168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 07:27:08 +00:00
SongFerng Wang
a5a729f523 Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121199

Change-Id: Ie1e14a6b697af624854a9360a60383fac63bb02c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 06:59:22 +00:00
SongFerngWang
fbfaa331d2 Unable to enable the removable esim am: 56e1297abe 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121195

Change-Id: I02f2599c790c90a0b602b84bc8b511f521a7e906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 06:59:21 +00:00
SongFerngWang
da2d1d85aa Reuse the active esim slot am: 887bb592c8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121194

Change-Id: I273a609f8f615c9e74fbf416c859b5159ca420c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 06:59:20 +00:00
SongFerngWang
886193184d stop show preferred SIM card dialog during sim switch am: faf9baf95b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121193

Change-Id: I3222b73bf7e01f30a56ba53cba04ed6cba45a608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 06:59:17 +00:00
SongFerng Wang
8be3ebd163 Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 
* changes:
  [MEP] Modify the comments
  Unable to enable the removable esim
  Reuse the active esim slot
  stop show preferred SIM card dialog during sim switch
 2022-06-14 06:34:07 +00:00
Gil Cukierman
f5c8089089 Merge "Improve documentation of Enable2gPreferenceController" am: 778d851165 am: fecd7c1c1a am: ad8685a28e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2120772

Change-Id: I7a16c8e1c2a6e397cc14fe92a8d7cd02708d24ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 20:43:42 +00:00
Gil Cukierman
ad8685a28e Merge "Improve documentation of Enable2gPreferenceController" am: 778d851165 am: fecd7c1c1a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2120772

Change-Id: I52b1fba91b6d25b5b02d94d9ae3fd9cf307cb37f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 20:16:03 +00:00
Gil Cukierman
fecd7c1c1a Merge "Improve documentation of Enable2gPreferenceController" am: 778d851165 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2120772

Change-Id: I6ceccc283e4065fb94b2cf0c741905be40b31c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 19:48:40 +00:00
Bonian Chen
03da62810c [Settings] Avoid from close dialog when touch outside. 
Roaming confirmation dialog might get closed when touch outside,
which is easily been triggered when having a large screen.

Solution: avoid from close dialog when touch outside of dialog area.

Bug: 235183999
Test: local
Change-Id: Ic312d80e6f04cb8f323ebc713eef4e15257de358
 2022-06-13 20:55:32 +08:00
SongFerngWang
e63dfcbd90 [MEP] Modify the comments 
Bug: 235792308
Test: build pass
Change-Id: Idf0ce19814ce8b23bc1eea864b36815203069f87
 2022-06-13 18:24:30 +08:00
SongFerngWang
56e1297abe Unable to enable the removable esim 
When the user enable the removable esim, the settings select wrong
slot(esim slot). The slot shold be the removable + esim slot and the
UiccCardInfo's cardId is the same as the removable esim's cardId.

Bug: 233170453
Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: Ibd324b781c84318c994e3742bb82e1d1393b94e4
Merged-In: Ibd324b781c84318c994e3742bb82e1d1393b94e4
 2022-06-13 17:49:00 +08:00
SongFerngWang
887bb592c8 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
Merged-In: I6daa38f54abfaf67c7640d9dc8be0da02eb59554
 2022-06-13 17:48:34 +08:00