summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2013-09-11 00:50:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-11 00:50:43 +0000
commit830b417c08b2c76febed78c89d7e7d84ee8a43fb (patch)
tree199681c56ffebfba76f9e72314e70069016e3ab2 /src
parent8f0ce2be6c7b44551be2ef585e3a77b475118f6f (diff)
parent74ceee3222144a26036b2f0737e2688941dc94eb (diff)
Merge "Don't clear call shortcut when entering call log" into klp-dev
Diffstat (limited to 'src')
-rw-r--r--src/com/android/dialer/calllog/CallLogFragment.java4
-rw-r--r--src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java3
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