Commit Graph

1227 Commits

Author SHA1 Message Date
Xin Li
07ccb42665 DO NOT MERGE - Merge RQ1A.201205.011
Bug: 172690556
Merged-In: I3f7d41c196569c0cb61e89cfc270b957e2f0add5
Change-Id: Id2d9c4f56beae280e6299b6695185577a1521345
2020-12-07 00:39:43 -08:00
Xin Li
cec81e3030 Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855
Bug: 172690556
Merged-In: Iafcefc2aa64cf3c50b1d139ec0204a315be29da7
Change-Id: I5d4e70fe723d890b5694c3490d6ec841b1ac596e
2020-12-02 00:29:15 -08:00
Bonian Chen
967311df7f Merge "[Settings] Reduce the operation of VoLTE config redraw" 2020-11-26 07:35:21 +00:00
Bonian Chen
f9256b41f2 [Settings] Reduce the operation of VoLTE config redraw
There're 3 VoLTE configuration UIs sharing the same configuration,
but only 1 of them will be displayed.

The 3 classes extending Enhanced4gBasePreferenceController are:
1. Enhanced4gAdvancedCallingPreferenceController
2. Enhanced4gCallingPreferenceController
3. Enhanced4gLtePreferenceController
They're different in the value of getMode().

The design within Enhanced4gBasePreferenceController only allows to show one of them.
Which means, the other two don't need to register for PhoneStateListener and should ignore actions in response to it when receiving callback from PhoneStateListener.

Through detecting the VoLTE configuration mode, some operations could be
avoided.
This fix is targeting to avoid these operations from happening.

Bug: 172987488
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Merged-In: I56d4900b5bcb189693c99e870b013da97ed283db
(cherry picked from commit d2e22f4cee)
Change-Id: I92e4b84b81622548fb356a4c7af99668bd2a9e00
2020-11-26 14:18:25 +08:00
Bonian Chen
9769677a3c [Settings] Add voice call status and VoLTE mode detection into VoLTE UI test case
1. VoLTE UI should gray out during voice call.
2. UI should be invisible when VoLTE mode mismatch.

Bug: 172781455
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Merged-In: I8b6a212dc727f1ab78f4dd280cb41966b7054180
(cherry picked from commit 227329b2f7)
Change-Id: I1bd239b6434038323a0689e2bc3bf05182bfcd45
2020-11-26 13:52:47 +08:00
Sarah Chin
ce9fda5a60 Update setCdmaRoaming/SubscriptionMode APIs
Test: atest TelephonyManagerTest
Test: make RunSettingsRoboTests
Bug: 171884158
Bug: 171883908
Change-Id: Ib78149c41612d56a46974621eb71b5e0cfe97c5a
Merged-In: Ib78149c41612d56a46974621eb71b5e0cfe97c5a
2020-11-19 14:46:37 -08:00
SongFerngWang
78b33b3824 To fix bug, summary is wrong if nr_enabled_bool=false
The carrier config nr_enabled_bool is false, preferred network mode
should hide 5G UI. This bug is that the summary show 5G item when
nr_enabled_bool is false.
Solution: if nr_enabled_bool is false, it checks capability and then
removes 5G capability of network mode.

Bug: 170460943
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest   (PASS)
Change-Id: I3f7d41c196569c0cb61e89cfc270b957e2f0add5
(cherry picked from commit 706036e5b3)
2020-10-30 01:45:55 +00:00
Hall Liu
17ba8166a3 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.

Exempt-From-Owner-Approval: Cherry-picked from internal
Bug: 169367013
Test: existing unit tests, manual
Change-Id: I7ebae37373d53fb2c59b6b546232dbddf77398d4
Merged-In: I7ebae37373d53fb2c59b6b546232dbddf77398d4
2020-10-21 23:38:20 +00:00
Treehugger Robot
21846b228b Merge "Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING" 2020-10-21 02:40:55 +00:00
Amit Mahajan
b09f09b02d Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455946

Change-Id: Ib2b9864613071c7a6819f03d5c1803b81b9a6575
2020-10-16 06:39:15 +00:00
Taesu Lee
50ef14540d Add the extra "Ask every time" if supported only
Test: manual

Change-Id: Ie4bb150db41f1e654ea427a605050afbb57114cf
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2020-10-13 10:13:50 +09:00
Xin Li
8656492241 Merge ab/6749736 in stage.
Bug: 167233921
Merged-In: I8e3eb6c072488fdc33fae1ebabd17980a67f5d7d
Change-Id: I0411c2f1dbc2fa47b23ff52cacca990f3141f52f
2020-10-08 23:40:50 -07: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
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
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
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
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
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
SongFerngWang
a12327b5f3 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)

Change-Id: I61e59f7ba9d6c64019d620d6cb80099ded41473f
Merged-In: I61e59f7ba9d6c64019d620d6cb80099ded41473f
2020-08-28 09:11:03 +00:00
TreeHugger Robot
6a23ee5d37 Merge "Add 'Adaptive connectivity' UI" into rvc-qpr-dev am: b75d2f6009
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12391062

Change-Id: Ib275c7ce10f274d815a155cf9d95af03757e1a7c
2020-08-24 16:05:10 +00:00
Arc Wang
e4ba98cebe Add 'Adaptive connectivity' UI
'Adaptive connectivity' toggle button controls whether
network connection is automatically managed.

Bug: 162871294
Test: make RunSettingsRoboTests
      manual
      Switch the toggle button and reboot device, observe
      if the state is retained.
Change-Id: I4499a3639abab356e8faa6316bfa45541efd63ac
Merged-In: I4499a3639abab356e8faa6316bfa45541efd63ac
2020-08-21 16:44:06 +08:00
Jackal Guo
765fb8293d Revert "[Settings] Refactor PhoneStateListener"
This reverts commit e01df59027.

Reason for revert: b/163995409 | Build failure.

Change-Id: Ia413a4bae93055ceca5b6aa85602c84a8fbe5424
2020-08-13 08:48:31 +00:00
Bonian Chen
e01df59027 [Settings] Refactor PhoneStateListener
Remove Looper and update of mSubId

Bug: 144542981
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=VideoCallingPreferenceControllerTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingPreferenceControllerTest

Merged-In: Ie6ae5b5914322644f2655e585b03a6b685bbc84a
Change-Id: I5306b3a80220c02d2de1b25f20e8ef7f845e9a09
2020-08-13 13:02:04 +08:00