Port SmoothProgressBar: User Custom ProgressBar Setting[2/2]
Fix color preference java reference
Merge branch 'kk-4.4' of https://github.com/Octo-Kat/platform_packages_apps_Tentacles into kk-4.4

Conflicts:
	res/xml/oct_settings.xml
	res/xml/progressbar.xml
Fix color preference java reference