Volume Rocker: Hardcode music track seek option (2/2).

* The feature is enabled by default but not configurable.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Lockscreen Blur (2/2)
Merge branch 'kitkat' of github.com:AOSPA/android_packages_apps_Settings into kitkat

Conflicts:
	res/xml/sound_settings.xml
Lockscreen: Add timeout and instant lock option to slide lock (1/2)

  This adds AOSP's new timeout and instant lock options to the
  slide (aka chooser) style lockscreen.

Change-Id: Ide8e8d14603e5111debcc7a7cf6c4b74898bfa3d
Add back increasing ring settings.

Change-Id: If33afa88adde6ae6fa23f0e3be779b1b7531e3a3

Conflicts:
	res/values/slim_arrays.xml
	res/values/slim_strings.xml
Fix merge
Merge branch 'kitkat' of github.com:ModdedPA/android_packages_apps_Settings into kitkat
Merge remote-tracking branch 'upstream/kitkat' into kitkat