OSDN Git Service

Move IMS registration state to SIM status screen
authorDoris Ling <dling@google.com>
Tue, 27 Mar 2018 22:22:42 +0000 (15:22 -0700)
committerDoris Ling <dling@google.com>
Wed, 28 Mar 2018 20:01:33 +0000 (13:01 -0700)
commit649751a4a8db4e87230b064fc0ba7e5e7fd9627e
tree1b544ffde5ad141e72d0c460cf2ac6a869a958f1
parent49d0205749c58eb6c802521161d03ac09d57ced0
Move IMS registration state to SIM status screen

Manually merge change I3aff03ebdc9dc165db66c5007a2fa987ab8cd822 due
to merge conflicts.

To show IMS registration state for each SIM, move the preference of
IMS registration state from Status screen to SIM Status screen.

Fixes: 66063299
Test: manual - Checked that the IMS registration state is displayed on
the SIM Status screen.
Test: make RunSettingsRoboTests

Change-Id: Ic0713c357085d94b59605c1b924e7b56a362e256
res/layout/dialog_sim_status.xml
res/xml/device_info_settings.xml
res/xml/my_device_info.xml
src/com/android/settings/deviceinfo/DeviceInfoSettings.java
src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java