Xin Li
8656492241
Merge ab/6749736 in stage.
...
Bug: 167233921
Merged-In: I8e3eb6c072488fdc33fae1ebabd17980a67f5d7d
Change-Id: I0411c2f1dbc2fa47b23ff52cacca990f3141f52f
2020-10-08 23:40:50 -07:00
Jiashen Wang
ff311a2107
[SIM Dialog Migration] Migrate eSIM erase dialog
...
Bug: 160819390
Test: Manually tested eSIM profile disabling.
Design: https://docs.google.com/document/d/1wb5_hoBkZVbkXGNWHbx4Jf61swjfxsJzkytiTzJosYo/edit?usp=sharing
Change-Id: I9523ee5dbab5b6a5ea020647a20992ac0b1aea86
2020-10-08 22:31:53 -07:00
Hall Liu
d67a1c3d8e
Replace TelephonyManager methods for mobile data
...
TelephonyManager had a minor refactor of some of the methods revolving
around mobile data. Change code in Settings to use the new ones instead.
Bug: 169367013
Test: existing unit tests, manual
Change-Id: I7ebae37373d53fb2c59b6b546232dbddf77398d4
2020-10-08 19:37:57 -07:00
Jiashen Wang
831172e9a8
Merge "[SIM Dialog Migration] Add SIM dialogs to support screen rotation"
2020-10-08 17:46:03 +00:00
Jiashen Wang
7e04453c74
[SIM Dialog Migration] Add SIM dialogs to support screen rotation
...
Adding dialog fragments to handle SIM enable, disable, rename, and
erase and make dialogs persistent over screen rotation.
Bug: 160819390
Test: Manually tested eSIM profile disabling.
Design: https://docs.google.com/document/d/1wb5_hoBkZVbkXGNWHbx4Jf61swjfxsJzkytiTzJosYo/edit?usp=sharing
Change-Id: I6b8c9a1c88eacdcbd3a5f0e466b1308ef639c225
2020-10-01 18:28:50 -07:00
tom hsu
2fd7c9ffd1
[Settings] Refractor ApnSettings code to independent package folder.
...
Bug: 169750507
Test: make RunSettingsRoboTests
Change-Id: I8b2709ba8d16c625863d8a17abc3d0ab5d019bb8
2020-09-30 15:56:01 +00:00
Jiashen Wang
5930feab2b
Merge "Migrate SIM operation dialog from LPA to Settings"
2020-09-29 03:17:48 +00:00
Jiashen Wang
d8bd3bb669
Migrate SIM operation dialog from LPA to Settings
...
In Android R, when users enable, disable, delete, or rename a profile,
Settings calls SubscriptionManager APIs which telephony ends up to send
actions “TOGGLE_SUBSCRIPTION_PRIVILEGED”,
“DELETE_SUBSCRIPTION_PRIVILEGED”, and “RENAME_SUBSCRIPTION_PRIVILEGED”
to EuiccManager. After EuiccUiDispatcher dispatches the action, Google
LPA receives it and starts the corresponding operations and DSDS
dialogs. We can see there some back-and-forth that goes on between LPA
and telephony. In order to improve the current structure, we devided
to move the dialogs to Settings and make it call EuiccManager APIs
directly.
Bug: 160819390
Test: Manually tested eSIM profile disabling.
Design: https://docs.google.com/document/d/1wb5_hoBkZVbkXGNWHbx4Jf61swjfxsJzkytiTzJosYo/edit?usp=sharing
Change-Id: Ib933df42ca3606de2310edc4d64c3e11800a1096
2020-09-28 13:38:10 -07:00
Treehugger Robot
f3b27e173d
Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b am: 6891dd4590 am: 423f9801e9 am: 2532a70ba1 am: da6ffe3636
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425491
Change-Id: I0c837cf93babf433b918d41087c9a2ca639079c8
2020-09-28 03:39:59 +00:00
Treehugger Robot
da6ffe3636
Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b am: 6891dd4590 am: 423f9801e9 am: 2532a70ba1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425491
Change-Id: I89308bbe2a0305f1d2a1a06da9f936e21c8bf6cd
2020-09-28 03:07:24 +00:00
Treehugger Robot
2532a70ba1
Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b am: 6891dd4590 am: 423f9801e9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425491
Change-Id: Ibc85aecd1c5a83e67970fd9daf381e1da3f35bf2
2020-09-28 02:53:19 +00:00
Treehugger Robot
423f9801e9
Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b am: 6891dd4590
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425491
Change-Id: Ibaaf851ae4b9b486b83b795aa9818413cd0f14bf
2020-09-28 02:25:26 +00:00
Treehugger Robot
7f6271364b
Merge "Avoid unexpected state changes for enhanced preferences"
2020-09-28 02:01:05 +00:00
Tyler Gunn
ce636284ec
Fix issue where "learn more" link on 5G NR settings doesn't work. am: d3d88afee7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12700756
Change-Id: I64aae8431da809ce109d68a0663c6c663235693e
2020-09-25 21:54:18 +00:00
Tyler Gunn
d3d88afee7
Fix issue where "learn more" link on 5G NR settings doesn't work.
...
Issue is due to the fact the footer text is a spannable string which
although different from the original text loaded when the preference
was constructed, is the same in terms of object equality.
Clearing the preference title before assigning the footer text fixes this.
Fixes: 162011372
Test: Manual test; open settings and verify link is clickable now.
Merged-In: I5d22c665b0d6fb842bc54dc55a2eb3045e0092a2
Change-Id: I5d22c665b0d6fb842bc54dc55a2eb3045e0092a2
(cherry picked from commit 97d8711d84 )
Exempt-From-Owner-Approval: Straight cherry-pick.
2020-09-25 21:18:29 +00:00
Tyler Gunn
97d8711d84
Fix issue where "learn more" link on 5G NR settings doesn't work.
...
Issue is due to the fact the footer text is a spannable string which
although different from the original text loaded when the preference
was constructed, is the same in terms of object equality.
Clearing the preference title before assigning the footer text fixes this.
Fixes: 162011372
Test: Manual test; open settings and verify link is clickable now.
Change-Id: I5d22c665b0d6fb842bc54dc55a2eb3045e0092a2
2020-09-25 18:40:23 +00:00
Jeremy Goldman
6620c84d89
create junit MobileNetworkPreferenceControllerTest.
...
1. androidx lifecycle used rather than settingslib wrapper. This allows
us to handle lifecycle events from junit tests as well.
2. Use Mocks or get/set functions rather than robolectric shadows.
MobileNetworkPreferenceControllerTest Diff:
https://diff.googleplex.com/#key=5P0b2G4iYmcz
Test: atest -c MobileNetworkPreferenceControllerTest
Change-Id: If49fe64e5db89a0cdcac7d26329b8c18626a00de
2020-09-23 17:26:14 +00:00
SongFerng Wang
1fa6f33033
Merge "Fix for incorrect display of preferred network type on UI" am: bb25d4841c am: 59996190cc am: 14d4ca3cc0 am: f4e466d20c am: e149bf93b3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1431699
Change-Id: Ifc97dcc346e0457098c12f53fe4c641ce7e3ddc4
2020-09-23 11:30:24 +00:00
SongFerng Wang
e149bf93b3
Merge "Fix for incorrect display of preferred network type on UI" am: bb25d4841c am: 59996190cc am: 14d4ca3cc0 am: f4e466d20c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1431699
Change-Id: I12a4d0f18bbffd891e46d3e6bef880cbe74eee34
2020-09-23 11:02:25 +00:00
SongFerng Wang
f4e466d20c
Merge "Fix for incorrect display of preferred network type on UI" am: bb25d4841c am: 59996190cc am: 14d4ca3cc0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1431699
Change-Id: Icfb3a897844380990971bab39e19ef1d137e2b53
2020-09-23 10:36:19 +00:00
SongFerng Wang
14d4ca3cc0
Merge "Fix for incorrect display of preferred network type on UI" am: bb25d4841c am: 59996190cc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1431699
Change-Id: I09f8fc61950baac0f3d987efe84c7c6aaa6c5c13
2020-09-23 09:50:37 +00:00
SongFerng Wang
bb25d4841c
Merge "Fix for incorrect display of preferred network type on UI"
2020-09-23 08:49:19 +00:00
Betty Chang
a6575f9bb8
Merge "[Telephony settings] Settings crashes when rotate screen in Preferred network type" am: 18e1a7c047 am: df73f7e090 am: c8f766c6d3 am: 1555c9b8e5 am: 6d6d8ff074
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1432711
Change-Id: Ibea737bff7d7e05f51b92363fed921742e7b8748
2020-09-23 04:04:41 +00:00
Betty Chang
6d6d8ff074
Merge "[Telephony settings] Settings crashes when rotate screen in Preferred network type" am: 18e1a7c047 am: df73f7e090 am: c8f766c6d3 am: 1555c9b8e5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1432711
Change-Id: I7e44e269d925117b03c01022cefd8ee78e07e390
2020-09-23 03:35:24 +00:00
Betty Chang
1555c9b8e5
Merge "[Telephony settings] Settings crashes when rotate screen in Preferred network type" am: 18e1a7c047 am: df73f7e090 am: c8f766c6d3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1432711
Change-Id: I8100cb2f94593bb36655f6faf3ccd1ab11e56170
2020-09-23 03:04:38 +00:00
Betty Chang
c8f766c6d3
Merge "[Telephony settings] Settings crashes when rotate screen in Preferred network type" am: 18e1a7c047 am: df73f7e090
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1432711
Change-Id: I1f0164ef41f5e21d9010a16c2cc8ea8d02e6c270
2020-09-23 02:46:26 +00:00
changbetty
dd91eadaaf
[Telephony settings] Settings crashes when rotate screen in Preferred network type
...
When activity is recreated, fragments are automatically reattached.
Need to check the savedInstanceState is null or not when we want to add framgment in MobileNetworkActivity.
(lost to check in ag/9667137)
Bug: 154087690
Test: Manual
make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
Change-Id: Id169353f6dc10306dddd823a904f0803b26a6ddc
2020-09-21 18:12:03 +08:00
TreeHugger Robot
b7d5c72d0f
Merge "Create NetworkProviderSettings for provider model"
2020-09-18 05:08:08 +00:00
Jiashen Wang
624cea1b7a
Do not display eSIM activation option if the device is eSIm ignored am: f537a702dd am: 6538ee53cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12620221
Change-Id: Ibe4302c154adf38f4ee76e0279691e5d06304e2e
2020-09-17 02:52:12 +00:00
Jiashen Wang
6538ee53cf
Do not display eSIM activation option if the device is eSIm ignored am: f537a702dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12620221
Change-Id: If39f36992de53f89ce07ef5ff1ddb597800dff58
2020-09-17 02:27:04 +00:00
Jiashen Wang
f537a702dd
Do not display eSIM activation option if the device is eSIm ignored
...
For the device listed as eSIM ignored device, we should always hide the
eSIM activation button even in the developer mode.
Bug: 168266928
Test: Manually tested
Change-Id: Ide3043606de202c5903e520aa550302ff0d103d3
2020-09-16 15:33:51 -07:00
Avinash Nalluri
5f5f75cb3d
Fix for incorrect display of preferred network type on UI
...
Change-Id: I9af0be1004cc101f08acf080d3976401c26e10e6
Bug: 168527547
2020-09-14 14:39:14 -07:00
Treehugger Robot
9b5a2ff761
Merge "Add goldmanj to settings owners files." am: 56349f714d am: 26f8b54e38 am: 91286c4ec9 am: 368ae3f9b9 am: ae268ea40d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425948
Change-Id: Ibae9c6fea5214fcd6f39be338ca31a5bb3725e48
2020-09-12 03:24:57 +00:00
Treehugger Robot
ae268ea40d
Merge "Add goldmanj to settings owners files." am: 56349f714d am: 26f8b54e38 am: 91286c4ec9 am: 368ae3f9b9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425948
Change-Id: I30981eb4d451fc77ba7ee08b9ad734a392c27fca
2020-09-12 03:02:52 +00:00
Treehugger Robot
368ae3f9b9
Merge "Add goldmanj to settings owners files." am: 56349f714d am: 26f8b54e38 am: 91286c4ec9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425948
Change-Id: Idd7fbf0b35260a8146d029337cb3de7d29a14ed8
2020-09-12 02:21:21 +00:00
Treehugger Robot
91286c4ec9
Merge "Add goldmanj to settings owners files." am: 56349f714d am: 26f8b54e38
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425948
Change-Id: I5c0fe4b0b3be7191d42db14195791d8a8bee503c
2020-09-12 01:36:43 +00:00
Jeremy Goldman
9e1e47fef7
Add goldmanj to settings owners files.
...
Test: N/A, code not edited.
Change-Id: I23a64e52d01ebeda1509d1e207200d868444d955
2020-09-11 18:55:46 +00:00
Bonian Chen
e68a8c4953
Merge "[Settings] subscription UI should be closed when SIM is removed" am: b3efa585f2 am: 5dba10a956 am: 5975853b18 am: 0f2bc3bad9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425488
Change-Id: I2828a05151f0d5dc0a1ba314b15d0ec89710772f
2020-09-11 09:28:28 +00:00
Bonian Chen
07536baadf
Merge "Fix NullPointerException, TelephonyManager.getServiceState is null" am: 11db11d236 am: e73b25e37b am: 42710f069d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425489
Change-Id: Ic862e8fded74ab13e528874abd690e55d5fb2bfd
2020-09-11 08:42:31 +00:00
Bonian Chen
0f2bc3bad9
Merge "[Settings] subscription UI should be closed when SIM is removed" am: b3efa585f2 am: 5dba10a956 am: 5975853b18
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425488
Change-Id: I74e8fe4508bcafff0bc08a8d88eff771a1158ec3
2020-09-11 08:42:22 +00:00
Bonian Chen
42710f069d
Merge "Fix NullPointerException, TelephonyManager.getServiceState is null" am: 11db11d236 am: e73b25e37b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425489
Change-Id: I6a0ebc1fadd409ad57933f5f2e6eb722187c6b40
2020-09-11 08:07:32 +00:00
Bonian Chen
5975853b18
Merge "[Settings] subscription UI should be closed when SIM is removed" am: b3efa585f2 am: 5dba10a956
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425488
Change-Id: I32087c8910c01323c70eb124cff1247c4d60fed5
2020-09-11 08:04:23 +00:00
Bonian Chen
11db11d236
Merge "Fix NullPointerException, TelephonyManager.getServiceState is null"
2020-09-11 06:46:58 +00:00
Taesu Lee
99637baab2
Avoid unexpected state changes for enhanced preferences
...
Assigning current call state to mCallState right before registering
PhoneStateListener so that the preferences have correct state before
first onCallStateChanged() by initial registration even.
Bug: 166307650
Test: Check the preferences state when onStop() -> onStart()
Change-Id: I861a687497ba4da7a845540fd92ae2b865392d60
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com >
2020-09-11 14:36:26 +09:00
Taesu Lee
c6cc866d10
Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING
...
Bug: 165660739
Test: Manual
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com >
Change-Id: Iba07c70cb18e8d9f748518d6d141191de5a3d422
2020-09-11 13:58:18 +09:00
SongFerngWang
0c2cabef6e
Fix NullPointerException, TelephonyManager.getServiceState is null
...
Add the null protect for TelephonyManager.getServiceState.
Bug: 166676020
Test: 1. make RunSettingsRoboTests ROBOTEST_FILTER=\
RenameMobileNetworkDialogFragmentTest (PASS)
2. make RunSettingsRoboTests ROBOTEST_FILTER=\
AutoSelectPreferenceControllerTest (PASS)
3. make RunSettingsRoboTests ROBOTEST_FILTER=\
PreferredNetworkModePreferenceControllerTest (PASS)
4. make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest (PASS)
Merged-In: I61e59f7ba9d6c64019d620d6cb80099ded41473f
Change-Id: Ib80e5e7498a078435185814d11c3b2bcc4318f59
2020-09-11 09:27:41 +08:00
Bonian Chen
22a70a5e15
[Settings] subscription UI should be closed when SIM is removed
...
When SIM is removed, subscription UI should actively be closed (instead of
waiting for user to leave UI).
Bug: 160197149
Test: manual
Merged-In: I2854147c956faa633a9682eee0028db6cd2d3912
Change-Id: I920b88879a225f1d6ce696c7784d1f6f279c16d9
2020-09-11 09:18:34 +08:00
Arc Wang
746176eb56
Create NetworkProviderSettings for provider model
...
Provider model is a feature which improves networks
Settings UX.
NetworkProviderSettings is the fragment which allow
users to choose a mobile network or a Wi-Fi network
to connect.
At this change, NetworkProviderSettings is a clone
of WifiSettings, mobile networks will be integrated
at later CLs.
Bug: 167474581
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.NetworkProviderSettingsTest
Change-Id: I185639a8f2469e9ec76ad18b6c2bc2e8a4d079e3
2020-09-10 11:03:48 +08:00
Xin Li
748efff856
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
...
Bug: 166295507
Merged-In: Ie9d2c4d6d4618a167af1c5627d5d7918a404f398
Change-Id: I2ae428e37fd96226ce4e06032e2c0beaacbd0301
2020-08-28 23:35:54 -07:00
SongFerngWang
34f35aff90
Fix NullPointerException, TelephonyManager.getServiceState is null am: a12327b5f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12468773
Change-Id: I5baab79d81bd127d8bf1a5092c0821a576b21852
2020-08-28 10:35:58 +00:00