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)
HALO settings

Change-Id: Ie478461e7ccea539cbcccabd577b94036c3a6ba6
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
Option to use volume keys to control media volume anytime (1/2)

Some users don't adjust ringtone volume often (e.g. only use toggle to
switch between silent and non-silent) mode. Having an option to
use the volume keys to control media volume anytime allows media
volume to be controllled/muted before entering a game or other apps
with sound in an undesirable location.
Merge branch 'jellybean' of https://github.com/ParanoidAndroid/android_packages_apps_Settings into jellybean-legacy
halo blacklist (2/2)

Change-Id: I1e5d167a17e398902f6c16b9a872367d2085b314
Fix code alignment
Pie: Add option to change pie's angle from the attach 1/2
Pie: set angle default to 12° (2/2)
Pie Angle: better values and strings
Pie trigger: fix double default
Merge branch 'jellybean' of github.com:ParanoidAndroid/android_packages_apps_Settings into jellybean-legacy
Pie: updates (1/2)
-pie angle: fixes, cleaning and new value (Huge)
-pie size defaults
-strings updates
Pie: set Big as default for item gap (1/2)

Screen: http://goo.gl/aocZ7
Lock screen: Quick Unlock feature (1/2)

Port of QU feature. This one allows to unlock the device from lock screen without pressing the enter button (just enter the pin/password).
Option stored in lock screen settings.

Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Allow changing auto-brightness responsitivity.