From 4043bd869645afa81124c28aeb139bb8b2318c5e Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Mon, 2 Dec 2013 13:09:24 -0800 Subject: [PATCH] Update alert dialog title divider color --- .../io/backup/RestoreChooserActivity.java | 27 +++++++++++-------- .../io/file/exporter/SaveActivity.java | 10 ++++++- .../io/file/importer/ImportActivity.java | 12 +++++++-- .../io/sendtogoogle/UploadResultActivity.java | 8 ++++++ 4 files changed, 43 insertions(+), 14 deletions(-) diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java index 969e37223..65d36a441 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java @@ -16,6 +16,7 @@ package com.google.android.apps.mytracks.io.backup; +import com.google.android.apps.mytracks.util.DialogUtils; import com.google.android.apps.mytracks.util.FileUtils; import com.google.android.apps.mytracks.util.IntentUtils; import com.google.android.apps.mytracks.util.StringUtils; @@ -97,26 +98,30 @@ public class RestoreChooserActivity extends Activity { for (int i = 0; i < backupDates.length; i++) { items[i] = StringUtils.formatDateTime(this, backupDates[i].getTime()); } - return new AlertDialog.Builder(this) - .setCancelable(true) + final Dialog dialog = new AlertDialog.Builder(this).setCancelable(true) .setItems(items, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { + @Override + public void onClick(DialogInterface dialogInterface, int which) { Intent intent = IntentUtils.newIntent( RestoreChooserActivity.this, RestoreActivity.class) .putExtra(RestoreActivity.EXTRA_DATE, backupDates[which].getTime()); startActivity(intent); finish(); } - }) - .setOnCancelListener(new DialogInterface.OnCancelListener() { - @Override - public void onCancel(DialogInterface dialog) { + }).setOnCancelListener(new DialogInterface.OnCancelListener() { + @Override + public void onCancel(DialogInterface dialogInterface) { finish(); } - }) - .setTitle(R.string.settings_backup_restore_select_title) - .create(); + }).setTitle(R.string.settings_backup_restore_select_title).create(); + dialog.setOnShowListener(new DialogInterface.OnShowListener() { + + @Override + public void onShow(DialogInterface dialogInterface) { + DialogUtils.setDialogTitleDivider(RestoreChooserActivity.this, dialog); + } + }); + return dialog; } /** diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/SaveActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/SaveActivity.java index 95766f418..a592b8a86 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/SaveActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/SaveActivity.java @@ -180,7 +180,15 @@ public class SaveActivity extends Activity { } }); } - return builder.create(); + final Dialog dialog = builder.create(); + dialog.setOnShowListener(new DialogInterface.OnShowListener() { + + @Override + public void onShow(DialogInterface dialogInterface) { + DialogUtils.setDialogTitleDivider(SaveActivity.this, dialog); + } + }); + return dialog; default: return null; } diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java index f12d20738..b0c806cbb 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java @@ -168,8 +168,8 @@ public class ImportActivity extends Activity { message = getString( R.string.import_error, successCount, totalFiles, directoryDisplayName); } - return new AlertDialog.Builder(this).setCancelable(true).setIcon(iconId).setMessage(message) - .setOnCancelListener(new DialogInterface.OnCancelListener() { + final Dialog dialog = new AlertDialog.Builder(this).setCancelable(true).setIcon(iconId) + .setMessage(message).setOnCancelListener(new DialogInterface.OnCancelListener() { @Override public void onCancel(DialogInterface dialog) { dialog.dismiss(); @@ -190,6 +190,14 @@ public class ImportActivity extends Activity { finish(); } }).setTitle(titleId).create(); + dialog.setOnShowListener(new DialogInterface.OnShowListener() { + + @Override + public void onShow(DialogInterface dialogInterface) { + DialogUtils.setDialogTitleDivider(ImportActivity.this, dialog); + } + }); + return dialog; default: return null; } diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java index f17d84478..ab3f862f1 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java @@ -20,6 +20,7 @@ import com.google.android.apps.mytracks.content.MyTracksProviderUtils; import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.fragments.ChooseActivityDialogFragment; import com.google.android.apps.mytracks.fragments.ChooseActivityDialogFragment.ChooseActivityCaller; +import com.google.android.apps.mytracks.util.DialogUtils; import com.google.android.apps.mytracks.util.IntentUtils; import com.google.android.maps.mytracks.R; import com.google.common.annotations.VisibleForTesting; @@ -137,6 +138,13 @@ public class UploadResultActivity extends FragmentActivity implements ChooseActi }); } resultDialog = builder.create(); + resultDialog.setOnShowListener(new DialogInterface.OnShowListener() { + + @Override + public void onShow(DialogInterface dialog) { + DialogUtils.setDialogTitleDivider(UploadResultActivity.this, resultDialog); + } + }); return resultDialog; }