From 9f1dd62c90c0d501fa773ffda507a17f992b5543 Mon Sep 17 00:00:00 2001 From: jabarros Date: Mon, 3 Nov 2014 10:37:56 +0100 Subject: [PATCH] Update getSeasonalId method on DisplayUtils class for not changing the app icon on branded clients --- src/com/owncloud/android/utils/DisplayUtils.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/owncloud/android/utils/DisplayUtils.java b/src/com/owncloud/android/utils/DisplayUtils.java index 8c4c492b..804a4dd0 100644 --- a/src/com/owncloud/android/utils/DisplayUtils.java +++ b/src/com/owncloud/android/utils/DisplayUtils.java @@ -29,6 +29,7 @@ import java.util.Set; import android.annotation.TargetApi; import android.os.Build; +import com.owncloud.android.MainApp; import com.owncloud.android.R; /** @@ -39,6 +40,8 @@ import com.owncloud.android.R; */ public class DisplayUtils { + private static final String OWNCLOUD_APP_NAME = "ownCloud"; + //private static String TAG = DisplayUtils.class.getSimpleName(); private static final String[] sizeSuffixes = { "B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB" }; @@ -233,7 +236,8 @@ public class DisplayUtils { public static int getSeasonalIconId() { - if (Calendar.getInstance().get(Calendar.DAY_OF_YEAR) >= 354) { + if (Calendar.getInstance().get(Calendar.DAY_OF_YEAR) >= 354 && + MainApp.getAppContext().getString(R.string.app_name).equals(OWNCLOUD_APP_NAME)) { return R.drawable.winter_holidays_icon; } else { return R.drawable.icon; -- 2.11.0