diff options
| author | calderwoodra <calderwoodra@google.com> | 2018-05-11 21:31:16 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-05-15 11:11:30 -0700 |
| commit | 0ae50bdaaa095aa18eeb897f96778de64f3e6cd3 (patch) | |
| tree | d9b7dcd6795cb6c986124a071099349c1daaf19f /java/com/android/dialer/main | |
| parent | b628cfb41b4032450fd8f72388d212b924910177 (diff) | |
Exit multiselect mode when opening the dialpad.
Bug: 79183384
Test: manual
PiperOrigin-RevId: 196344851
Change-Id: I9f5c0e52cb4efe9e63e2c19a4f62ee0b9a23412f
Diffstat (limited to 'java/com/android/dialer/main')
| -rw-r--r-- | java/com/android/dialer/main/impl/OldMainActivityPeer.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/java/com/android/dialer/main/impl/OldMainActivityPeer.java b/java/com/android/dialer/main/impl/OldMainActivityPeer.java index 2d6b0a6e7..16f46c10f 100644 --- a/java/com/android/dialer/main/impl/OldMainActivityPeer.java +++ b/java/com/android/dialer/main/impl/OldMainActivityPeer.java @@ -48,6 +48,7 @@ import android.telecom.PhoneAccountHandle; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.text.method.LinkMovementMethod; +import android.view.ActionMode; import android.view.DragEvent; import android.view.View; import android.widget.ImageView; @@ -255,6 +256,10 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen v -> { Logger.get(activity).logImpression(DialerImpression.Type.MAIN_CLICK_FAB_TO_OPEN_DIALPAD); searchController.showDialpad(true); + if (callLogAdapterOnActionModeStateChangedListener.isEnabled) { + LogUtil.i("OldMainActivityPeer.onFabClicked", "closing multiselect"); + callLogAdapterOnActionModeStateChangedListener.actionMode.finish(); + } }); MainToolbar toolbar = activity.findViewById(R.id.toolbar); @@ -798,9 +803,11 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen implements CallLogAdapter.OnActionModeStateChangedListener { private boolean isEnabled; + private ActionMode actionMode; @Override - public void onActionModeStateChanged(boolean isEnabled) { + public void onActionModeStateChanged(ActionMode actionMode, boolean isEnabled) { + this.actionMode = actionMode; this.isEnabled = isEnabled; } |