Revert "On-the-spot preferences"

This reverts commit b83617d58e7f00f98f4173a109c2e3a41aeea95e.

Conflicts:
	src/com/android/settings/PrivacySettings.java