Add PA Pie (2/2)
Settings: Custom Tiles (2/2)

PS1: Reinvent logic from initial
	implementation
PS3: Unlock/Collapse Shade options
	and clean-up.
PS4: Remove unlock option.
	Too complex for average use.
PS5: Snip >100 line length =/
PS6: Fix potential NPE on rotation.
	Add scrollview to layout
	to allow scrolling if dialog
	is too large for screen
	(landscape)
PS7: Rebase on Fix tile index
PS9: Add reset buttons
PS10: Cleanup:
	Smaller and better looking
 	code by creating array
	buttons to reference.
	Rearrange voids to logical
	spots.
	Set image source rather than
	background for reset buttons
	to allow touch-highlight.

Change-Id: I06d773aa87bd6c1b88077ad54333a58d03f783c8
Settings: Favorite Contact Tile (2/2)

Change-Id: I938490f3cfd40d1abff193315f5d885010386107
Settings: recover last location state during on/off switch

based on the behaviour change on QS here:

https://gerrit.slimroms.net/#/c/1421

we go now same way in settings. Tbh not sure what the goal is to
force the user after switching off to enable always high accuracy
location. Whatever we use here same attempt like in QS tile....if the
user switches on again it recovers the last enabled state.

Change-Id: I887e2a94af379770dac7dbedb5d3d8002a554163

Conflicts:
	src/com/android/settings/location/LocationSettingsBase.java
Settings: Add LongClick SwitchButton (2/2)

Change-Id: I97393ff5c2ae46f8193fb3be8bd723ecc09e3ebc

Conflicts:
	src/com/android/settings/Settings.java
Settings: ES translations

Change-Id: I5bd3c3bd6f9b9f02a72c1289aad160e4019f62ff
Port back Gesture Edge Navigation (2/2)
Settings: Minimum Vibration Duration (2/2)

PS2: Remove from devices without vibration
PS3: Get correct value on re-entry.

Change-Id: I37238cf08141061bcca392e7deacfc0be23c3120

Conflicts:
	res/values/slim_strings.xml
	res/xml/sound_settings.xml
	src/com/android/settings/SoundSettings.java
settings: Remove ZRAM settings

 * Android has proper ZRAM support builtin now, and this code doesn't
   even work. Remove it.

Change-Id: I39cb20809d5c71683bffc578057ad39363c5066e

Conflicts:
	res/values-it/cm_arrays.xml
	res/values-it/cm_strings.xml
	res/values-zh-rCN/cm_arrays.xml
	res/values-zh-rCN/cm_strings.xml
	res/values/cm_strings.xml
	src/com/android/settings/cyanogenmod/MemoryManagement.java
DeviceInfoSettings: Use ro.cm.display.version instead of ro.cm.version

Follows the same logic as ro.build.display.id/ro.build.id:
engineering, debug and unsigned builds will have no distinction,
user and signed builds will show a simplified version

Change-Id: I713ccb2445ea2e333e831129ef7733fd518282eb

Conflicts:
	src/com/android/settings/DeviceInfoSettings.java
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
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