Progress bar: Remove color options

Let's give color options to themes only
Settings: Add proximity wake-up toggle

Change-Id: I2f2449eb324f61b2f7a93acd91b99f144930e66e
ProgressBar: make progress bar color themeable (2/2)

one issue: ColorPickerPreference doesn't update preview to default colors when reset,
will look into this later.

Conflicts:
	src/com/android/settings/simpleaosp/ProgressBar.java

Conflicts:
	src/com/android/settings/simpleaosp/ProgressBar.java
Progress bar: Remove color options

Let's give color options to themes only
Progessbars: Remove color related strings
Update simpleaosp_strings.xml

Update french text
Merge pull request #16 from RenaudR/patch-10

Update simpleaosp_strings.xml
Fix progessbars crash
Merge branch 'kk' of github.com:SimpleAOSP/android_packages_apps_Settings into kk
Fix build from French Translations
Update simpleaosp_strings.xml
Merge pull request #17 from RenaudR/patch-11

Update simpleaosp_strings.xml
Merge branch 'kk' into headsup

Conflicts:
	res/values/simpleaosp_strings.xml
Remove: Clock on lockscreen
Revert "Lockscreen blur and blur radius (2/2)"