Merge remote-tracking branch 'PA-settings/kitkat' into kitkat-remix
Additional Settings --> Remix Settings + Revamp

-Make the layout as a ViewPager, like the one in Manage Application setting
-Seperate them into different screens instead of categories
-Reorganize the options and make it neat
Merge remote-tracking branch 'settings/remix-settings' into kitkat-remix
Merge remote-tracking branch 'settings/kitkat-remix' into remix-legacy

Conflicts:
	res/xml/additional_settings.xml
	src/com/android/settings/AOSPAL/AdditionalSettings.java
Settings: fix QuietHour start time

when user decide when quiethour will start/stop using time preference
alarm manager will setup the time, and call stop service in many times
before starting the service

this add some check to prevent call stop service before time to start

fix http://jira.omnirom.org/browse/OMNI-595

Change-Id: Ide4cb7f651ab153e1738d309992628b951e551c1
My bad
Fix Remix Settings crash

The fragments was incorrectly labeled
Settings : Port lockscreen shortcut configuration

Port lockscreen configuration from cm-10.2

Change-Id: Ib4fd41f747912cc741eca1983c5f56df56176aad

Conflicts:
	AndroidManifest.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/values/dimens.xml
	res/xml/lockscreen_widgets.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java
	src/com/android/settings/cyanogenmod/ShortcutPickHelper.java
Merge remote-tracking branch 'settings/kitkat-remix' into remix-legacy

Conflicts:
	res/values/pa_arrays.xml
Remove AOKP Custom system animations

https://github.com/AOSPAL/android_packages_apps_Settings/commit/46afee1773dbbd7183c3238ac9902ee88cd2db48
Remove ListView animations

https://github.com/AOSPAL/android_packages_apps_Settings/commit/3cd7ab253c7b7f894e45e7443831210bffdd6db2
[2/2]Settings: All in One Animation Control

Allow configure System, ListView, Scroll, and Keyboard Animation

base from
AOKP Animation Control https://github.com/AOKP/frameworks_base/commit/015c9cf00a8e49aea22d70b57b0af87c9134be73
thanks to Steve Spear <stephen.k.spear@gmail.com>

ListView Animation https://gerrit.omnirom.org/#/c/2863/
thanks to jkl5616<jkl5616@gmail.com>

Keyboard Animation https://github.com/zst123/XuiMod/commit/975cd531a9a847769b2af306495643a55ec44aaa
thanks to zst123 for patches

with slight modification

Scrolling Animation https://github.com/zst123/XuiMod/commit/48c180cfa762617f59b4ceb3da50a6c28befe24f
thanks to zst123 for patches

Change-Id: I0c3714e389ccaf2b674cb7933f6c292d20651a79
Merge remote-tracking branch 'settings/kitkat-remix' into remix-legacy

Conflicts:
	res/values/pa_arrays.xml
Merge branch 'remix-legacy' of https://github.com/AOSPAL/android_packages_apps_Settings into HEAD

Conflicts:
	res/xml/settings_headers.xml

Change-Id: I7c3f3826e56956e8101950d88aa905b560364fcd