Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 830b417c authored by Yorke Lee's avatar Yorke Lee Committed by Android (Google) Code Review
Browse files

Merge "Don't clear call shortcut when entering call log" into klp-dev

parents 8f0ce2be 74ceee32

src/com/android/dialer/calllog/CallLogFragment.java

+1 −3
Original line number Diff line number Diff line
@@ -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();

            }

src/com/android/dialer/list/PhoneFavoriteMergedAdapter.java

+3 −0
Original line number Diff line number Diff line
@@ -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