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
Use the proper colors
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
Mms: Set the proper API versions

Change-Id: I7de2c39b41c3b784d4e915eabdd44de3780f1a6a
Mms: Fix deprecation

FILL_PARENT is deprecated since API Level 8 replace it with MATCH_PARENT

See http://developer.android.com/reference/android/view/ViewGroup.LayoutParams.html

Change-Id: If2d8d5e73a7ab28d5029f02492f0e2c5cd9b9b4e
Mms: Make Quickmessage cursor visible in "light theme"

The quick message cursor for the light theme pop up is white
on white and thus not visible.  Use textCursorDrawable="@null"
to force cursor color the same as textColor.  Modify dark theme
as well for consistency and to avoid global theme related issues.

Change-Id: Ibc77dff0e3017b106a530fec29038fd329caee67
QuickMessage: Fix screen relocking on 'View' after auto unlock

This commit fixes the case where, if QM was set to 'Wake and unlock'
and the user selects to 'View' the message, the screen would relock
immediately after launching the conversation thread.

Change-Id: I22497eae7b272506c4ebcae3d912d91d9404fe6f
QuickMessage: Prevent the screen from locking while user is typing

If the 'Wake and unlock' is set and the screen is auto unlocked, a
timer is set to relock the screen after 20 seconds.  This commit
fixes the problem where, while the user was typing, the timer would
expire and the screen would lock.  We now 'poke' the wakelock to
restart the timer on user keypress.

Change-Id: I8c76886df7ad5a6ed8513d8b2b589fd64675245c
add missing color
Merge tag 'refs/tags/android-4.1.2_r1' into jellybean
clean up after merge
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