diff options
author | calderwoodra <calderwoodra@google.com> | 2017-09-05 18:24:47 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-09-11 10:59:19 -0700 |
commit | ed4e11ddafece1d308b87955880f4f153dbfc8e2 (patch) | |
tree | 9de137a386af8a19b62c981e17389f856bb52373 /java/com/android/dialer/dialpadview | |
parent | b91261f1fd54fc9517b3e848fc18ca7d7edc0e26 (diff) |
Automated g4 rollback of changelist 167332236.
*** Reason for rollback ***
Based off a CL that needs to be rolled back.
*** Original change description ***
Improved behavior of back button in search ui.
Pressing the back button in the search UI now functions as follows:
- If the keyboard is opened, the keyboard is minimized
- If the dialpad is opened, the dialpad is closed
- If the keyboard and dialpad is closed, the search ui is closed
Our existing behavior was dependent on whether a query had been built yet.
basically, if the user pressed back with no query selected, the search ui
was closed.
From the bugbash:
7. No scroll bar in the search...
***
Bug: 64902476,64137632,62685859,63691995,63939331
Test: n/a
PiperOrigin-RevId: 167661409
Change-Id: I0627d54af33fb55c64b5edcd459dde6a73d93266
Diffstat (limited to 'java/com/android/dialer/dialpadview')
-rw-r--r-- | java/com/android/dialer/dialpadview/DialpadFragment.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/java/com/android/dialer/dialpadview/DialpadFragment.java b/java/com/android/dialer/dialpadview/DialpadFragment.java index 837c3af90..86a83796e 100644 --- a/java/com/android/dialer/dialpadview/DialpadFragment.java +++ b/java/com/android/dialer/dialpadview/DialpadFragment.java @@ -1001,12 +1001,12 @@ public class DialpadFragment extends Fragment DialerUtils.startActivityWithErrorToast( getActivity(), new CallIntentBuilder(CallUtil.getVoicemailUri(), CallInitiationType.Type.DIALPAD).build()); - hideAndClearDialpad(); + hideAndClearDialpad(false); } - private void hideAndClearDialpad() { + private void hideAndClearDialpad(boolean animate) { LogUtil.enterBlock("DialpadFragment.hideAndClearDialpad"); - FragmentUtils.getParentUnsafe(this, DialpadListener.class).onCallPlacedFromDialpad(); + FragmentUtils.getParentUnsafe(this, DialpadListener.class).hideDialpadFragment(animate, true); } /** @@ -1053,7 +1053,7 @@ public class DialpadFragment extends Fragment final Intent intent = new CallIntentBuilder(number, CallInitiationType.Type.DIALPAD).build(); DialerUtils.startActivityWithErrorToast(getActivity(), intent); - hideAndClearDialpad(); + hideAndClearDialpad(false); } } } @@ -1297,7 +1297,7 @@ public class DialpadFragment extends Fragment return true; } else if (resId == R.id.menu_call_with_note) { CallSubjectDialog.start(getActivity(), mDigits.getText().toString()); - hideAndClearDialpad(); + hideAndClearDialpad(false); return true; } else { return false; @@ -1710,7 +1710,7 @@ public class DialpadFragment extends Fragment void onDialpadShown(); - void onCallPlacedFromDialpad(); + void hideDialpadFragment(boolean animate, boolean value); } /** Callback for async lookup of the last number dialed. */ |