Revert "Navbar height, get correct summaries and some fixes"

This reverts commit b88ae684c9086e627a0714336902ea34043520fc.

Conflicts:

	res/xml/hybrid_settings.xml
	src/com/android/settings/beerbong/Applications.java
	src/com/android/settings/beerbong/HybridSettings.java