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: Ic567f96c9c791f498906e8f6a365be528a952e66

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

Change-Id: Id673f9687866dbc8cacc3f355cea977aa410d0e3

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