Proximity Wake-Up : adjust strings

Change-Id: I605a11b5bd7150b2a456d5c355af49fd7047e173

Conflicts:
	res/values/cm_strings.xml
Disable settings search on all subactivities.

This leaves the search in place in multi-pane configurations, and keeps
it only in the main settings screen for single-pane configurations.

Change-Id: I2db74193d534b66e1faf20293996c611621dfe58

Conflicts:
	src/com/android/settings/Settings.java
Settings : Add more options to Expanded Desktop