Missing catalan translations

Change-Id: I87ad50d4c4720bcdc82b53d628cb863f33310b9e
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 "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
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
Use java.util.Objects instead of internal API

Change-Id: Ib0d797b3e7f2e4f831f52832776b64c0973880b3
Settings: Added choice of 45 seconds for screen timeout, lock screen and dream.

Change-Id: I58cb14776fe9d447b79faf810d7f6142bc058341
Settings: fix NPE with null check on NFC adapter

Verifies the adapter is not null before dereferencing it and log and error if so

Change-Id: Id2a34c4698a97476bee9b78cb0ac7b980d1595cf
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
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
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
[2/2] LED: Battery Light

PS2: Fix variable and fw/base overlays logic
PS3: works
PS4: change title to: Battery LED

Signed-off-by: Andre Saddler <dresadd09691@gmail.com>
Change-Id: I9c737d0cf49a1f84688b4295975e13dd8e91f874

Conflicts:
	src/com/android/settings/DisplaySettings.java