Add workaround for the ND & QS Category name

Gives a build error on previous commit
Fix Connection Manager crash when dual panel is activated
Port SmoothProgressBar: User Custom ProgressBar Setting [1/2]

thanks Dokdo Project

Change-Id: I15152a0a1f61a92b5193f53a0e2249473d4a367c
Signed-off-by: hany <hany.alsamman@gmail.com>

Conflicts:
	res/values/probam_strings.xml
	res/xml/system_ui_settings.xml
SmoothProgressBar: Accelerate and Interpolator [2/2]

PS1 : reformat the code
PS2 : change method

Signed-off-by: hany <hany.alsamman@gmail.com>

Conflicts:
	res/values/probam_arrays.xml
	res/values/probam_strings.xml
SmoothProgressBar: Add reset option

Signed-off-by: hany <hany.alsamman@gmail.com>

Conflicts:
	res/values/probam_strings.xml
XuiMod: Toast Animations [2/2]

merge to our animation control

Signed-off-by: hany <hany.alsamman@gmail.com>

Conflicts:
	res/values/probam_arrays.xml
	res/values/probam_strings.xml
	res/xml/animation_interface_settings.xml
	src/com/android/settings/probam/interfacesettings/AnimationInterfaceSettings.java
Merge remote-tracking branch 'settings/kitkat-remix' into remix-legacy