Merge changes I099f22b7,Ia014e5e1,I3950071e,I1863a28e,I622b52f4, ...

* changes:
  Removed item animator in Call Log RecyclerView.
  NUI bug fixes: handling intents and onActivityResult.
  Use the vector spam icon in the new call log.
  Fixed some Dialer theming bugs in NUI.
  Make MarkDirtyObserver available to all call log data sources & PhoneLookups.
  Updating PrimaryInfo value class to use AutoValue with builder pattern.
  When there is no VM support hide the tab in the Old Main Activity
  Rebuild Call Log on first launch after NUI is enabled
  Changing the voicemail transcription font size
  Moved metrics related methods out of LoggingBindings.
  Record jank metrics in old and new call logs.
  Fixed some bugs in NUI search.
  Adding information section to voicemail settings
  Add Tracfone to Motorola menu, move existing menu to Sprint only
  Fixed some issues in NUI search bar.
  Disable VVM for tracfone USA
  Fix an NPE when ContactInfoHelper tries to retrieve remote directories.
  Merge searchfragment/remote into searchfragment/directories and renaming things accordingly.
  Initialize/Update the UI of New{CallLog|Voicemail}Fragment iff the fragment is truly visible.
  Use a broadcast receiver to refresh the annotated call log.
  Rename invalid resource folder
  Fix a few UI issues based around multiselect in new nav.
  Include the primary callback action in the new call log's bottom sheet.
  Implement read/write text stream to RttCall.
  Add configuration for when we show decimal and barcode device id
  Annotate RTT as @TargetApi(28).

3 files changed, 14 insertions, 55 deletions

diff --git a/java/com/android/dialer/phonelookup/blockednumber/DialerBlockedNumberPhoneLookup.java b/java/com/android/dialer/phonelookup/blockednumber/DialerBlockedNumberPhoneLookup.java
index 2271c7580..b6b02e135 100644
--- a/java/com/android/dialer/phonelookup/blockednumber/DialerBlockedNumberPhoneLookup.java
+++ b/java/com/android/dialer/phonelookup/blockednumber/DialerBlockedNumberPhoneLookup.java
@@ -22,6 +22,7 @@ import android.support.annotation.WorkerThread;
 import android.util.ArraySet;
 import com.android.dialer.DialerPhoneNumber;
 import com.android.dialer.blocking.FilteredNumberCompat;
+import com.android.dialer.calllog.observer.MarkDirtyObserver;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
@@ -51,13 +52,16 @@ public final class DialerBlockedNumberPhoneLookup implements PhoneLookup<DialerB
 
   private final Context appContext;
   private final ListeningExecutorService executorService;
+  private final MarkDirtyObserver markDirtyObserver;
 
   @Inject
   DialerBlockedNumberPhoneLookup(
       @ApplicationContext Context appContext,
-      @BackgroundExecutor ListeningExecutorService executorService) {
+      @BackgroundExecutor ListeningExecutorService executorService,
+      MarkDirtyObserver markDirtyObserver) {
     this.appContext = appContext;
     this.executorService = executorService;
+    this.markDirtyObserver = markDirtyObserver;
   }
 
   @Override
@@ -165,13 +169,12 @@ public final class DialerBlockedNumberPhoneLookup implements PhoneLookup<DialerB
   }
 
   @Override
-  public void registerContentObservers(
-      Context appContext, ContentObserverCallbacks contentObserverCallbacks) {
+  public void registerContentObservers(Context appContext) {
     appContext
         .getContentResolver()
         .registerContentObserver(
             FilteredNumber.CONTENT_URI,
             true, // FilteredNumberProvider notifies on the item
-            new MarkDirtyObserver(appContext, contentObserverCallbacks));
+            markDirtyObserver);
   }
 }
diff --git a/java/com/android/dialer/phonelookup/blockednumber/MarkDirtyObserver.java b/java/com/android/dialer/phonelookup/blockednumber/MarkDirtyObserver.java
deleted file mode 100644
index 1c41d8f7f..000000000
--- a/java/com/android/dialer/phonelookup/blockednumber/MarkDirtyObserver.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.phonelookup.blockednumber;
-
-import android.content.Context;
-import android.database.ContentObserver;
-import android.net.Uri;
-import android.support.annotation.MainThread;
-import com.android.dialer.common.Assert;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.common.concurrent.ThreadUtil;
-import com.android.dialer.phonelookup.PhoneLookup.ContentObserverCallbacks;
-
-/** Calls {@link ContentObserverCallbacks#markDirtyAndNotify(Context)} when the content changed */
-class MarkDirtyObserver extends ContentObserver {
-
-  private final Context appContext;
-  private final ContentObserverCallbacks contentObserverCallbacks;
-
-  MarkDirtyObserver(Context appContext, ContentObserverCallbacks contentObserverCallbacks) {
-    super(ThreadUtil.getUiThreadHandler());
-    this.appContext = appContext;
-    this.contentObserverCallbacks = contentObserverCallbacks;
-  }
-
-  @MainThread
-  @Override
-  public void onChange(boolean selfChange, Uri uri) {
-    Assert.isMainThread();
-    LogUtil.enterBlock("SystemBlockedNumberPhoneLookup.FilteredNumberObserver.onChange");
-    contentObserverCallbacks.markDirtyAndNotify(appContext);
-  }
-}
diff --git a/java/com/android/dialer/phonelookup/blockednumber/SystemBlockedNumberPhoneLookup.java b/java/com/android/dialer/phonelookup/blockednumber/SystemBlockedNumberPhoneLookup.java
index e0ff995e7..d791e9b9e 100644
--- a/java/com/android/dialer/phonelookup/blockednumber/SystemBlockedNumberPhoneLookup.java
+++ b/java/com/android/dialer/phonelookup/blockednumber/SystemBlockedNumberPhoneLookup.java
@@ -27,6 +27,7 @@ import android.support.annotation.WorkerThread;
 import android.util.ArraySet;
 import com.android.dialer.DialerPhoneNumber;
 import com.android.dialer.blocking.FilteredNumberCompat;
+import com.android.dialer.calllog.observer.MarkDirtyObserver;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
@@ -54,13 +55,16 @@ public class SystemBlockedNumberPhoneLookup implements PhoneLookup<SystemBlocked
 
   private final Context appContext;
   private final ListeningExecutorService executorService;
+  private final MarkDirtyObserver markDirtyObserver;
 
   @Inject
   SystemBlockedNumberPhoneLookup(
       @ApplicationContext Context appContext,
-      @BackgroundExecutor ListeningExecutorService executorService) {
+      @BackgroundExecutor ListeningExecutorService executorService,
+      MarkDirtyObserver markDirtyObserver) {
     this.appContext = appContext;
     this.executorService = executorService;
+    this.markDirtyObserver = markDirtyObserver;
   }
 
   @Override
@@ -166,8 +170,7 @@ public class SystemBlockedNumberPhoneLookup implements PhoneLookup<SystemBlocked
   }
 
   @Override
-  public void registerContentObservers(
-      Context appContext, ContentObserverCallbacks contentObserverCallbacks) {
+  public void registerContentObservers(Context appContext) {
     if (VERSION.SDK_INT < VERSION_CODES.N) {
       return;
     }
@@ -176,6 +179,6 @@ public class SystemBlockedNumberPhoneLookup implements PhoneLookup<SystemBlocked
         .registerContentObserver(
             BlockedNumbers.CONTENT_URI,
             true, // BlockedNumbers notifies on the item
-            new MarkDirtyObserver(appContext, contentObserverCallbacks));
+            markDirtyObserver);
   }
 }