From 7c4d9bb81e738698ff5fd2392c62b547190fc7d9 Mon Sep 17 00:00:00 2001
From: calderwoodra <calderwoodra@google.com>
Date: Fri, 6 Apr 2018 12:30:47 -0700
Subject: Convert new speed dial to support fragment and add it to new peer.

Bug: 36841782
Test: MainActivityNewPeerTest
PiperOrigin-RevId: 191924314
Change-Id: I5e4a4adadd5477115d6b4daf8afb8c6f819496c8
---
 .../android/dialer/speeddial/DisambigDialog.java   | 36 +++++-----------------
 .../dialer/speeddial/SpeedDialFragment.java        |  6 ++--
 .../speeddial/StrequentContactsCursorLoader.java   |  2 +-
 3 files changed, 12 insertions(+), 32 deletions(-)

(limited to 'java/com/android/dialer/speeddial')

diff --git a/java/com/android/dialer/speeddial/DisambigDialog.java b/java/com/android/dialer/speeddial/DisambigDialog.java
index ca02f41eb..1ee26f595 100644
--- a/java/com/android/dialer/speeddial/DisambigDialog.java
+++ b/java/com/android/dialer/speeddial/DisambigDialog.java
@@ -16,10 +16,7 @@
 
 package com.android.dialer.speeddial;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.FragmentManager;
 import android.content.ContentResolver;
 import android.content.res.Resources;
 import android.database.Cursor;
@@ -27,6 +24,9 @@ import android.os.Bundle;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.util.ArraySet;
 import android.view.LayoutInflater;
@@ -37,7 +37,6 @@ import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DialerExecutor.Worker;
-import com.android.dialer.common.concurrent.DialerExecutorComponent;
 import com.android.dialer.duo.DuoComponent;
 import com.android.dialer.precall.PreCall;
 import java.util.ArrayList;
@@ -48,10 +47,14 @@ import java.util.Set;
 public class DisambigDialog extends DialogFragment {
 
   @VisibleForTesting public static final String DISAMBIG_DIALOG_TAG = "disambig_dialog";
+
+  @SuppressWarnings("unused")
   private static final String DISAMBIG_DIALOG_WORKER_TAG = "disambig_dialog_worker";
 
   private final Set<String> phoneNumbers = new ArraySet<>();
   private LinearLayout container;
+
+  @SuppressWarnings("unused")
   private String lookupKey;
 
   /** Show a disambiguation dialog for a starred contact without a favorite communication avenue. */
@@ -70,12 +73,6 @@ public class DisambigDialog extends DialogFragment {
     return new AlertDialog.Builder(getActivity()).setView(view).create();
   }
 
-  @Override
-  public void onResume() {
-    super.onResume();
-    lookupContactInfo();
-  }
-
   @Override
   public void onPause() {
     super.onPause();
@@ -84,19 +81,6 @@ public class DisambigDialog extends DialogFragment {
     dismiss();
   }
 
-  private void lookupContactInfo() {
-    DialerExecutorComponent.get(getContext())
-        .dialerExecutorFactory()
-        .createUiTaskBuilder(
-            getFragmentManager(),
-            DISAMBIG_DIALOG_WORKER_TAG,
-            new LookupContactInfoWorker(getContext().getContentResolver()))
-        .onSuccess(this::insertOptions)
-        .onFailure(this::onLookupFailed)
-        .build()
-        .executeParallel(lookupKey);
-  }
-
   /**
    * Inflates and inserts the following in the dialog:
    *
@@ -106,6 +90,7 @@ public class DisambigDialog extends DialogFragment {
    *   <li>Clickable voice option
    * </ul>
    */
+  @SuppressWarnings("unused")
   private void insertOptions(Cursor cursor) {
     if (!cursorIsValid(cursor)) {
       dismiss();
@@ -197,11 +182,6 @@ public class DisambigDialog extends DialogFragment {
     return true;
   }
 
-  private void onLookupFailed(Throwable throwable) {
-    LogUtil.e("DisambigDialog.onLookupFailed", null, throwable);
-    insertOptions(null);
-  }
-
   private static class LookupContactInfoWorker implements Worker<String, Cursor> {
 
     static final int NUMBER_INDEX = 0;
diff --git a/java/com/android/dialer/speeddial/SpeedDialFragment.java b/java/com/android/dialer/speeddial/SpeedDialFragment.java
index 979c894fe..03a3c75bf 100644
--- a/java/com/android/dialer/speeddial/SpeedDialFragment.java
+++ b/java/com/android/dialer/speeddial/SpeedDialFragment.java
@@ -16,13 +16,13 @@
 
 package com.android.dialer.speeddial;
 
-import android.app.Fragment;
-import android.app.LoaderManager.LoaderCallbacks;
 import android.content.Intent;
-import android.content.Loader;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.LoaderManager.LoaderCallbacks;
+import android.support.v4.content.Loader;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/java/com/android/dialer/speeddial/StrequentContactsCursorLoader.java b/java/com/android/dialer/speeddial/StrequentContactsCursorLoader.java
index 40d03846f..a2dcfdc40 100644
--- a/java/com/android/dialer/speeddial/StrequentContactsCursorLoader.java
+++ b/java/com/android/dialer/speeddial/StrequentContactsCursorLoader.java
@@ -17,13 +17,13 @@
 package com.android.dialer.speeddial;
 
 import android.content.Context;
-import android.content.CursorLoader;
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.net.Uri;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.Contacts;
+import android.support.v4.content.CursorLoader;
 
 /** Cursor Loader for strequent contacts. */
 public final class StrequentContactsCursorLoader extends CursorLoader {
-- 
cgit v1.2.3