Widget returning view type count of 1, uses 2

Bug 6794052

The second view type is the loading-another-page of conversations view.
Tested with lots of conversations so I saw that loading view.

Change-Id: Id82571c3b878fc7cd1f05d0da6d42e17c31a5a57
merge in jb-mr0-release history after reset to jb-dev
merge in jb-mr0-release history after reset to jb-dev
Import translations. DO NOT MERGE

Change-Id: I33976e22b8ffdb86541a12a9135e4b02b0704127
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: I49f2549864de0b38009784d91d403196179d8024
Auto-generated-cl: translation import
Merge "Widget returning view type count of 1, uses 2" into jb-dev
merge in jb-mr0-release history after reset to jb-dev
SMS isn't converted to MMS even after 7 segments of messages

Bug 6903793

Resurrect the mms_config.xml setting "smsToMmsTextThreshold" to allow
overlays to specify an sms->mms conversion after a certain number
of sms segments have been created. Tested on mysid, yakju, and sojus. All
three have different settings for this feature. Also tested bug fixed by
https://googleplex-android-review.googlesource.com/#/c/103729/.

Change-Id: Ibcfd235edbaa264fede6e48f84f04345d16368fa
merge in jb-mr0-release history after reset to jb-dev
Mms: updated romanian translation

Change-Id: Ic94d6347a082d4a024cf5748f3c0e3fe72aa4894
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.

Change-Id: I9bd661dac747652ad01e3b002aa294f691b87a37
Merge branch 'jellybean' of git://github.com/CyanogenMod/android_packages_apps_Mms into jellybean
Added hungarian translation for soft keyboard settings

Change-Id: I5c7f4652594597e92808925408a2c6b895f26f30
MMS: Danish soft keyboard strings

Update based on comments - changed the word "Emoji" to "Smiley". Also concluded, that regarding messages, you wouldn't say "komponere" in Danish

Change-Id: I9e579c103a923bd8a687060250f578e309664c3f
Mms - Added missing Croatian translations

Change-Id: I9214d1a36d7eab3267d5f7114d3f7d6283261a74
Mms:  Prevent QuickMessage popup force closing when receiveing Mms

QuickMessage currently only supports SMS. (see line 981)
qmIntent is null when MMS is received, resulting in
force close of Mms.apk if Mms is received when qm popup is enabled

Change-Id: I6da0522700219b18f9abd336bb21f41e507dbe43
Prevent QuickMessage popup when Mms is active application

Change-Id: I84140716d367d7daf6492f15bd1cb885acc5362c
Merge branch 'jellybean' of git://github.com/CyanogenMod/android_packages_apps_Mms into jellybean
Mms: Set the proper API versions

Change-Id: I7de2c39b41c3b784d4e915eabdd44de3780f1a6a
Mms - Insert Emoji and Smiley at Cursor position

Emoji and Smiley insertions in "Compose message" and "QuickMessage" append to the end of message text.
Enhance operation by inserting the Emoji or Smiley text at the current cursor position.

Patch Set 2:Revised with formatting and whitespace cleanup.
Patch Set 3:Add similar consistent 'insert' functionality for Template text insertion at cursor,
            Replace Tabs with spaces.

Change-Id: I651bc858be7a0807f5f53fb722597ecd85226126