DIRTY CODEX::Clean up NavBar

Conflicts:
	res/values/arrays.xml
	res/xml/navbar_settings.xml
	src/com/android/settings/carbon/Navbar.java

Conflicts:
	res/xml/navbar_settings.xml
	src/com/android/settings/carbon/Navbar.java