Fix coding style.

Change-Id: I520b16f1c9a927a93d9e1bd4f7e712769d341e58
FLAG_ONE_SHOT is not guaranteed to update the extras.

In contrast, according to the docs [1], FLAG_CANCEL_CURRENT is. Also
keep track of the notifications on a per-device basis.

[1]
http://developer.android.com/reference/android/app/PendingIntent.html

Change-Id: Ie04f60cde6a4332178373ce6be073e04036676c0
Settings : Re-organize menu structure

Change-Id: I7e03f1a8e1da4545d933b91c1a50e5cf72ab4ab0
Merge "FLAG_ONE_SHOT is not guaranteed to update the extras." into cm-10.2
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2-test

Conflicts:
	AndroidManifest.xml
	res/values/cm_strings.xml
	res/xml/display_settings.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/cyanogenmod/SystemSettings.java