|
1 | 1 | package com.google.android.apps.forscience.whistlepunk.gdrivesync; |
2 | 2 |
|
3 | 3 | import android.app.Activity; |
4 | | -import android.app.AlertDialog; |
5 | 4 | import android.app.Service; |
6 | 5 | import android.content.Context; |
7 | 6 | import android.content.Intent; |
|
19 | 18 | import android.widget.Toast; |
20 | 19 |
|
21 | 20 | import androidx.annotation.Nullable; |
| 21 | +import androidx.appcompat.app.AlertDialog; |
22 | 22 |
|
23 | 23 | import com.google.android.apps.forscience.javalib.MaybeConsumer; |
24 | 24 | import com.google.android.apps.forscience.javalib.Success; |
|
32 | 32 | import com.google.android.apps.forscience.whistlepunk.filemetadata.ExperimentLibraryManager; |
33 | 33 | import com.google.android.apps.forscience.whistlepunk.filemetadata.FileMetadataUtil; |
34 | 34 | import com.google.android.apps.forscience.whistlepunk.filemetadata.LocalSyncManager; |
| 35 | +import com.google.android.material.dialog.MaterialAlertDialogBuilder; |
35 | 36 |
|
36 | 37 | import java.io.File; |
37 | 38 | import java.io.IOException; |
@@ -376,7 +377,7 @@ private ConflictAnswer showConflict(final Context context, final AppAccount appA |
376 | 377 | new Handler(Looper.getMainLooper()).post(() -> { |
377 | 378 | final Activity activity = app.onNextActivity().blockingGet(); |
378 | 379 | if (activity != null) { |
379 | | - AlertDialog.Builder d = new AlertDialog.Builder(activity); |
| 380 | + AlertDialog.Builder d = new MaterialAlertDialogBuilder(activity, R.style.AlertDialogTheme); |
380 | 381 | d.setMessage(R.string.drive_sync_conflict); |
381 | 382 | d.setNeutralButton(R.string.drive_sync_conflict_remote, (dialog, which) -> { |
382 | 383 | synchronized (lock) { |
|
0 commit comments