Revert "Expanded Desktop 1\2"

This reverts commit b5dc52146bdc643958f07d6406d7303241124586.

Conflicts:

	res/values/strings.xml
	res/xml/resurrection_settings.xml
	src/com/android/settings/Resurrection.java

Change-Id: Ibfdac09351c3820025e19c38c8d4814de5aa2d56