merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
IME dismissed when composing message

Bug 7350054

Explicitly open the keyboard if we've got draft text.

Change-Id: Ifefc94830e053578d3927706a26f2fa6379b72a3
b/7363553: fix keyboard interaction when re-entering Compose Message activity.

rework the fix for b/7350054, use recommendations from Satoshi to call getWindow().setSoftInputMode()
instead of explicitly showing the keyboard later.

Reduce the number places to call showKeyboard() from 3 places to 1. The new logic is, if there
is a draft for this conversation, we set the window mode to SOFT_INPUT_STATE_VISIBLE, otherwise,
set the window mode to SOFT_INPUT_STATE_HIDDEN. We check DraftCache to see if there is a draft,
and don't need to wait until the full content is loaded to determine that.

In addition, employ a hack to hide the keyboard in onPause(), to avoid a jank caused by
onSizeChanged() called twice when re-entering the Compose activity. This improves the jank
slightly, as we still have to adjust the scroll position, leading to the page jump after the
keyboard is opened. It's arguably a little better than before.

Change-Id: Ic4874c103ae235ce3c813a15bbd72283bc844b1b
b/7363553: fix a regression where keyboard isn't shown when composing a new message in SMS.

- fix a regression caused by https://googleplex-android-review.googlesource.com/#/c/242627/4.
Make sure to show keyboard for a new conversation.

Change-Id: I4d6465d46f9c18e1545a5d12e35368e53c5a4198
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I42895138ba70461513d7d91e22d5757f7e4710f2
am 288707d1: Fix to hide keyboard jank-free when coming back to MMS with no draft.

* commit '288707d12efa6a0f5109e4796e1ce793198473e0':
  Fix to hide keyboard jank-free when coming back to MMS with no draft.
am a2b5b371: Merge "MMS doesn\'t scroll enough on tall list items" into jb-mr1-dev

* commit 'a2b5b37119939c265098ef58a410a721a0cf4e38':
  MMS doesn't scroll enough on tall list items
am 38bdb224: Merge "Flickering when MMS received" into jb-mr1-dev

* commit '38bdb2240dd1d6ed5c05be8700a3a59bad509568':
  Flickering when MMS received
Reconcile with jb-mr1-release - do not merge

Change-Id: I9cf9173c747866ffdf43a49383e0b5993237bd9e
am c67a3c2d: Add message button is not titled in "Messaging widget" under lock screen

* commit 'c67a3c2dc3504c992aa6cc6bedf8f618981c26c8':
  Add message button is not titled in "Messaging widget" under lock screen
am ac5b2305: App doesn\'t know your pic on initial send

* commit 'ac5b230500508d676267f264dc4ce63ae0900937':
  App doesn't know your pic on initial send
Reconcile with jb-mr1-release - do not merge

Change-Id: Ibd0fd44fdc5280a0bf4dca350ee0433422e5c07b
am de3b06d3: MMS doesn\'t scroll

* commit 'de3b06d3102ef4e21c199e722592aaed73594643':
  MMS doesn't scroll
Reconcile with jb-mr1-release - do not merge

Change-Id: I01648a5e8765609be85180a35f65f516c697430e
Import translations. DO NOT MERGE

Change-Id: I17e46bcce9560905fefc43e3558c28191645dff3
Auto-generated-cl: translation import
Bringing up the keyboard when a picture is the last item visible will always scroll the conversation to the bottom

Bug 7511504

The code to scroll needs to test that the tall item is the last item in
the list.

Change-Id: I4a9d72178564b8047c40af1dc148904b75e79694
am b9f83d58: Import translations. DO NOT MERGE

* commit 'b9f83d5842df73f687a86eba6a3d5e95bb6deb6c':
  Import translations. DO NOT MERGE
Merge "Bringing up the keyboard when a picture is the last item visible will always scroll the conversation to the bottom" into jb-mr1.1-dev