Revert "Revert "Remove some java typos till I figure something out with them .....""

This reverts commit 38745bf91edef43b34a45d7303f6e3565083ffe2.
Revert "Rest of Notification Behaviour"

This reverts commit cda224ecbe0b685d0a9a91c82ddb054d29bf67a0.

Conflicts:

	src/com/android/settings/Revolt.java

Change-Id: Ie14fbbd79b3acdc1b3cfa97502fa2d4c2c6f5fb7
Revert "Settings: Notification Shortcuts (2/2)"

This reverts commit fde9d2320443f1efec8f74f6345513c554c10785.

Conflicts:

	AndroidManifest.xml
	res/values/arrays.xml
	res/values/dimens.xml
	res/values/strings.xml

Change-Id: Iabaff25cb56dcbc02a8f223212534e372cfe8302