Settings: Option to force keyboard to show enter key (2/2)

Original SlimRoms feature!  Not everyone likes emoticons :-(

Change-Id: I7dc8fd83ecf236ad5279b50ef916d08034c47882

Conflicts:
	res/values/strings.xml
	res/xml/keyboard_input_settings.xml
	src/com/android/settings/slim/KeyboardInputSettings.java