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

Commit cb500357 authored by Yorke Lee's avatar Yorke Lee Committed by Android Git Automerger
Browse files

am 4eda4c4b: am 364b5735: am 82e17500: Merge "DO NOT MERGE Make dialpad slide... 

am 4eda4c4b: am 364b5735: am 82e17500: Merge "DO NOT MERGE Make dialpad slide down when dismissed by tapping outside" into klp-dev

* commit '4eda4c4b':
  DO NOT MERGE Make dialpad slide down when dismissed by tapping outside
parents 9215d9bf 4eda4c4b

src/com/android/dialer/dialpad/DialpadFragment.java

+5 −5
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ public class DialpadFragment extends Fragment 
            @Override

            public boolean onTouch(View v, MotionEvent event) {

                if (isDigitsEmpty()) {

                    hideAndClearDialpad();

                    hideAndClearDialpad(true);

                    return true;

                }

                return false;
@@ -1054,11 +1054,11 @@ public class DialpadFragment extends Fragment 


    public void callVoicemail() {

        startActivity(getVoicemailIntent());

        hideAndClearDialpad();

        hideAndClearDialpad(false);

    }



    private void hideAndClearDialpad() {

        ((DialtactsActivity) getActivity()).hideDialpadFragment(false, true);

    private void hideAndClearDialpad(boolean animate) {

        ((DialtactsActivity) getActivity()).hideDialpadFragment(animate, true);

    }



    public static class ErrorDialogFragment extends DialogFragment {
@@ -1154,7 +1154,7 @@ public class DialpadFragment extends Fragment 
                        (getActivity() instanceof DialtactsActivity ?

                                ((DialtactsActivity) getActivity()).getCallOrigin() : null));

                startActivity(intent);

                hideAndClearDialpad();

                hideAndClearDialpad(false);

            }

        }

    }