Colorpicker & SeekBarPreference.java

Change-Id: Ic365ef4af6fa31eed0afbf0a732e71086d746e20

Conflicts:
	res/values/pa_strings.xml