diff options
author | Andrew Lee <anwlee@google.com> | 2015-06-24 18:11:17 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-24 18:11:18 +0000 |
commit | 0feab0229c1c70248ca411d0e95f79aa2ac70c00 (patch) | |
tree | 8f3736c14091dcb75a1e06a8acd0f0d14cb5d39e | |
parent | a53ed4f8e4302f8d01baa500731b76a730751d59 (diff) | |
parent | 158dfa2dcb89db772f61af6f1f6775fcf5695e60 (diff) |
Merge "Expand the first call log item for new cursors." into mnc-dev
-rw-r--r-- | src/com/android/dialer/calllog/CallLogAdapter.java | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java index cc3c5bad8..2ba257a3b 100644 --- a/src/com/android/dialer/calllog/CallLogAdapter.java +++ b/src/com/android/dialer/calllog/CallLogAdapter.java @@ -99,6 +99,8 @@ 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 @@ -285,6 +287,16 @@ public class CallLogAdapter extends GroupingListAdapter mCallFetcher.fetchCalls(); } + @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; + + super.changeCursor(cursor); + } + public void setLoading(boolean loading) { mLoading = loading; } @@ -489,10 +501,15 @@ public class CallLogAdapter extends GroupingListAdapter mCallLogViewsHelper.setPhoneCallDetails(mContext, views, details); - // Update the expanded position if the rowIds match, in case ViewHolders were added/removed. - // Then restore the state of the row on rebind. if (mCurrentlyExpandedRowId == views.rowId) { + // 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) { + // Expand the first view when loading the call log to expose the actions. + mCurrentlyExpandedRowId = views.rowId; mCurrentlyExpandedPosition = position; + mHasBoundFirstView = true; } views.showActions(mCurrentlyExpandedPosition == position); |