Fix: app icon sizes in notification lights
Merge branch 'pa_upstream/kitkat'
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
Fix switching running/cached apps with memory bar

Fixes upstream issue #38735
http://code.google.com/p/android/issues/detail?id=38735

Ported from CM10
http://review.cyanogenmod.org/25775

This patch is already submitted to AOSP. No feedback from them yet.
https://android-review.googlesource.com/45993

Change-Id: I484e30d3fd4f5425e174911ae22bb2def170e6b8
FindBugs: Call to equals() comparing different types

Change-Id: If4185f9eec0adfa47a6741eb21111b6cdafac008
settings: Add option to toggle the pointer icon when using stylus

Forward-port to CM-11.0

Change-Id: Ib9c22ecb05cc698ead5bfffa34d2a2ffa9c21e13

Conflicts:
	res/values/cm_strings.xml
	res/xml/language_settings.xml
	src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
Port "Option to hide Adb notification icon"

Change-Id: I7c50e50be86c654c77d6c2a385860d97279ed621

Conflicts:
	res/values/cm_strings.xml
settings: fix exception in BatterySipper.getQuickNameIconForUid

placeholder

Change-Id: I4da880532788de78debffe594faf08eee0389014
Settings: fix led pulsespeedoff disable behaviour

Keep led pulsespeedoff disabled if pulsespeedon is
disabled.  This ensures that pulsespeedoff stays
disabled if onOffChangeable was set to false.  Fixes
problem where charged led pulsespeed off looks to
be configurable in the ui and thereby creating user
confusion.

Change-Id: I6ac7f630544bf719b39e1ddcab435322975430c8
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 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)
Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into kitkat
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
Merge "Missing catalan translations" into kitkat
Settings : Update gesture preference check

Move the gesture outside the stylus dependency check and remove the
preference category if no children are found

Change-Id: I05ecf71dc84f5244200e3030b5ee524944339145
(cherry picked from commit f6a43a4bc50f6fba64f55c08adff16f8bdcb1c44)
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
Allow tablets to send SMS if enabled in device overlays (1/2)

Change-Id: I51771c28415352ee0838fa1507a1461c652d56e8
Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into kitkat

Change-Id: I426ae034b0d50a2a7a1e65f9652d63bd76375cda