Ooops
Revert "Fix entering navbar editor in expanded desktop mode."

This reverts commit 5a94560d926ccf8ecfde3f7cdc90780ccf73e274.

Conflicts:
	src/com/android/settings/cyanogenmod/NavBar.java