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
Import translations. DO NOT MERGE

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

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

Change-Id: I79d11e080332b068934a2a5d89ee886733c5b4f6
Auto-generated-cl: translation import
merge in jb-mr0-release history after reset to jb-dev
merge in jb-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
merge in jb-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
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 finnish translations

Change-Id: I9cd6d5515baf672596b4286fffc2ef418bb37879
QuickMessage: Only display template button if templates defined (3 options)

This commit makes the display of the templates button conditional on
whether there are defined templates.

I implemented two options - not sure which is best.  Please comment

Patchset 1-2- Initial implementation: templates button hides if no templates
              always visible if there are templates defined
Patchset 3-4- Alternative implementation of the above: if templates exist
              button is visible until user starts typing text or insert a
              template

3rd option (not in a patchset) is a variation on Patchset 2 except that the
button becomes visible even if no templates exist, thus exposing the
functionality to the user.

Change-Id: Ife209c3f95de652e9dbc1216fda3afc688e30071
QuickMessage: Fix display of main app UI and remove from recents menu

This commit prevents the QuickMessage popup activity from launching the
main Mms app UI on incoming message and from showing up in the recents apps
list.

Change-Id: Ib5c72a180d7e3b1e7c884cebc34ea1be5492bed8
Merge "QuickMessage: Only display template button if templates defined (3 options)" into jellybean
Mms: Updated italian translation

Change-Id: I8691b767031d83dbdb9ec33d26a7da13906b6d79