Spanish translation / fixes
Check for presence of DeviceSpecific settings or else remove Advanced Settings tab

The best thing to do would be to revert the rewrite by gosukjx and add the original CM implementation.
That includes the safety valve and credits the actual author.

Change-Id: Id35866c7099cb3eaf4977d8cafb95b095c479401
Add CM's MTP/PTP options

Change-Id: I3bafeff12c98d43066cd1dcab52ee546ece67ee6
Merge branch 'pa-4.2' of https://github.com/mateor/android_packages_apps_Settings into pa-4.2
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
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.
Fix code alignment
Merge remote-tracking branch 'pa/jellybean' into HEAD

Conflicts:
	res/values/strings.xml

Change-Id: I919191b5187048c5649841d5e6d1b0da00083622
Merge branch 'pa-4.2' of https://github.com/mateor/android_packages_apps_Settings into pa-4.2

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml

Change-Id: I92fca5035e4e2655fd62ed836aebaf000d493784