Doris Ling 649751a4a8 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

2018-03-28 13:01:33 -07:00

res

Move IMS registration state to SIM status screen

2018-03-28 13:01:33 -07:00

src/com/android/settings

Move IMS registration state to SIM status screen

2018-03-28 13:01:33 -07:00

tests

Move IMS registration state to SIM status screen

2018-03-28 13:01:33 -07:00

Android.mk

Add auto restriction for excessive background

2018-02-23 10:11:34 -08:00

AndroidManifest.xml

Merge ""My Phone" -> "About Phone"" into pi-dev

2018-03-24 05:16:01 +00:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07:00

color-check-baseline.xml

Make GLIF theme default for confirm lock screen

2018-03-21 18:21:04 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

OWNERS

Exempt res folder from OWNERS approval.

2017-10-13 15:59:03 -07:00

PREUPLOAD.cfg

Add string linter preupload check

2018-03-26 21:38:34 -07:00

proguard.flags

Instantiate pref controllers from xml if it's defined.

2018-02-23 14:08:51 -08:00

wrap_alpha.py

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%