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
Spanish translations for ART warning

Change-Id: I95b71f4ebe9d3d41637bbf55326eac63c9e5f479
[1/3] Settings: Increasing Ringtone

      Option to set the incoming call ringtone volume to increase
      in pre-defined (user selected) increments.

Linked commits:
      Frameworks - https://gerrit.paranoidandroid.co/#/c/448/
      Telephony  - https://gerrit.paranoidandroid.co/#/c/451/

Change-Id: If7b36bd098dc65c8d418d372d4e0017868826a1f
Missing catalan translations

Change-Id: I87ad50d4c4720bcdc82b53d628cb863f33310b9e
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
Fix FC when trying to adjust radio band via *#*#4636#*#* dialer code.

Fixes:

1. Add additional strings to BAND_NAMES array for additional bands from ril.h
2. Fix logic when adding band strings to selection list (for loop ends before entire array is read)

Change-Id: I5ff883a469f757a30c71d7d72c8f6ace19ce7a4d
Signed-off-by: Andrew Xie <andrew.w.xie@gmail.com>
(cherry picked from commit 4845045bb2dfd9b1a67f9f0c62bb44bfc5152284)
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
Wrong referring to the resource - id/android:id

We were referring to the resource defined as
@+android:id with R.id. which is wrong. This
fix changes the @+android:id/ to @+id/

Change-Id: Ifdca7347bff31311c9c07aecdb110946e4a239ed
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