Navigation Bar height setting [2/2]
Revert "Add an option to enable/disable the Navigation Bar (2/2)"

Not needed anymore - to disable navbar simply set its height to 0%

This reverts commit b89799abaf0fa63eef39888d2f97253ceee5a08e.

Conflicts:
	res/values/pa_strings.xml
	res/xml/additional_settings.xml
	src/com/android/settings/AOSPAL/AdditionalSettings.java
Partly revert "Workaround for the PC crash" to fix FC

This reverts commit faeb6d571efa070daeb90815f15d0b77e2097c07 except the Android.mk part.

Conflicts:
	AndroidManifest.xml
Revert "Add back increasing ring settings."

This reverts commit 38102bbb93bdf4bed27f9dc851e6140fa120e6d3.

Conflicts:
	res/values/pa_arrays.xml
	res/values/pa_strings.xml
Merge remote-tracking branch 'PA-settings/kitkat' into kitkat-remix

Conflicts:
	res/values/pa_arrays.xml
	res/values/pa_strings.xml
Remove Performacne Control until we found a fix
Bluetooth: Don't set a null alias before unpairing

* This causes the unpair action to throw a null pointer exception and
  bring down the Settings app. Don't do this.

Change-Id: I0c60437f5ea934385a037a464743e24c9d341aca
Quick Swipe [2/2] && Add OmniFeatures preference
Settings: Descrbie the features that will only work on phones

Use this until we get a workaround
Revert "Remove CM's Performance Settings"

This reverts commit 23183ce8dc93189c9841b28e1bb58779e8519685.

Conflicts:
	AndroidManifest.xml
	res/values/pa_arrays.xml
	res/xml/settings_headers.xml
Remove Quick Pulldown and Quick Swipe feature for tablets (Working)

Reverted commit 6247f407fb7def8b49e5b1a793922d2833618649 as well
Dont show "Erase SD Card" when there is none

On devices with physcal, external SD Cards, the "Erase SD card"
option in in Settings/Storage is available even when there is
no SD card present, this dont make much sense since you cannot
erase a card that is absent. With this change the erase option
is bound to the mount toggle which leads to the following
consequences:

 Card present and mounted -> Erase enabled
 Card present but unmounted -> Erase enabled
 No card present -> Erase disabled
 Card present and MTP attached -> Erase disabled

Change-Id: I756ae8af3e0565febaf940df5f4991dd89105bd9
Fix elapsed time formatting.

We should extend DateUtils to provide this kind of elapsed time
formatting via icu4c, but for now let's at least fix our
arithmetic.

Bug: https://code.google.com/p/android/issues/detail?id=61479
Change-Id: I6c087dbb9fdbff0a21d9243d239126fee180454c
Revert "Revert "Remove CM's Performance Settings""

This reverts commit 5d1db145fa98de38e2242295a8b86b7382afbc94.
Performance Control

Thanks to one of the member team francis for helping me out
Merge remote-tracking branch 'PA-settings/kitkat' into kitkat-remix

Conflicts:
	src/com/android/settings/BandMode.java
Bluetooth: Set alias name only through Rename option

Set the alias name only when user is trying to change the
name using the Rename option of paired device.

CRs-Fixed: 539420
Change-Id: I415b6a962d8e7884b67d37b94c04df19e2c23012
Bluetooth: Don't set a null alias before unpairing

* This causes the unpair action to throw a null pointer exception and
  bring down the Settings app. Don't do this.

Change-Id: I0c60437f5ea934385a037a464743e24c9d341aca
Fix null pointer exceptions in NetworkPolicyEditor

This upload fixes a null pointer exception issue.
After this fix the modified methods return
their corresponding default values instead of null.

Change-Id: Idb94f8b808b8dd18be5e3fc92cc5560ce0f81c4f
[3/3] Settings: Add NFC polling setting

Change-Id: I1f715d9ab6b77cf4903e2bf5ef8310471c178309

Conflicts:
	res/values/custom_arrays.xml
	res/values/custom_strings.xml