From 74ceee3222144a26036b2f0737e2688941dc94eb Mon Sep 17 00:00:00 2001 From: Yorke Lee Date: Tue, 10 Sep 2013 17:14:22 -0700 Subject: Don't clear call shortcut when entering call log Also fix issues with call shortcut being too easy to swipe to dismiss. Bug: 10365541 Bug: 10688277 Change-Id: I78136b2eea1863d6c313b6eba526638cd54f9272 --- src/com/android/dialer/calllog/CallLogFragment.java | 4 +--- src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java index b68503064..9808d073b 100644 --- a/src/com/android/dialer/calllog/CallLogFragment.java +++ b/src/com/android/dialer/calllog/CallLogFragment.java @@ -444,10 +444,8 @@ public class CallLogFragment extends ListFragment // seen the new calls yet. // This might be called before onCreate() and thus we need to check null explicitly. if (mKeyguardManager != null && !mKeyguardManager.inKeyguardRestrictedInputMode()) { - // On either of the transitions we reset the new flag and update the notifications. + // On either of the transitions we update the missed call and voicemail notifications. // While exiting we additionally consume all missed calls (by marking them as read). - // This will ensure that they no more appear in the "new" section when we return back. - mCallLogQueryHandler.markNewCallsAsOld(); if (!onEntry) { mCallLogQueryHandler.markMissedCallsAsRead(); } diff --git a/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java b/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java index fba55a689..57ae2c147 100644 --- a/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java +++ b/src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java @@ -314,6 +314,9 @@ public class PhoneFavoriteMergedAdapter extends BaseAdapter { @Override public void onBeginDrag(View v) { + // We do this so the underlying ScrollView knows that it won't get + // the chance to intercept events anymore + requestDisallowInterceptTouchEvent(true); } @Override -- cgit v1.2.3