From 929539eb864822d669265b142bdcc49b6cf8ea6b Mon Sep 17 00:00:00 2001 From: calderwoodra Date: Sat, 19 May 2018 00:05:02 -0700 Subject: Implement a global theme to be easily configured in Dialer. deleted several colors and unified them across the app migrated several alert dialogs to support alert dialogs added many todos migrated several tests from GoogleRobolectricTestRunner to RobolectricTestRunner Because of the test migration: - moved dialpad theme attributes into dialpad/theme - moved incall ui theme attributes into incallui/theme Bug: 79883035 Test: tap PiperOrigin-RevId: 197246477 Change-Id: Ifc534793bc32757bbbf2007a7c40287c8d0817ad --- java/com/android/dialer/app/calllog/BlockReportSpamListener.java | 2 +- java/com/android/dialer/app/calllog/CallLogAdapter.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'java/com/android/dialer/app/calllog') diff --git a/java/com/android/dialer/app/calllog/BlockReportSpamListener.java b/java/com/android/dialer/app/calllog/BlockReportSpamListener.java index 987615f5f..865cb81cf 100644 --- a/java/com/android/dialer/app/calllog/BlockReportSpamListener.java +++ b/java/com/android/dialer/app/calllog/BlockReportSpamListener.java @@ -16,9 +16,9 @@ package com.android.dialer.app.calllog; -import android.app.FragmentManager; import android.content.Context; import android.support.annotation.NonNull; +import android.support.v4.app.FragmentManager; import android.support.v7.widget.RecyclerView; import android.view.View; import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler; diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java index 450e5eaa7..143af367a 100644 --- a/java/com/android/dialer/app/calllog/CallLogAdapter.java +++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java @@ -36,6 +36,7 @@ import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; import android.support.annotation.WorkerThread; import android.support.v7.app.AlertDialog; +import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView.ViewHolder; import android.telecom.PhoneAccountHandle; @@ -223,7 +224,7 @@ public class CallLogAdapter extends GroupingListAdapter private void showDeleteSelectedItemsDialog() { SparseArray voicemailsToDeleteOnConfirmation = selectedItems.clone(); - new AlertDialog.Builder(activity, R.style.AlertDialogCustom) + new AlertDialog.Builder(activity) .setCancelable(true) .setTitle( activity @@ -557,7 +558,7 @@ public class CallLogAdapter extends GroupingListAdapter new BlockReportSpamListener( this.activity, this.activity.findViewById(R.id.call_log_fragment_root), - ((Activity) this.activity).getFragmentManager(), + ((AppCompatActivity) this.activity).getSupportFragmentManager(), this, this.filteredNumberAsyncQueryHandler); setHasStableIds(true); -- cgit v1.2.3