element-hq · bmarty · Aug 14, 2018 · Aug 14, 2018 · Aug 14, 2018 · Aug 14, 2018
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -5,6 +5,7 @@ Features:
  -
 
 Improvements:
+ - Update settings icon and transparent logo for notifications and navigation drawer (#2492)
  - URL previews are no longer requested from the server when displaying URL previews is disabled (PR #2514)
 
 Other changes:

diff --git a/vector/src/main/java/im/vector/notifications/NotificationUtils.kt b/vector/src/main/java/im/vector/notifications/NotificationUtils.kt
@@ -196,7 +196,7 @@ object NotificationUtils {
                 .setWhen(System.currentTimeMillis())
                 .setContentTitle(context.getString(R.string.riot_app_name))
                 .setContentText(context.getString(subTitleResId))
-                .setSmallIcon(R.drawable.permanent_notification_transparent)
+                .setSmallIcon(R.drawable.logo_transparent)
                 .setContentIntent(pi)
 
         // hide the notification from the status bar
@@ -512,7 +512,7 @@ object NotificationUtils {
             if (!roomsNotifications.mIsInvitationEvent) {
                 try {
                     val wearableExtender = NotificationCompat.WearableExtender()
-                    val action = NotificationCompat.Action.Builder(R.drawable.message_notification_transparent,
+                    val action = NotificationCompat.Action.Builder(R.drawable.logo_transparent,
                             roomsNotifications.mWearableMessage,
                             stackBuilderTap.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT))
                             .build()
@@ -670,7 +670,7 @@ object NotificationUtils {
                     .setWhen(roomsNotifications.mContentTs)
                     .setContentTitle(ensureTitleNotEmpty(context, roomsNotifications.mContentTitle))
                     .setContentText(roomsNotifications.mContentText)
-                    .setSmallIcon(R.drawable.message_notification_transparent)
+                    .setSmallIcon(R.drawable.logo_transparent)
                     .setGroup(context.getString(R.string.riot_app_name))
                     .setGroupSummary(true)
                     .setDeleteIntent(PendingIntent.getBroadcast(context.applicationContext,
@@ -716,7 +716,7 @@ object NotificationUtils {
                     .setWhen(System.currentTimeMillis())
                     .setContentTitle(context.getString(R.string.riot_app_name))
                     .setContentText(messagesStrings[0])
-                    .setSmallIcon(R.drawable.message_notification_transparent)
+                    .setSmallIcon(R.drawable.logo_transparent)
                     .setGroup(context.getString(R.string.riot_app_name))
                     .setGroupSummary(true)
 

diff --git a/vector/src/main/res/drawable-hdpi/ic_settings.png b/vector/src/main/res/drawable-hdpi/ic_settings.png
diff --git a/vector/src/main/res/drawable-hdpi/logo_transparent.png b/vector/src/main/res/drawable-hdpi/logo_transparent.png
diff --git a/vector/src/main/res/drawable-hdpi/message_notification_transparent.png b/vector/src/main/res/drawable-hdpi/message_notification_transparent.png
diff --git a/vector/src/main/res/drawable-hdpi/permanent_notification_transparent.png b/vector/src/main/res/drawable-hdpi/permanent_notification_transparent.png
diff --git a/vector/src/main/res/drawable-mdpi/ic_settings.png b/vector/src/main/res/drawable-mdpi/ic_settings.png
diff --git a/vector/src/main/res/drawable-mdpi/logo_transparent.png b/vector/src/main/res/drawable-mdpi/logo_transparent.png
diff --git a/vector/src/main/res/drawable-mdpi/message_notification_transparent.png b/vector/src/main/res/drawable-mdpi/message_notification_transparent.png
diff --git a/vector/src/main/res/drawable-mdpi/permanent_notification_transparent.png b/vector/src/main/res/drawable-mdpi/permanent_notification_transparent.png
diff --git a/vector/src/main/res/drawable-xhdpi/ic_settings.png b/vector/src/main/res/drawable-xhdpi/ic_settings.png
diff --git a/vector/src/main/res/drawable-xhdpi/logo_transparent.png b/vector/src/main/res/drawable-xhdpi/logo_transparent.png
diff --git a/vector/src/main/res/drawable-xhdpi/message_notification_transparent.png b/vector/src/main/res/drawable-xhdpi/message_notification_transparent.png
diff --git a/vector/src/main/res/drawable-xhdpi/permanent_notification_transparent.png b/vector/src/main/res/drawable-xhdpi/permanent_notification_transparent.png
diff --git a/vector/src/main/res/drawable-xxhdpi/ic_settings.png b/vector/src/main/res/drawable-xxhdpi/ic_settings.png
diff --git a/vector/src/main/res/drawable-xxhdpi/icons_settings.png b/vector/src/main/res/drawable-xxhdpi/icons_settings.png
diff --git a/vector/src/main/res/drawable-xxhdpi/logo_transparent.png b/vector/src/main/res/drawable-xxhdpi/logo_transparent.png
diff --git a/vector/src/main/res/drawable-xxhdpi/message_notification_transparent.png b/vector/src/main/res/drawable-xxhdpi/message_notification_transparent.png
diff --git a/vector/src/main/res/drawable-xxhdpi/permanent_notification_transparent.png b/vector/src/main/res/drawable-xxhdpi/permanent_notification_transparent.png
diff --git a/vector/src/main/res/drawable-xxxhdpi/ic_settings.png b/vector/src/main/res/drawable-xxxhdpi/ic_settings.png
diff --git a/vector/src/main/res/drawable-xxxhdpi/logo_transparent.png b/vector/src/main/res/drawable-xxxhdpi/logo_transparent.png
diff --git a/vector/src/main/res/drawable-xxxhdpi/message_notification_transparent.png b/vector/src/main/res/drawable-xxxhdpi/message_notification_transparent.png
diff --git a/vector/src/main/res/drawable-xxxhdpi/permanent_notification_transparent.png b/vector/src/main/res/drawable-xxxhdpi/permanent_notification_transparent.png
diff --git a/vector/src/main/res/menu/vector_choose_sticker.xml b/vector/src/main/res/menu/vector_choose_sticker.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/menu_settings"
-        android:icon="@drawable/icons_settings"
+        android:icon="@drawable/ic_settings"
         android:title="@string/room_sliding_menu_settings"
         app:showAsAction="always" />
 

diff --git a/vector/src/main/res/menu/vector_home_sliding_menu.xml b/vector/src/main/res/menu/vector_home_sliding_menu.xml
@@ -9,7 +9,7 @@
 
         <item
             android:id="@+id/sliding_menu_settings"
-            android:icon="@drawable/icons_settings"
+            android:icon="@drawable/ic_settings"
             android:title="@string/room_sliding_menu_settings"/>
 
         <item