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
Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/packages/apps/Mms into aosp-merge

Conflicts:
	res/values-es/strings.xml
	res/values-fa/strings.xml
	res/xml/mms_config.xml

Change-Id: If46dc6379a1de2c23aab8f5b0aecc603c83b7694
FR: Update Translations MMS App
Allow full themeing of mms via theme chooser

This redirects layouts to @color and replaces the hex that the theme chooser
cannot handle. It allows theme chooser themes the ability to theme the entire
app instead of just parts.

Patchset2  - Fixed QuickMessage themeing support (DvTonder)
Patchset3  - Use the proper colors

This is by @B_boytm I am just submitting it for him.

Change-Id: I4ec79d12788a1d6bfd5bb9b70ccc1276b65d24de
PT-BR: Added Missing Translations

Change-Id: Idfed1f89512de31e2593d24b14f879b7def95ee8
German: Add missing strings

Patch set 1 - Add strings for:
              * SMS split
              * SMS Templates
              * Vibrate pattern
              * Strip Unicode
              * Emojis
              * Timestamp
              * Keyboard selection
              * Quickmessage

Patch set 2 - Fix some typos

Patch set 3 - Add a missing array
              Add missing strings for soft keyboard selection

Patch set 4 - Removed whitespace & minor changes

Change-Id: Ied49cf00833a1db2b6355de7cba16e96c1deff7b
QuickMessage: Performance tweak

This commit changes the call to the wakelock to be every 20 keystrokes
rather than on every keystroke.  This will only affect users that are
using the 'Wake and unlock' feature of QM.

Change-Id: I0e5e3e27746c54e8bbb36137b1af4f54c2e79472
Mms: adds the option to hide sprints vm text messages, but still allows sprints vvm to receive messages.

Change-Id: I65ea92231cfbee4ae938dcb9b5f01a13bbf8ed53
mms: updated finnish translations

Change-Id: I8c369e6ae31f374e4028f7ccda4bc34a545848bb
QuickMessage: preserve reply text on "View" press

Set Mms reply text to the current quick message reply text when
starting the Mms activity from a "View" press.

Change-Id: I6a5bd17c74e7909229897d04e2bd2c2e3fd6896b
Mms: Updated italian translation

	Added few strings for change:
	"Mms: added the option to change the soft keyboard type when composing messages"

Change-Id: I78f2bb688de67042baa630fc87a0a161ab347fe2
Fix cropping on MMS inline thumbnails

The following patch fixes the cropping that was broken in jellybean. This worked
properly in Ice Cream Sandwich and CM9. It now behaves correctly with this
patch. Here are before and after pictures of both a regular photo and a
panorama.

Photo:
before
http://img62.imageshack.us/img62/3783/beforee.png

after
http://img24.imageshack.us/img24/231/afterwd.png

Panorama:
before
http://img194.imageshack.us/img194/3882/panobefore.png

after
http://img607.imageshack.us/img607/962/panoafter.png

Change-Id: Ie37d09bf46eca4efb7dc0be02dbd971648abd4ca