Hide additional blacklist separator

When there is no blacklist func enabled we dont need
2 separators at the end of row

Change-Id: Ieef2d2b5f553c2b4dd48ae528e7a0de185f4b2ad
phone: Enable the blacklist by default

Change-Id: I0b2d3482d75abe9c9fc161f199782f27b9baa46b
phone: Set default preference values for blacklist option

Change-Id: Iac33c84e19f30dd78226989977af90891d65018a
Fix typo
Merge pull request #8 from arrrghhh/jb2

Fix typo
Make contacts app aware of blacklist setting (2/3)

Also fix up notify option key while we're at changing the user's
settings ;-)

Change-Id: I51069235693ee9fd055d11e62f8f152ff7bc0210
Phone: Disable accelerometer sensor while in-call and screen UI is off

During an active ongoing call, on targets that support proximity
sensors, there is an approximate spike in the current waveform in the
order of 1 Hz. Krait is woken up frequently by the sensors even when
the Screen UI is off while in-call. This fix ensures that by disabling
the listener in such a scenario (In-Call + Screen UI turned off) there
is no spike in power consumption.

Change-Id: I325780ae234088d12960e488d2399b656ac6b5c8
Add android.permission.INTERCEPT_SMS permission.

Change-Id: I2e357b6a35d8d962eefa903b7de420b556b9f266
Fix a Cursor leak

When cursor is done, the cursor must be closed to avoid cursor leak.

Change-Id: I05181f426e7c2f21722838b1297591f0cf556495

Conflicts:
	src/com/android/phone/CallFeaturesSetting.java
Merge remote-tracking branch 'cm/jb2' into jellybean