diff options
| -rw-r--r-- | java/com/android/dialer/app/DialtactsActivity.java | 14 | ||||
| -rw-r--r-- | java/com/android/dialer/searchfragment/list/NewSearchFragment.java | 6 |
2 files changed, 8 insertions, 12 deletions
diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java index d9a63fab2..755b335ec 100644 --- a/java/com/android/dialer/app/DialtactsActivity.java +++ b/java/com/android/dialer/app/DialtactsActivity.java @@ -907,8 +907,7 @@ public class DialtactsActivity extends TransactionSafeActivity @Override public void onCallPlacedFromDialpad() { - hideDialpadFragment(false /* animate */, true /*clearDialpad */); - exitSearchUi(); + mClearSearchOnPause = true; } @Override @@ -1021,9 +1020,8 @@ public class DialtactsActivity extends TransactionSafeActivity private void hideDialpadAndSearchUi() { if (mIsDialpadShown) { hideDialpadFragment(false, true); - } else { - exitSearchUi(); } + exitSearchUi(); } private void prepareVoiceSearchButton() { @@ -1678,11 +1676,9 @@ public class DialtactsActivity extends TransactionSafeActivity } @Override - public void onCallPlaced() { - if (mIsDialpadShown) { - hideDialpadFragment(false, true); - } - exitSearchUi(); + public void onCallPlacedFromSearch() { + DialerUtils.hideInputMethod(mParentLayout); + mClearSearchOnPause = true; } protected int getPreviouslySelectedTabIndex() { diff --git a/java/com/android/dialer/searchfragment/list/NewSearchFragment.java b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java index df2714690..9a96b4aab 100644 --- a/java/com/android/dialer/searchfragment/list/NewSearchFragment.java +++ b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java @@ -507,7 +507,7 @@ public final class NewSearchFragment extends Fragment new CallIntentBuilder(phoneNumber, callSpecificAppData) .setIsVideoCall(isVideoCall) .setAllowAssistedDial(allowAssistedDial)); - FragmentUtils.getParentUnsafe(this, SearchFragmentListener.class).onCallPlaced(); + FragmentUtils.getParentUnsafe(this, SearchFragmentListener.class).onCallPlacedFromSearch(); } @Override @@ -516,7 +516,7 @@ public final class NewSearchFragment extends Fragment .logImpression(DialerImpression.Type.LIGHTBRINGER_VIDEO_REQUESTED_FROM_SEARCH); Intent intent = DuoComponent.get(getContext()).getDuo().getIntent(getContext(), phoneNumber); getActivity().startActivityForResult(intent, ActivityRequestCodes.DIALTACTS_DUO); - FragmentUtils.getParentUnsafe(this, SearchFragmentListener.class).onCallPlaced(); + FragmentUtils.getParentUnsafe(this, SearchFragmentListener.class).onCallPlacedFromSearch(); } @Override @@ -536,6 +536,6 @@ public final class NewSearchFragment extends Fragment boolean onSearchListTouch(MotionEvent event); /** Called when a call is placed from the search fragment. */ - void onCallPlaced(); + void onCallPlacedFromSearch(); } } |