Jason Chiu
d13834de52
Merge "Define a constant Sliceable#NO_RES for no resource cases" into sc-v2-dev am: 1565bba600 am: 56dde819dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177442
Change-Id: Ife6c9bbe5433a818d42bf91509160fea8ae924f8
2021-11-03 07:05:55 +00:00
Jason Chiu
56dde819dc
Merge "Define a constant Sliceable#NO_RES for no resource cases" into sc-v2-dev am: 1565bba600
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177442
Change-Id: I6a3448e6e54666b45f6f67288593034a03d50d64
2021-11-03 06:54:55 +00:00
Jason Chiu
9fc0f18181
Define a constant Sliceable#NO_RES for no resource cases
...
Fix: 204733076
Test: build
Change-Id: Ifa3b9db0e915a3ec056ad68a9a1862811594d423
2021-11-03 12:23:49 +08:00
Jason Chiu
7f6b9e26c9
Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32 am: 026b1b5df6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151654
Change-Id: If46903bb26371ea90075d1c6cc063af4d10a88d4
2021-11-02 02:43:42 +00:00
Jason Chiu
026b1b5df6
Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151654
Change-Id: Ib03d41631d8bf961fa3ff3957eb5452411da7792
2021-11-02 02:28:16 +00:00
Jason Chiu
6821b6be32
Merge changes from topic "slice-highlight" into sc-v2-dev
...
* changes:
Add highlight menu keys for all toggle pref controllers and custom slices
Support slice deep links highlighting menu entries
2021-11-02 02:14:09 +00:00
Bonian Chen
7f94d2ba0e
Merge "[Crash] finish activity without super#onResume()" into sc-v2-dev am: 5d1400f8b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16005289
Change-Id: I2b2c907e8341e1b80cc6145998dccc7a5dfab8cf
2021-11-01 14:06:24 +00:00
Bonian Chen
5d1400f8b2
Merge "[Crash] finish activity without super#onResume()" into sc-v2-dev
2021-11-01 13:56:03 +00:00
Jason Chiu
2989c50a23
Add highlight menu keys for all toggle pref controllers and custom slices
...
Bug: 204695404
Test: manual, robotest build pass, unit
Change-Id: Iad2e28ada8ddb766ffa7eff2c8dc581250cbd6f8
2021-11-01 15:00:18 +08:00
TreeHugger Robot
663e79cd94
Merge "Move android.settings.WIFI_SETTINGS action to Internet Settings" into sc-v2-dev am: 929e577e1b am: 7272c9d036
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16115944
Change-Id: Ic8f685b0fb1ba4c1c2d2570b4a2a52288d087d95
2021-10-28 01:08:28 +00:00
TreeHugger Robot
7272c9d036
Merge "Move android.settings.WIFI_SETTINGS action to Internet Settings" into sc-v2-dev am: 929e577e1b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16115944
Change-Id: Icbecef23b576b84f0d1a30fe8c294e81a1f12a45
2021-10-28 00:49:08 +00:00
TreeHugger Robot
929e577e1b
Merge "Move android.settings.WIFI_SETTINGS action to Internet Settings" into sc-v2-dev
2021-10-28 00:35:01 +00:00
TreeHugger Robot
0e97ec6ac8
Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c am: c26248da5b am: babbff7b82
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937
Change-Id: I5186454ec25051276f1b0583b7d203314143f59d
2021-10-27 19:52:38 +00:00
TreeHugger Robot
babbff7b82
Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c am: c26248da5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937
Change-Id: Ib6922d82c5c6d7a059b8c43beefb12d554c3f3c0
2021-10-27 19:28:38 +00:00
TreeHugger Robot
c26248da5b
Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937
Change-Id: I60a0411bb2b21ff8dc9fac37692ddf482ce2e6ab
2021-10-27 18:52:28 +00:00
TreeHugger Robot
3d353e63e2
Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937
Change-Id: I6057ce7a0de2ff19f662564a538a891d9c37c553
2021-10-27 18:52:19 +00:00
Weng Su
3b99a81e78
Move android.settings.WIFI_SETTINGS action to Internet Settings
...
- Starting from S, the WiFi Settings is changed to Internet Settings
- Redirect to WiFi Settings if Provider Model disabled
- Don't use FLAG_ACTIVITY_NEW_TASK to avoid Lock Task Mode impacted
Bug: 199364761
Bug: 198740257
Bug: 203191404
Test: manual verified by TestDPC apk (see b/198740257#comment41)
Change-Id: I3c283ef58b37f4d3fe27045f431932a35af55023
2021-10-26 03:39:13 +00:00
Sarah Chin
250b7c3ef4
Merge "Remove IMS from editabe APNs" into sc-v2-dev am: 4a78032f62 am: 6f405c9c46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048825
Change-Id: I227599288db8f27480d7d331748b7ced5e939576
2021-10-25 17:13:03 +00:00
Sarah Chin
6f405c9c46
Merge "Remove IMS from editabe APNs" into sc-v2-dev am: 4a78032f62
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048825
Change-Id: I68b1b77616fcd72d4bd07133c8b7881f8a64ac8c
2021-10-25 17:07:34 +00:00
Sarah Chin
4a78032f62
Merge "Remove IMS from editabe APNs" into sc-v2-dev
2021-10-25 17:05:10 +00:00
TreeHugger Robot
83acf8efac
Merge "[Settings] Refactor MobileNetworkUtils"
2021-10-25 12:46:39 +00:00
changbetty
aab7b55926
Add location check for Wifi Scanning notify message
...
Bug: 203471614
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I0fccd1a8dfd8e6ca499a6f87a59772f70961bc1d
2021-10-20 15:14:08 +00:00
SongFerng Wang
fce5b4b405
Merge "The Network name is not same as statusbar at SIM Edit page" into sc-qpr1-dev am: 11af4846b2 am: 17fb53a1ad am: e590239085
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16055430
Change-Id: I34849b225700f7ccf74f16ac5f52cf4572ccc285
2021-10-18 08:54:13 +00:00
SongFerng Wang
17fb53a1ad
Merge "The Network name is not same as statusbar at SIM Edit page" into sc-qpr1-dev am: 11af4846b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16055430
Change-Id: Idc12ca6b932fc9143a4c83729af16b82fae1669e
2021-10-18 08:25:21 +00:00
SongFerng Wang
11af4846b2
Merge "The Network name is not same as statusbar at SIM Edit page" into sc-qpr1-dev
2021-10-18 08:13:49 +00:00
TreeHugger Robot
a59d04fc76
Merge "For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off" into sc-qpr1-dev am: c5cc2f81fe am: 49bd615d6b am: ea805db192
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048447
Change-Id: I344b090fe19a804c2212022038c7084dc5b8789d
2021-10-15 20:47:06 +00:00
TreeHugger Robot
49bd615d6b
Merge "For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off" into sc-qpr1-dev am: c5cc2f81fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048447
Change-Id: Ie08d46288074ae6df95535d203728a9b81c4c8c5
2021-10-15 20:21:03 +00:00
TreeHugger Robot
c5cc2f81fe
Merge "For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off" into sc-qpr1-dev
2021-10-15 20:05:38 +00:00
changbetty
bfd3020038
For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off
...
Bug: 202323013
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I4a26ec43bb7e1758b8170a7ff9fa7d5846cb4a35
2021-10-15 11:18:07 +00:00
Bonian Chen
3148dd89fe
[Settings] Refactor MobileNetworkUtils
...
Code refactor MobileNetworkUtils
- Access CarrierConfig API prior to Telephony API
Bug: 201757298
Test: presubmit pass
Change-Id: I657949a6735a27c9c4e7706bdfa236e722cabec5
2021-10-15 17:42:14 +08:00
Bonian Chen
e75cac81d6
[Settings] Refactor MobileNetworkUtils
...
Code refactor MobileNetworkUtils
- Access CarrierConfig API prior to Telephony API
Bug: 201757298
Test: presubmit pass
Change-Id: I0b9c05d1d45bdf26dd456172976a0994719fab86
2021-10-15 15:04:07 +08:00
Bonian Chen
2a92ebefbe
Merge "[Settings] Crash when resetting downloaded eSIM" into sc-qpr1-dev am: 74c4ca00e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16039954
Change-Id: I56ec53c93e3a6941db8b2d57e57ad2c2e9e74276
2021-10-15 01:55:38 +00:00
Bonian Chen
51a1245def
[Settings] Refactor MobileNetworkUtils
...
Code refactor MobileNetworkUtils
- Access CarrierConfig API prior to Telephony API
Bug: 201757298
Test: presubmit pass
Change-Id: I3a0de8bc9c9423cac6d146fdb20071e5526e74bd
2021-10-15 09:47:16 +08:00
SongFerngWang
050b6d5224
The Network name is not same as statusbar at SIM Edit page
...
Using subscriptionInfo to get the network name.
Bug: 203035698
Bug: 201591202
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest (PASS)
Change-Id: I84848a2801172b46f7cc3ff39d88ad57e34514a4
2021-10-14 19:08:47 +08:00
Sarah Chin
1f98bc28d6
Remove IMS from editabe APNs
...
If APN type is not specified, it will default to all APN types.
Remove IMS from editable APN types to prevent both default and IMS on
the same connection.
Test: make RunSettingsRoboTests
Bug: 195105491
Change-Id: I0db32412e8a2948509f235c94e1d681001b79995
2021-10-13 18:40:43 +00:00
Bonian Chen
21f7095b3a
[Settings] Crash when resetting downloaded eSIM
...
Context need to be maintained when performing async operation in
background thread.
Bug: 202787946
Test: local
Change-Id: Ia5b81ae66e9482b10df5133b2f1444fc007a78e8
(cherry picked from commit 8aa98d63fd )
2021-10-12 13:49:11 +00:00
Bonian Chen
8aa98d63fd
[Settings] Crash when resetting downloaded eSIM
...
Context need to be maintained when performing async operation in
background thread.
Bug: 202787946
Test: local
Change-Id: Ia5b81ae66e9482b10df5133b2f1444fc007a78e8
2021-10-12 19:43:16 +08:00
Zoey Chen
9632cd7087
[Settings] Add null protection to avoid the crash
...
Change-Id: Id933a33ecf2931445a57cf6588a9c9123c170707
Test: manual
Bug: 202162176
2021-10-12 04:00:03 +00:00
Adam Bookatz
97302f6f77
Merge "UM.getUserHandle -> UM.getProcessUserId"
2021-10-08 02:22:28 +00:00
Bonian Chen
ca721649c8
Merge "[Settings] Adopt comfirm SIM deletion to euicc reset UI" into sc-qpr1-dev am: 78c18a1b45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15993432
Change-Id: I1b2cd3afdd506f14f0bb7f8f02299fc8b26116d9
2021-10-08 00:01:10 +00:00
Bonian Chen
4ee6123229
[Crash] finish activity without super#onResume()
...
When finish() an activity within onStart() or onResume(),
super#onStart() or super#onResume() need to be invoked prior to
finish().
Bug: 200513672
Test: local
Change-Id: Ifba0956fb3a11888c84f55342f62a3f192a67294
(cherry picked from commit 24dfc61f99 )
2021-10-07 23:44:52 +00:00
Bonian Chen
71818bdf15
[Settings] Adopt comfirm SIM deletion to euicc reset UI
...
There's an "Erase downloaded SIMs" option within reset options UI.
When reset EUICC, eSIM profile might get removed.
There's a security feature "Confirm SIM deletion" need to be applied in
this case.
Bug: 194145231
Test: local
Change-Id: I1798dfe347be7d0610a12fb79f103efece2ab240
(cherry picked from commit ebca15a861 )
2021-10-06 16:58:07 +00:00
Bonian Chen
ebca15a861
[Settings] Adopt comfirm SIM deletion to euicc reset UI
...
There's an "Erase downloaded SIMs" option within reset options UI.
When reset EUICC, eSIM profile might get removed.
There's a security feature "Confirm SIM deletion" need to be applied in
this case.
Bug: 194145231
Test: local
Change-Id: I1798dfe347be7d0610a12fb79f103efece2ab240
2021-10-06 05:33:43 +00:00
Adam Bookatz
30dafd4140
UM.getUserHandle -> UM.getProcessUserId
...
UM is being made @UserHandleAware, so using an explicit method avoids ambiguity.
Bug: 201679968
Test: (No-op) compiles and treehugger
Change-Id: If067af7ced5017a9689cafbf99ceec1d26c06b3b
2021-10-05 12:55:22 -07:00
Bonian Chen
1eef718549
[Settings] Refactor MobileNetworkUtils
...
Code refactor MobileNetworkUtils
- reorder the rule within #shouldDisplayNetworkSelectOptions()
Bug: 201757298
Test: presubmit pass
Change-Id: Idba39ca806263b850fa23aa8bb2dd423860bc043
2021-10-01 23:00:03 +08:00
Bonian Chen
b74ccf7f33
[Settings] Refactor MobileNetworkUtils
...
Code refactor MobileNetworkUtils
- reduce number of accessing to isWorldMode()
Bug: 201757298
Test: presubmit pass
Change-Id: I710255887b5ba8038c3faf5471a88a02a15c015e
2021-10-01 13:32:57 +00:00
Bonian Chen
bc02a2d939
[Settings] Refactor MobileNetworkUtils
...
Code refactor MobileNetworkUtils
- move isWorldMode() detection to the first line
within shouldSpeciallyUpdateGsmCdma()
Bug: 201757298
Test: presubmit pass
Change-Id: Iccffca52b2e0e48ff62ec749c0cf3faa273b0e18
2021-10-01 11:18:36 +00:00
Bonian Chen
24dfc61f99
[Crash] finish activity without super#onResume()
...
When finish() an activity within onStart() or onResume(),
super#onStart() or super#onResume() need to be invoked prior to
finish().
Bug: 200513672
Test: local
Change-Id: Ifba0956fb3a11888c84f55342f62a3f192a67294
2021-09-22 22:34:23 +08:00
Zoey Chen
17c240a5a3
Merge "[Provider Model] The SIMs page should list all p-SIMs" into sc-qpr1-dev am: 39b6769e5e am: ab18c8ac04 am: 0817b1053b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15834629
Change-Id: Icb7f4daca521410d355cd0beb6a2d66eafe1df02
2021-09-22 06:31:14 +00:00
Zoey Chen
ab18c8ac04
Merge "[Provider Model] The SIMs page should list all p-SIMs" into sc-qpr1-dev am: 39b6769e5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15834629
Change-Id: Iaa62b3be6f11eaa86b3d7b547f3e896e9bee5f9e
2021-09-22 06:06:57 +00:00