Navigation Bar height

Based on simple aosp's, removed there extra file (click) and just added
it to the main display setting

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

Change-Id: Ic01da4f6adffd9fafcad34b9edc767b4eda5403a

Conflicts:
	res/values/candy_arrays.xml
	res/values/candy_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java
Merge branch 'c5' of git://github.com/rc420head-L/android_packages_apps_Settings into c5