diff options
author | calderwoodra <calderwoodra@google.com> | 2018-05-19 00:05:02 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-05-21 13:17:30 -0700 |
commit | 929539eb864822d669265b142bdcc49b6cf8ea6b (patch) | |
tree | fcaef3fac4068e3669ca5916f7a743d0d5e41bbb /java/com/android/dialer/blockreportspam | |
parent | ea7399a7c0c8a3832a6592aee0a0372c300b11f5 (diff) |
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
Diffstat (limited to 'java/com/android/dialer/blockreportspam')
-rw-r--r-- | java/com/android/dialer/blockreportspam/BlockReportSpamDialogs.java | 6 | ||||
-rw-r--r-- | java/com/android/dialer/blockreportspam/ShowBlockReportSpamDialogReceiver.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/java/com/android/dialer/blockreportspam/BlockReportSpamDialogs.java b/java/com/android/dialer/blockreportspam/BlockReportSpamDialogs.java index db5fe2134..ff2a5888a 100644 --- a/java/com/android/dialer/blockreportspam/BlockReportSpamDialogs.java +++ b/java/com/android/dialer/blockreportspam/BlockReportSpamDialogs.java @@ -17,13 +17,13 @@ package com.android.dialer.blockreportspam; import android.app.Activity; -import android.app.AlertDialog; import android.app.Dialog; -import android.app.DialogFragment; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; import android.support.annotation.Nullable; +import android.support.v4.app.DialogFragment; +import android.support.v7.app.AlertDialog; import android.view.View; import android.widget.CheckBox; import android.widget.TextView; @@ -40,7 +40,7 @@ public final class BlockReportSpamDialogs { /** Creates a dialog with the default cancel button listener (which dismisses the dialog). */ private static AlertDialog.Builder createDialogBuilder( Activity activity, final DialogFragment fragment) { - return new AlertDialog.Builder(activity, R.style.AlertDialogTheme) + return new AlertDialog.Builder(activity) .setCancelable(true) .setNegativeButton(android.R.string.cancel, (dialog, which) -> fragment.dismiss()); } diff --git a/java/com/android/dialer/blockreportspam/ShowBlockReportSpamDialogReceiver.java b/java/com/android/dialer/blockreportspam/ShowBlockReportSpamDialogReceiver.java index fd26ab537..fb0399d9a 100644 --- a/java/com/android/dialer/blockreportspam/ShowBlockReportSpamDialogReceiver.java +++ b/java/com/android/dialer/blockreportspam/ShowBlockReportSpamDialogReceiver.java @@ -16,11 +16,11 @@ package com.android.dialer.blockreportspam; -import android.app.FragmentManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.support.v4.app.FragmentManager; import android.widget.Toast; import com.android.dialer.blocking.Blocking; import com.android.dialer.blocking.Blocking.BlockingFailedException; |