ソースを参照

replace launcher icon including seasonal icon removal

Andy Scherzinger 9 年 前
コミット
91682b616c

+ 1 - 1
AndroidManifest.xml

@@ -57,7 +57,7 @@
 
     <application
         android:name=".MainApp"
-        android:icon="@drawable/icon"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/Theme.ownCloud"
         android:manageSpaceActivity=".ui.activity.ManageSpaceActivity">

BIN
res/drawable-hdpi/icon.png


BIN
res/drawable-hdpi/winter_holidays_icon.png


BIN
res/drawable-mdpi/icon.png


BIN
res/drawable-mdpi/shared_via_link.png


BIN
res/drawable-mdpi/shared_via_users.png


BIN
res/drawable-mdpi/shared_with_me_folder.png


BIN
res/drawable-mdpi/winter_holidays_icon.png


BIN
res/drawable-xhdpi/file_zip.png


BIN
res/drawable-xhdpi/folder_external.png


BIN
res/drawable-xhdpi/folder_public.png


BIN
res/drawable-xhdpi/ic_menu_archive.png


BIN
res/drawable-xhdpi/icon.png


BIN
res/mipmap-hdpi/ic_launcher.png


BIN
res/mipmap-mdpi/ic_launcher.png


BIN
res/mipmap-xhdpi/ic_launcher.png


BIN
res/mipmap-xxhdpi/ic_launcher.png


BIN
res/mipmap-xxxhdpi/ic_launcher.png


+ 2 - 2
res/xml/authenticator.xml

@@ -19,7 +19,7 @@
 -->
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
                        android:accountType="@string/account_type"
-                       android:icon="@drawable/icon"
+                       android:icon="@mipmap/ic_launcher"
                        android:label="@string/app_name"
-                       android:smallIcon="@drawable/icon">  
+                       android:smallIcon="@mipmap/ic_launcher">
 </account-authenticator>

+ 1 - 1
src/com/owncloud/android/ui/dialog/ChangelogDialog.java

@@ -69,7 +69,7 @@ public class ChangelogDialog extends DialogFragment {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         
         Dialog dialog = builder.setView(webview)
-                                .setIcon(DisplayUtils.getSeasonalIconId())
+                                .setIcon(R.mipmap.ic_launcher)
                                 //.setTitle(R.string.whats_new)
                                 .setPositiveButton(R.string.common_ok,
                                         new DialogInterface.OnClickListener() {

+ 0 - 9
src/com/owncloud/android/utils/DisplayUtils.java

@@ -125,15 +125,6 @@ public class DisplayUtils {
         return df.format(date);
     }
     
-    public static int getSeasonalIconId() {
-        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;
-        }
-    }
-    
     /**
      * Converts an internationalized domain name (IDN) in an URL to and from ASCII/Unicode.
      * @param url the URL where the domain name should be converted