Revert "InCallUI: Heads up meets SlimKat....SlimKat meets Google IO [2/4]"

This reverts commit 9dd8233c580a48ced5941fb28f3934bfbf214dfa.
Merge remote-tracking branch 'slim/kk4.4' into ose
(2/3) Contact details on incoming call

Change-Id: Iff5c101e8f02493d69558bcda54b96fe98f0523f
Signed-off-by: kecinzer <kecinzer@gmail.com>

Conflicts:
	src/com/android/incallui/CallCardFragment.java
	src/com/android/incallui/CallCardPresenter.java
Make incoming call screen style configurable. (2/3)

Change-Id: I46db78c9b48fae52530b96789ec2721d51b7185a

Conflicts:
	src/com/android/incallui/AnswerFragment.java
	src/com/android/incallui/CallButtonFragment.java
	src/com/android/incallui/InCallActivity.java
	src/com/android/incallui/MSimInCallActivity.java
Avoid layout changes on call disconnection.

This avoids showing the call buttons when an incoming call is
disconnected remotely while still ringing, which in turn avoids an ugly
transition when using the full screen caller photo.

Change-Id: If69bce271303ea43dca64925aba895dd3b5b5611

Conflicts:
	src/com/android/incallui/CallButtonPresenter.java
	src/com/android/incallui/InCallActivity.java
Merge pull request #1 from Team-OSE/ose

Merge from OSE