NavigationBar: Custom height (2/2) thanks to Rick C

Conflicts:
	res/values/strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java