diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-09-25 17:48:30 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-25 17:48:30 +0000 |
commit | 3d05fe29e87fefe80afa88ecd6c291d0580ddfdd (patch) | |
tree | 309216e8a59f2ef5eafe5263ae890bcdd1e18334 /java/com/android | |
parent | cf882d5b703b965c0338cbca3adb18993671b1f0 (diff) | |
parent | 8db7caad865c38b629c1cb0f3383972cb86f2ed5 (diff) |
Merge changes Ie520c656,I222009be
* changes:
Don't show Lightbringer disclosure dialog after 1 day since viewed.
Fix crash on ending call.
Diffstat (limited to 'java/com/android')
-rw-r--r-- | java/com/android/dialer/app/calllog/CallLogAdapter.java | 5 | ||||
-rw-r--r-- | java/com/android/dialer/app/calllog/CallLogFragment.java | 3 | ||||
-rw-r--r-- | java/com/android/incallui/InCallActivityCommon.java | 7 |
3 files changed, 11 insertions, 4 deletions
diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java index 6540b6f95..e79c89c57 100644 --- a/java/com/android/dialer/app/calllog/CallLogAdapter.java +++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java @@ -407,6 +407,11 @@ public class CallLogAdapter extends GroupingListAdapter } }; + @Nullable + public RecyclerView.OnScrollListener getOnScrollListener() { + return null; + } + private void checkMarkCallLogEntry(CallLogListItemViewHolder viewHolder) { announceforAccessibility( mActivity.getCurrentFocus(), diff --git a/java/com/android/dialer/app/calllog/CallLogFragment.java b/java/com/android/dialer/app/calllog/CallLogFragment.java index 441cb4a5c..8ed924d76 100644 --- a/java/com/android/dialer/app/calllog/CallLogFragment.java +++ b/java/com/android/dialer/app/calllog/CallLogFragment.java @@ -352,6 +352,9 @@ public class CallLogFragment extends Fragment new FilteredNumberAsyncQueryHandler(getActivity()), activityType); mRecyclerView.setAdapter(mAdapter); + if (mAdapter.getOnScrollListener() != null) { + mRecyclerView.addOnScrollListener(mAdapter.getOnScrollListener()); + } fetchCalls(); } diff --git a/java/com/android/incallui/InCallActivityCommon.java b/java/com/android/incallui/InCallActivityCommon.java index fec9700ab..9e6271f3e 100644 --- a/java/com/android/incallui/InCallActivityCommon.java +++ b/java/com/android/incallui/InCallActivityCommon.java @@ -317,10 +317,6 @@ public class InCallActivityCommon { if (dialpadFragment != null) { dialpadFragment.onDialerKeyUp(null); } - - if (inCallActivity.isFinishing()) { - InCallPresenter.getInstance().unsetActivity(inCallActivity); - } } public void onStop() { @@ -342,6 +338,9 @@ public class InCallActivityCommon { if (!isRecreating) { InCallPresenter.getInstance().onUiShowing(false); } + if (inCallActivity.isFinishing()) { + InCallPresenter.getInstance().unsetActivity(inCallActivity); + } } public void onDestroy() { |