Revert "Network Settings: move APN to common area, both CDMA and GSM use this"

This reverts commit f09f2f66dccbafea9e5fa5204b443d19181a78e0.

This causes a major crash on MSIM devices. http://pastebin.com/843G93k0
The setting was moved to network_settings.xml but it is still adding the
preferences from gsm_umts_options.xml
src/android/phone/GsmUmtsOptions.java#L64 hence it can't find the settings key.
Not sure how it even works on single sim this way

Change-Id: I91aa160add0cc0352de5e3704d0adcd12dacbd0b
Telephony: Update ActionBar to match Settings

Even though Telephony is a seperate app, it is accessed
directly in the Settings app and has a different action bar to
all the screens in the Settings app.

Change-Id: I328fd1cdc55dafc53b8b2f99efffa6b74bf83853
msim telephony: do not register call logs for blacklisted phonenumbers

Change-Id: I80016e6cce154670f47df3f4b6a9b42353f76355
JIRA: CYAN-4610
Issue: https://jira.cyanogenmod.org/browse/CYAN-4610
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Add setting for t9 search input locale

Change-Id: Ic0b97bab0279047cf7598f2c0c805a6975c65345

Conflicts:
	res/values/cm_strings.xml
	src/com/android/phone/CallFeaturesSetting.java
Kill camel case in dialpad t9 search labels

Change-Id: I3e655e94b28f140ce0258d1e8ad9c94f5b92349f
Cleanup.

Revert import changes that are both unneeded and violate coding style,
fixup coding style for some of our additions and simplify code.

Change-Id: I25f00e3ab16bde939cf82b0d3a0bfb77b90ac836

Conflicts:
	src/com/android/phone/CallFeaturesSetting.java
Make incoming call screen style configurable (3/3)

Change-Id: I9ee4388214cddd93f045324323a93c3af79ec4fd

Conflicts:
	src/com/android/phone/CallFeaturesSetting.java
IMS: Only enable IMS calls if IMS service status shows enabled

Change-Id: I9bd4ce17a62dcf188989dd79dc9deaa78e491fa6
Telephony: Heads up meets SlimKat....SlimKat meets Google IO [3/4]
Add heads up setting for the native integration in dialer

Enabled by default

PS
- derp

PS
update commit message header

Change-Id: I0a540f2dc2667d572797a68c07b6eb471653ec16

Conflicts:

	res/xml/call_feature_setting.xml
	src/com/android/phone/CallFeaturesSetting.java

Conflicts:
	src/com/android/phone/CallFeaturesSetting.java