Spanish translation / fixes
Settings: fix storage measurement for device without emulated sdcard

StorageMeasurement: misc files should only be measured for internal
storage only if it is the emulated storage, otherwise misc count
for the primary storage will be erroneously duplicated on the
internal storage count.

StorageVolumePreferenceCategory:
  - Always create mMountTogglePreference to avoid null pointer
    exception for code that relies on it existing
  - Check if the keys exist before calculating totalValues to
    avoid null pointer exception on storage where media is not
    calculated
  - For available/readonly, set title, not summary (summary is
    supposed to be the amount available)

Change-Id: Ib217f79ee562dffc514696fff038e58ed0dba7d9
Settings: Forward port Hardware key custom rebinding (2/2)

Settings for rebinding the actions performed on the following key press events:
Home long-press, menu press, menu long-press, search press, search long-press,
app-switch press and app-switch long-press.

The available actions are: Nothing, open/close menu, recent apps switcher,
search assistant, voice search and in-app search.

Devices with a key configuration other than home, back, menu and search need to
set config_deviceHardwareKeys in an overlay to have the correct preferences
show up.

Change-Id: Id04a598aeb9829d7971dedbd171a61999ce2f919

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/system_settings.xml
	src/com/android/settings/cyanogenmod/SystemSettings.java
Spanish translation and remove "restart launcher" option (framework fix found by CM)
Pie: allow pie to be disabled

Change-Id: Ieedfcb5806ac7139a0613690c6a9630a40cb6b3f
Merge branch 'jellybean' of https://github.com/ParanoidAndroid/android_packages_apps_Settings into jellybean-legacy

Conflicts:
	res/values/strings.xml

Change-Id: I5e9d2d49539ded1d7f89d45daf3349ffd6eabd9a