diff options
author | Yorke Lee <yorkelee@google.com> | 2015-07-08 02:06:19 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-08 02:06:19 +0000 |
commit | ce13b1cf216b951e2e55f1031d7bf7b9653449ea (patch) | |
tree | 3f93669d42cf3a5cbba57a7a277b30d6cd2f3193 /src | |
parent | 5814fbf672444e567dea0e9a20170cdfef4479fc (diff) | |
parent | 9cf9b2156696995e4881562b08f5c4cb213bd5b4 (diff) |
am 9cf9b215: am e3cc20d3: am 0c041b57: am abe85e26: am e2fe71e0: Merge "Don\'t auto-expand first call log entry" into mnc-dev
* commit '9cf9b2156696995e4881562b08f5c4cb213bd5b4':
Don't auto-expand first call log entry
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/dialer/calllog/CallLogAdapter.java | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java index 510847264..458c90bdc 100644 --- a/src/com/android/dialer/calllog/CallLogAdapter.java +++ b/src/com/android/dialer/calllog/CallLogAdapter.java @@ -108,8 +108,6 @@ public class CallLogAdapter extends GroupingListAdapter // Tracks the rowId of the currently expanded list item, so the position can be updated if there // are any changes to the call log entries, such as additions or removals. private long mCurrentlyExpandedRowId = NO_EXPANDED_LIST_ITEM; - // Whether the first call log list item has been automatically expanded for a new cursor. - private boolean mHasBoundFirstView; /** * Hashmap, keyed by call Id, used to track the day group for a call. As call log entries are @@ -359,19 +357,6 @@ public class CallLogAdapter extends GroupingListAdapter mCallFetcher.fetchCalls(); } - @Override - public void changeCursor(Cursor cursor) { - // 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); - } - public void setLoading(boolean loading) { mLoading = loading; } @@ -581,14 +566,8 @@ 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 && 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; } + views.showActions(mCurrentlyExpandedPosition == position); String nameForDefaultImage = null; |