diff options
author | Yorke Lee <yorkelee@google.com> | 2013-09-10 17:58:16 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-10 17:58:16 -0700 |
commit | 0d53ccf7bc330c842d12dcabeede8f3ed6c80926 (patch) | |
tree | 199681c56ffebfba76f9e72314e70069016e3ab2 | |
parent | 8196fed5ddcc31662d3c9219e3710cb787e2b594 (diff) | |
parent | 34b21bf00a32e0706253095ca201cc42d36b5c2d (diff) |
am 34b21bf0: am 830b417c: Merge "Don\'t clear call shortcut when entering call log" into klp-dev
* commit '34b21bf00a32e0706253095ca201cc42d36b5c2d':
Don't clear call shortcut when entering call log
-rw-r--r-- | src/com/android/dialer/calllog/CallLogFragment.java | 4 | ||||
-rw-r--r-- | src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java | 3 |
2 files changed, 4 insertions, 3 deletions
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 |