Skip to content

Commit 6c79acb

Browse files
Apply style to gdrive sync conflict dialog
1 parent 68761bb commit 6c79acb

File tree

1 file changed

+3
-2
lines changed
  • OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/gdrivesync

1 file changed

+3
-2
lines changed

OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/gdrivesync/GDriveSyncService.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.google.android.apps.forscience.whistlepunk.gdrivesync;
22

33
import android.app.Activity;
4-
import android.app.AlertDialog;
54
import android.app.Service;
65
import android.content.Context;
76
import android.content.Intent;
@@ -19,6 +18,7 @@
1918
import android.widget.Toast;
2019

2120
import androidx.annotation.Nullable;
21+
import androidx.appcompat.app.AlertDialog;
2222

2323
import com.google.android.apps.forscience.javalib.MaybeConsumer;
2424
import com.google.android.apps.forscience.javalib.Success;
@@ -32,6 +32,7 @@
3232
import com.google.android.apps.forscience.whistlepunk.filemetadata.ExperimentLibraryManager;
3333
import com.google.android.apps.forscience.whistlepunk.filemetadata.FileMetadataUtil;
3434
import com.google.android.apps.forscience.whistlepunk.filemetadata.LocalSyncManager;
35+
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
3536

3637
import java.io.File;
3738
import java.io.IOException;
@@ -376,7 +377,7 @@ private ConflictAnswer showConflict(final Context context, final AppAccount appA
376377
new Handler(Looper.getMainLooper()).post(() -> {
377378
final Activity activity = app.onNextActivity().blockingGet();
378379
if (activity != null) {
379-
AlertDialog.Builder d = new AlertDialog.Builder(activity);
380+
AlertDialog.Builder d = new MaterialAlertDialogBuilder(activity, R.style.AlertDialogTheme);
380381
d.setMessage(R.string.drive_sync_conflict);
381382
d.setNeutralButton(R.string.drive_sync_conflict_remote, (dialog, which) -> {
382383
synchronized (lock) {

0 commit comments

Comments
 (0)