display: Make advanced settings a category

This was a separate screen but it's too empty for that, let's make
it a category like in CM11 for now. If it ever becomes a separate
screen it needs its own fragment so that navigation is possible
via actionbar.

Change-Id: I4b1f3e78a013412d5e39847683ca622dc76b9fa1
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	res/xml/display_settings.xml
Settings: Add proximity wake option

Ports and combines:

http://review.cyanogenmod.org/#/c/66658/
Settings : Add preference for proximity wake

http://review.cyanogenmod.org/#/c/69347/
Proximity Wake-Up : adjust strings

http://review.cyanogenmod.org/#/c/69803/
Settings : Make proximity opt-in

Change-Id: Iea0853eccf764438c7aaac76afd13c364fcea0ec
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	src/com/android/settings/DisplaySettings.java
Settings: Port "Development shortcut" (1/2)

New setting under "Debug settings" that enables the development shortcut
Change-Id: I9a43e611911f2e278605715f714860ad11236fd9

Modify the Development shortcut help text
Change-Id: Iaa6d87f5044a46e8c0f8d88a4fc9bf9a494188b8

Change-Id: I9a43e611911f2e278605715f714860ad11236fd9
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	res/values/cm_strings.xml
	res/xml/development_prefs.xml
	src/com/android/settings/DevelopmentSettings.java
fix development settings

Change-Id: I852b5e207effea8143b06375b3449c370cb532bf
Signed-off-by: scott <scott@ubuntu>
Settings: Show clock enabled/disabled status summary

Change-Id: I01195313e2eeabe66ea8bcd0e06d8680716b8899
Signed-off-by: scott <scott@ubuntu>
Settings: add back button in actionbar on Status settings

for more consistence. We add it as drawable due that we still have 3 other
places in settings where it is missing.

We will change later....after that we should have worked every inconsistence out.

Change-Id: If21d03b04d2356fa78349baa8ff2fb3b008dacbf
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	src/com/android/settings/deviceinfo/Status.java