Revert "Frameworks: expanded desktop"

This reverts commit 9e1f377548ab50fbb1fd1432a5db95d5b277c8f4.

Conflicts:

	core/java/android/provider/Settings.java
	core/java/com/android/internal/util/slim/ButtonsConstants.java
	core/java/com/android/internal/util/slim/PolicyConstants.java
	core/java/com/android/internal/util/slim/PolicyHelper.java
	core/java/com/android/internal/util/slim/SlimActions.java
	core/res/res/values/strings.xml
	core/res/res/values/symbols.xml
	packages/SystemUI/src/com/android/systemui/SearchPanelView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	policy/src/com/android/internal/policy/impl/GlobalActions.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java