From 70a4b0929d8223ef0dc55b0f1b3790a892bb9043 Mon Sep 17 00:00:00 2001 From: calderwoodra Date: Wed, 17 Jan 2018 13:17:27 -0800 Subject: Updated toolbar and dialpad interactions in NUI. Toolbar, Dialpad, Bottom Nav, FAB and Search now all show and hide properly according to the state of the application. Follow up CLs will include: - saving/restoring state - sending query to search fragment to display results Bug: 181512198 Test: MainActivityIntegrationTest PiperOrigin-RevId: 182259200 Change-Id: I1309d8df2a5425bf051e52a459a1f78e1157fe08 --- java/com/android/dialer/dialpadview/DialpadFragment.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'java/com/android/dialer/dialpadview') diff --git a/java/com/android/dialer/dialpadview/DialpadFragment.java b/java/com/android/dialer/dialpadview/DialpadFragment.java index 07e401cab..2796fca77 100644 --- a/java/com/android/dialer/dialpadview/DialpadFragment.java +++ b/java/com/android/dialer/dialpadview/DialpadFragment.java @@ -59,6 +59,7 @@ import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; +import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.view.animation.Animation; @@ -140,6 +141,7 @@ public class DialpadFragment extends Fragment private static final String EXTRA_SEND_EMPTY_FLASH = "com.android.phone.extra.SEND_EMPTY_FLASH"; private static final String PREF_DIGITS_FILLED_BY_INTENT = "pref_digits_filled_by_intent"; + private static final String PREF_IS_DIALPAD_SLIDE_OUT = "pref_is_dialpad_slide_out"; private static Optional currentCountryIsoForTesting = Optional.absent(); @@ -346,6 +348,7 @@ public class DialpadFragment extends Fragment if (state != null) { digitsFilledByIntent = state.getBoolean(PREF_DIGITS_FILLED_BY_INTENT); + isDialpadSlideUp = state.getBoolean(PREF_IS_DIALPAD_SLIDE_OUT); } dialpadSlideInDuration = getResources().getInteger(R.integer.dialpad_slide_in_duration); @@ -412,7 +415,7 @@ public class DialpadFragment extends Fragment .setOnTouchListener( (v, event) -> { if (isDigitsEmpty()) { - if (getActivity() != null) { + if (getActivity() != null && event.getAction() == MotionEvent.ACTION_UP) { LogUtil.i("DialpadFragment.onCreateView", "dialpad spacer touched"); return ((HostInterface) getActivity()).onDialpadSpacerTouchWithEmptyQuery(); } @@ -777,6 +780,7 @@ public class DialpadFragment extends Fragment public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); outState.putBoolean(PREF_DIGITS_FILLED_BY_INTENT, digitsFilledByIntent); + outState.putBoolean(PREF_IS_DIALPAD_SLIDE_OUT, isDialpadSlideUp); } @Override @@ -1559,6 +1563,10 @@ public class DialpadFragment extends Fragment getView().startAnimation(slideUp); } + public boolean isDialpadSlideUp() { + return isDialpadSlideUp; + } + /** Returns the text in the dialpad */ public String getQuery() { return digits.getText().toString(); -- cgit v1.2.3