navbar stuff
Revert "Navbar height (2/2)"

This reverts commit c1da02ed0c721d0d949bf4a0b1af988169d29400.

Conflicts:
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/DisplaySettings.java~
Settings : NavigationBar Height (2/2)

Conflicts:
	res/values/arrays.xml
	res/values/arrays.xml~
	res/values/strings.xml~
	res/xml/display_settings.xml~
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/DisplaySettings.java~
Fixed a few derps.