diff options
author | Yorke Lee <yorkelee@google.com> | 2015-07-01 19:53:59 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-01 19:54:00 +0000 |
commit | b3bd721b4bd7c6a88e258fe5eb01b88ded46c2f2 (patch) | |
tree | 26418ae0f83f1ffe3a7fe36936615c21e728e51c /src | |
parent | e343d33c8757a7eb41bfd07f21fa2af0c5152cf6 (diff) | |
parent | e3189a4ad7597711222589b22db1a91415641ca6 (diff) |
Merge "Don't auto-expand first voicemail card" into mnc-dev
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/dialer/calllog/CallLogAdapter.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java index 83e55944f..510847264 100644 --- a/src/com/android/dialer/calllog/CallLogAdapter.java +++ b/src/com/android/dialer/calllog/CallLogAdapter.java @@ -361,10 +361,13 @@ public class CallLogAdapter extends GroupingListAdapter @Override public void changeCursor(Cursor cursor) { - // Data has changed; reset so that the first call log list item will be expanded. - mHasBoundFirstView = false; - mCurrentlyExpandedPosition = RecyclerView.NO_POSITION; - mCurrentlyExpandedRowId = NO_EXPANDED_LIST_ITEM; + // Don't auto-expand the first item for the voicemail list fragment since that will + // trigger an unwanted voicemail download and playback. + if (mVoicemailPlaybackPresenter == null) { + mHasBoundFirstView = false; + mCurrentlyExpandedPosition = RecyclerView.NO_POSITION; + mCurrentlyExpandedRowId = NO_EXPANDED_LIST_ITEM; + } super.changeCursor(cursor); } @@ -578,8 +581,10 @@ public class CallLogAdapter extends GroupingListAdapter // In case ViewHolders were added/removed, update the expanded position if the rowIds // match so that we can restore the correct expanded state on rebind. mCurrentlyExpandedPosition = position; - } else if (!mHasBoundFirstView) { + } else if (!mHasBoundFirstView && mVoicemailPlaybackPresenter == null) { // Expand the first view when loading the call log to expose the actions. + // Don't auto-expand the first item for the voicemail list fragment since that will + // trigger an unwanted voicemail download and playback. mCurrentlyExpandedRowId = views.rowId; mCurrentlyExpandedPosition = position; mHasBoundFirstView = true; |