Merge branch 'UPD-23' into 'master'
UPD-23: Update the icon
See merge request !35
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 754050f..593f8c6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,13 +29,13 @@
<application
android:allowBackup="true"
- android:icon="@drawable/updater"
+ android:icon="@mipmap/ic_launcher_updater"
android:label="@string/app_full_name"
android:theme="@style/AppTheme"
android:supportsRtl="true">
<service
android:name=".UpdaterService"
- android:icon="@drawable/updater"
+ android:icon="@mipmap/ic_launcher_updater"
android:label="@string/updater_service" />
<receiver
@@ -54,7 +54,7 @@
<receiver
android:name=".widgets.gapps.GoogleAppsInstallerWidget"
- android:icon="@drawable/updater"
+ android:icon="@mipmap/ic_launcher_updater"
android:label="@string/google_apps_installer_name" >
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
diff --git a/app/src/main/java/com/fairphone/updater/UpdaterService.java b/app/src/main/java/com/fairphone/updater/UpdaterService.java
index c59680f..a2e85da 100644
--- a/app/src/main/java/com/fairphone/updater/UpdaterService.java
+++ b/app/src/main/java/com/fairphone/updater/UpdaterService.java
@@ -147,7 +147,7 @@
PendingIntent contentIntent = PendingIntent.getActivity(context, 0, notificationIntent, 0);
- NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(context).setSmallIcon(R.drawable.updater_white)
+ NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(context).setSmallIcon(R.drawable.ic_stat_updater)
.setContentTitle(context.getResources().getString(R.string.app_full_name))
.setContentText(context.getResources().getString(R.string.appStoreReinstall))
.setAutoCancel(true)
@@ -351,7 +351,7 @@
NotificationManager manager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
NotificationCompat.Builder builder =
- new NotificationCompat.Builder(context).setSmallIcon(R.drawable.updater_white)
+ new NotificationCompat.Builder(context).setSmallIcon(R.drawable.ic_stat_updater)
.setContentTitle(context.getResources().getString(R.string.app_full_name))
.setContentText(context.getResources().getString(R.string.fairphone_update_message));
diff --git a/app/src/main/res/drawable-hdpi-v11/ic_stat_updater.png b/app/src/main/res/drawable-hdpi-v11/ic_stat_updater.png
new file mode 100644
index 0000000..342216b
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi-v11/ic_stat_updater.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/icn_updater.png b/app/src/main/res/drawable-hdpi/icn_updater.png
deleted file mode 100644
index df602a1..0000000
--- a/app/src/main/res/drawable-hdpi/icn_updater.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/updater.png b/app/src/main/res/drawable-hdpi/updater.png
deleted file mode 100755
index f506b59..0000000
--- a/app/src/main/res/drawable-hdpi/updater.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/updater_tray_icon.png b/app/src/main/res/drawable-hdpi/updater_tray_icon.png
deleted file mode 100644
index f3ccf85..0000000
--- a/app/src/main/res/drawable-hdpi/updater_tray_icon.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/updater_tray_icon_small.png b/app/src/main/res/drawable-hdpi/updater_tray_icon_small.png
deleted file mode 100644
index ccd0b62..0000000
--- a/app/src/main/res/drawable-hdpi/updater_tray_icon_small.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/updater_white.png b/app/src/main/res/drawable-hdpi/updater_white.png
deleted file mode 100755
index 3037ce2..0000000
--- a/app/src/main/res/drawable-hdpi/updater_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi-v11/ic_stat_updater.png b/app/src/main/res/drawable-mdpi-v11/ic_stat_updater.png
new file mode 100644
index 0000000..95d0207
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi-v11/ic_stat_updater.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/icn_updater.png b/app/src/main/res/drawable-mdpi/icn_updater.png
deleted file mode 100644
index 107fe26..0000000
--- a/app/src/main/res/drawable-mdpi/icn_updater.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/updater.png b/app/src/main/res/drawable-mdpi/updater.png
deleted file mode 100755
index bfde75b..0000000
--- a/app/src/main/res/drawable-mdpi/updater.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/updater_white.png b/app/src/main/res/drawable-mdpi/updater_white.png
deleted file mode 100755
index 9669692..0000000
--- a/app/src/main/res/drawable-mdpi/updater_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi-v11/ic_stat_updater.png b/app/src/main/res/drawable-xhdpi-v11/ic_stat_updater.png
new file mode 100644
index 0000000..94d5444
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi-v11/ic_stat_updater.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/icn_updater.png b/app/src/main/res/drawable-xhdpi/icn_updater.png
deleted file mode 100644
index 8073909..0000000
--- a/app/src/main/res/drawable-xhdpi/icn_updater.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/updater.png b/app/src/main/res/drawable-xhdpi/updater.png
deleted file mode 100755
index b74895c..0000000
--- a/app/src/main/res/drawable-xhdpi/updater.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/updater_white.png b/app/src/main/res/drawable-xhdpi/updater_white.png
deleted file mode 100755
index 544dc37..0000000
--- a/app/src/main/res/drawable-xhdpi/updater_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi-v11/ic_stat_updater.png b/app/src/main/res/drawable-xxhdpi-v11/ic_stat_updater.png
new file mode 100644
index 0000000..d2d1e8e
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi-v11/ic_stat_updater.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/icn_updater.png b/app/src/main/res/drawable-xxhdpi/icn_updater.png
deleted file mode 100644
index ade2e50..0000000
--- a/app/src/main/res/drawable-xxhdpi/icn_updater.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/updater.png b/app/src/main/res/drawable-xxhdpi/updater.png
deleted file mode 100755
index 2b3a716..0000000
--- a/app/src/main/res/drawable-xxhdpi/updater.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/updater_white.png b/app/src/main/res/drawable-xxhdpi/updater_white.png
deleted file mode 100755
index 54a5956..0000000
--- a/app/src/main/res/drawable-xxhdpi/updater_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi-v11/ic_stat_updater.png b/app/src/main/res/drawable-xxxhdpi-v11/ic_stat_updater.png
new file mode 100644
index 0000000..383094e
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi-v11/ic_stat_updater.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icn_updater.png b/app/src/main/res/drawable-xxxhdpi/icn_updater.png
deleted file mode 100644
index 1081dd3..0000000
--- a/app/src/main/res/drawable-xxxhdpi/icn_updater.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/updater.png b/app/src/main/res/drawable-xxxhdpi/updater.png
deleted file mode 100755
index fcbe83f..0000000
--- a/app/src/main/res/drawable-xxxhdpi/updater.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/updater_white.png b/app/src/main/res/drawable-xxxhdpi/updater_white.png
deleted file mode 100755
index 508cf5c..0000000
--- a/app/src/main/res/drawable-xxxhdpi/updater_white.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_updater.png b/app/src/main/res/mipmap-hdpi/ic_launcher_updater.png
new file mode 100644
index 0000000..0479c0d
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_updater.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_updater.png b/app/src/main/res/mipmap-mdpi/ic_launcher_updater.png
new file mode 100644
index 0000000..4ba3084
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_updater.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_updater.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_updater.png
new file mode 100644
index 0000000..0144e0b
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_updater.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_updater.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_updater.png
new file mode 100644
index 0000000..d2b66b4
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_updater.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_updater.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_updater.png
new file mode 100644
index 0000000..46788df
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_updater.png
Binary files differ
