summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/app/DialtactsActivity.java
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2018-05-15 19:31:05 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-05-15 19:31:05 +0000
commit47636a2531e2a1d6c51b1cd3fb6e242f457b2f71 (patch)
tree2de3818a7fa2c123be648ee01d9e551596f09ae2 /java/com/android/dialer/app/DialtactsActivity.java
parent21f2f3e1d5eba2cc436b0f1c78d9e354f209287d (diff)
parent3e2c6b8c22b238c3f3b1d9786a045f0a20615fa0 (diff)
Merge changes Id53c298a,I7df0ece7,I9f41b1a7,Iffbfa408,I2aac0df1, ...
* changes: Don't use LoaderManager.getInstance() in dialer. Implement PhoneNumberCacheLookup Fix add call button behavior. Use component for iconography Move SpamStub to separate package. Initialize dialpadFragment and searchFragment with FragmentManager when MainSearchController is created Compress all of dialer's png files. Delete unused check__SpamStatus methods Refactor simulator menu and add portal package for adding simulator service later. Add simulator component in generated root component. Update DialerCall to use SpamStatus instead of booleans Added contacts permission screen to speed dial fragment. Don't crash when cp2 returns a null label. Register system call log content observer if user enables Phone permission. Exit multiselect mode when opening the dialpad. Support missing phone permission in new call log.
Diffstat (limited to 'java/com/android/dialer/app/DialtactsActivity.java')
-rw-r--r--java/com/android/dialer/app/DialtactsActivity.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java
index c819fecba..06f094d5e 100644
--- a/java/com/android/dialer/app/DialtactsActivity.java
+++ b/java/com/android/dialer/app/DialtactsActivity.java
@@ -46,6 +46,7 @@ import android.telecom.PhoneAccount;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
+import android.view.ActionMode;
import android.view.DragEvent;
import android.view.Gravity;
import android.view.Menu;
@@ -1532,7 +1533,7 @@ public class DialtactsActivity extends TransactionSafeActivity
}
@Override
- public void onActionModeStateChanged(boolean isEnabled) {
+ public void onActionModeStateChanged(ActionMode mode, boolean isEnabled) {
isMultiSelectModeEnabled = isEnabled;
}