Commits on Aug 7, 2012
  1. merge in jb-mr0-release history after reset to jb-dev

    The Android Automerger committed Aug 7, 2012
Commits on Aug 1, 2012
  1. 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
    Tom Taylor committed Aug 1, 2012
Commits on Jul 24, 2012
  1. merge in jb-mr0-release history after reset to jb-dev

    The Android Automerger committed Jul 24, 2012
Commits on Jul 23, 2012
  1. Merge "Widget returning view type count of 1, uses 2" into jb-dev

    Tom Taylor committed with Android (Google) Code Review Jul 23, 2012
Commits on Jul 20, 2012
  1. Import translations. DO NOT MERGE

    Change-Id: I49f2549864de0b38009784d91d403196179d8024
    Auto-generated-cl: translation import
    Ying Wang committed Jul 20, 2012
Commits on Jul 19, 2012
  1. Import translations. DO NOT MERGE

    Change-Id: I33976e22b8ffdb86541a12a9135e4b02b0704127
    Auto-generated-cl: translation import
    Ying Wang committed Jul 19, 2012
Commits on Jul 17, 2012
  1. merge in jb-mr0-release history after reset to jb-dev

    The Android Automerger committed Jul 17, 2012
Commits on Jul 16, 2012
  1. Import translations. DO NOT MERGE

    Change-Id: I79d11e080332b068934a2a5d89ee886733c5b4f6
    Auto-generated-cl: translation import
    Ying Wang committed Jul 16, 2012
Commits on Jul 13, 2012
  1. Import translations. DO NOT MERGE

    Change-Id: Ie506d8d5ed8cc9ef91f2c6a058d2c19f83780c6f
    Auto-generated-cl: translation import
    Ying Wang committed Jul 13, 2012
Commits on Jul 12, 2012
  1. Import translations. DO NOT MERGE

    Change-Id: Ic1689e51e23052ee54028605958d86caf168f490
    Auto-generated-cl: translation import
    Ying Wang committed Jul 12, 2012
  2. merge in jb-mr0-release history after reset to jb-dev

    The Android Automerger committed Jul 11, 2012
  3. 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
    Tom Taylor committed Jul 11, 2012
Commits on Jul 4, 2012
  1. @mathewinwood

    Disable messaging in global search.

    Change-Id: I47dcf82e87059ede9a651b8dee6eacc85ea19a27
    mathewinwood committed with The Android Automerger Jul 4, 2012
  2. @mathewinwood

    Disable messaging in global search.

    Change-Id: I47dcf82e87059ede9a651b8dee6eacc85ea19a27
    mathewinwood committed Jul 4, 2012
Commits on Jul 3, 2012
  1. Import translations. DO NOT MERGE

    Change-Id: Ib1051803c870fb73a8ab491aabeecb9ba5e97921
    Auto-generated-cl: translation import
    Ying Wang committed Jul 3, 2012
Commits on Jul 2, 2012
  1. merge in jb-release history after reset to jb-dev

    The Android Automerger committed Jul 2, 2012
  2. Merge "Import translations. DO NOT MERGE" into jb-dev

    Eric Fischer committed with Android (Google) Code Review Jul 2, 2012
  3. Import translations. DO NOT MERGE

    Change-Id: Ibe29259c9de4f3174ac0a9b7e7aa88a7ee5dcccb
    Auto-generated-cl: translation import
    Eric Fischer committed Jul 2, 2012
  4. Text message scrolling broken again

    Bug 6740178
    
    ComposeMessageActivity needs to keep track of whether it was scrolled to
    the end when paused so it can rescroll to the end when resumed.
    
    Change-Id: Ib7e7a5e13df354c45a0eddaaa96a5c0f66c05873
    Tom Taylor committed Jul 2, 2012
  5. merge in jb-release history after reset to jb-dev

    The Android Automerger committed Jul 2, 2012
Commits on Jun 29, 2012
  1. Import translations. DO NOT MERGE

    Change-Id: Idf68f1f4f9321ab4aebbd7cde14d54cd25c6d751
    Auto-generated-cl: translation import
    Ying Wang committed Jun 29, 2012
  2. merge in jb-release history after reset to jb-dev

    The Android Automerger committed Jun 28, 2012
Commits on Jun 28, 2012
  1. Import translations. DO NOT MERGE

    Change-Id: I41eade5360ff18ea3fc042620a1399ce2226f15d
    Auto-generated-cl: translation import
    Eric Fischer committed Jun 28, 2012
  2. merge in jb-release history after reset to jb-dev

    The Android Automerger committed Jun 28, 2012
Commits on Jun 27, 2012
  1. Import translations. DO NOT MERGE

    Change-Id: Ic15477244692f51734a7ad944d8c833b36ca7472
    Ying Wang committed Jun 27, 2012
  2. merge in jb-release history after reset to jb-dev

    The Android Automerger committed Jun 27, 2012
Commits on Jun 26, 2012
  1. Sending multiple addresses via intent will result in a single address

    Bug 6728637, 6736747
    
    We need to append the addresses one-at-a-time for them to be dealt with
    by chips. Also, if you manually type in multiple numbers (vs. choosing
    multiple chip suggestions), only the last number will be selected. This
    is because when the user types a comma to start a new number, the chips
    code asks the text editor for the last token. The mms recipient editor's
    token parser looked at the position of the cursor, saw it was a comma,
    and returned that position. With this change, if the cursor is sitting on
    a delimiter, it will back up to find the previous token. This fix actually
    fixes another odd behavior. Prior to this change, if you hit backspace on
    a chip, it would turn into the number and you had to delete all the chars
    of the number to delete the chip. With this change, the chip is deleted in
    a single backspace. Note that this token parsing didn't change in JB, but
    the interaction with Chips resulted in this bug.
    
    Change-Id: I9de569a803ba319c5ac0576a649fcf057d94c133
    Tom Taylor committed Jun 26, 2012
  2. merge in jb-release history after reset to jb-dev

    The Android Automerger committed Jun 26, 2012
Commits on Jun 25, 2012
  1. Add menu item to access Cell Broadcasts from MMS app.

    Add a menu item to MMS to jump to the main activity of the
    Cell Broadcast app when the "config_cellBroadcastAppLinks"
    config item is set to true. This allows the Cell Broadcasts
    launcher icon to be removed while still allowing the user to
    view the list of previously received cell broadcasts.
    
    The menu item will not be added if the CellBroadcastReceiver
    package is disabled or not installed.
    
    Bug: 6709985
    Change-Id: Iaf6ec9106bbd2875da81c929945342c5649fbe6f
    Jake Hamby committed Jun 21, 2012
Commits on Jun 22, 2012
  1. merge in jb-release history after reset to jb-dev

    The Android Automerger committed Jun 21, 2012
Commits on Jun 21, 2012
  1. Merge "Import translations. DO NOT MERGE" into jb-dev

    Eric Fischer committed with Android (Google) Code Review Jun 21, 2012
  2. Import translations. DO NOT MERGE

    Change-Id: Ie0f705bb073711c4438604c07a49846f44b60ace
    Eric Fischer committed Jun 21, 2012
  3. merge in jb-release history after reset to jb-dev

    The Android Automerger committed Jun 21, 2012
  4. Messaging does not contain text to go with pictures

    Bug 6702702
    
    The text wasn't getting rebuilt when the pdu was loaded.
    
    Change-Id: I23ad0b4a4d4a5fb3b95d65e9bac2dcb92355f47e
    Tom Taylor committed Jun 21, 2012
  5. merge in jb-release history after reset to jb-dev

    The Android Automerger committed Jun 21, 2012