Mms: added the option to change the soft keyboard type when composing messages

This commit gives the user the option to change the keyboard from Emoji
to enter for a new line or enter to send.
The setting has no effect on the hardware keyboard.

Ported from http://gerrit.sudoservers.com/#/c/3859/ , fixed whitespaces

Change-Id: I9bd661dac747652ad01e3b002aa294f691b87a37
Merge "Mms: added the option to change the soft keyboard type when composing messages" into jb-mr1
Update Japanese translation

Change-Id: I23c6a54c46fcbd1c8251381aa0695c2489e9770b
Signed-off-by: rdgate <rdgate@gmail.com>
Merge remote-tracking branch 'aokp/jb-mr1' into jb-mr1-mod

Conflicts:
	res/values/strings.xml
	src/com/android/mms/ui/ComposeMessageActivity.java
	src/com/android/mms/ui/MessagingPreferenceActivity.java

Change-Id: I03d9a02108c1f92bdc9236585f9efdf9202b46f1
Revert "Added ability to toggle enable/disable Send on Enter"

This reverts commit bc99eb5c78d5228d4419308f23c355ddfa80d1d1.

Conflicts:

	res/values-ja/strings.xml
	res/values/strings.xml
	res/xml/preferences.xml
	src/com/android/mms/ui/ComposeMessageActivity.java
	src/com/android/mms/ui/MessagingPreferenceActivity.java

Change-Id: I3aa66a9a05937a1ead1f2e1a414d201c3926b804
Merge branch 'translations' into jb-mr1-mod

Conflicts:
	res/values-ja/strings.xml

Change-Id: Ia402a666df3bd026f4559f5a188a83af7717c8a9