Merge remote-tracking branch 'upstream/develop' into

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / dialog / ChangelogDialog.java

diff --git a/src/com/owncloud/android/ui/dialog/ChangelogDialog.java b/src/com/owncloud/android/ui/dialog/ChangelogDialog.java
index 1822ce0..eef9d09 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/ChangelogDialog.java
+++ b/src/com/owncloud/android/ui/dialog/ChangelogDialog.java
@@ -25,6 +25,8 @@ import android.webkit.WebView;
 
 import com.actionbarsherlock.app.SherlockDialogFragment;
 import com.owncloud.android.R;
 
 import com.actionbarsherlock.app.SherlockDialogFragment;
 import com.owncloud.android.R;

+import com.owncloud.android.utils.DisplayUtils;
+

 
 /**
  * Dialog to show the contents of res/raw/CHANGELOG.txt
 
 /**
  * Dialog to show the contents of res/raw/CHANGELOG.txt


@@ -62,7 +64,7 @@ public class ChangelogDialog extends SherlockDialogFragment {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         
         Dialog dialog = builder.setView(webview)
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         
         Dialog dialog = builder.setView(webview)

-                                .setIcon(R.drawable.icon)
+                                .setIcon(DisplayUtils.getSeasonalIconId())

                                 //.setTitle(R.string.whats_new)
                                 .setPositiveButton(R.string.common_ok,
                                         new DialogInterface.OnClickListener() {
                                 //.setTitle(R.string.whats_new)
                                 .setPositiveButton(R.string.common_ok,
                                         new DialogInterface.OnClickListener() {