From 2fd91daa5b9912ba3be6c8701c031dfd878b8f3f Mon Sep 17 00:00:00 2001 From: Jonathan Almeida Date: Thu, 23 May 2019 18:31:49 -0400 Subject: [PATCH] No issue: Fix NotificationManager icon color --- .../fenix/components/BackgroundServices.kt | 3 ++- .../fenix/components/NotificationManager.kt | 2 +- .../main/res/drawable-hdpi/ic_status_logo.png | Bin 0 -> 717 bytes .../main/res/drawable-xhdpi/ic_status_logo.png | Bin 0 -> 919 bytes .../main/res/drawable-xxxhdpi/ic_status_logo.png | Bin 0 -> 1858 bytes .../main/res/mipmap-xxhdpi/ic_status_logo.png | Bin 0 -> 1376 bytes 6 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_status_logo.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_status_logo.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_status_logo.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_status_logo.png diff --git a/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt b/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt index e36f920ca..7276f8b6c 100644 --- a/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt +++ b/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt @@ -20,6 +20,7 @@ import mozilla.components.feature.sync.GlobalSyncableStoreProvider import mozilla.components.service.fxa.Config import mozilla.components.service.fxa.manager.DeviceTuple import mozilla.components.service.fxa.manager.FxaAccountManager +import org.mozilla.fenix.R import org.mozilla.fenix.test.Mockable /** @@ -68,7 +69,7 @@ class BackgroundServices( context, config, scopes, - DeviceTuple("Fenix", DeviceType.MOBILE, listOf(DeviceCapability.SEND_TAB)), + DeviceTuple(context.getString(R.string.app_name), DeviceType.MOBILE, listOf(DeviceCapability.SEND_TAB)), syncManager ).also { it.registerForDeviceEvents(deviceEventObserver, ProcessLifecycleOwner.get(), true) diff --git a/app/src/main/java/org/mozilla/fenix/components/NotificationManager.kt b/app/src/main/java/org/mozilla/fenix/components/NotificationManager.kt index 772a34943..00e90d6c0 100644 --- a/app/src/main/java/org/mozilla/fenix/components/NotificationManager.kt +++ b/app/src/main/java/org/mozilla/fenix/components/NotificationManager.kt @@ -50,7 +50,7 @@ class NotificationManager(private val context: Context) { val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, 0) val builder = NotificationCompat.Builder(context, RECEIVE_TABS_CHANNEL_ID) - .setSmallIcon(R.drawable.ic_notification) + .setSmallIcon(R.drawable.ic_status_logo) .setContentTitle(tab.title) .setContentText(tab.url) .setContentIntent(pendingIntent) diff --git a/app/src/main/res/drawable-hdpi/ic_status_logo.png b/app/src/main/res/drawable-hdpi/ic_status_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..374ef69857e23d816e070e0c0f6067523c3f3263 GIT binary patch literal 717 zcmV;;0y6!HP)|Nw2=#me_=}~`?3_2vqINRz`?3NWcDT9~-)aX_uD=;B}GFa`!G|3n- zf1v|=slna=&M0zv!V9J`&u7zHCCHk3tpzGk>9l(17~^3WoOj)ACEiK#o6g310}vUy zjpe?wT|&=%stL<$EEWiARhNqYV%Qopzzb+oJ*reKT%&v>n+RTBgjVPA^MV z1Qb&jx@f?q9m#HO112TVRBBF0J2@c~cilEIA9q*dqavfWkUn|9IAWxywS(C`7hp)a zx#PUhh$pJ3L9g^=bk3*kv;+48JT#0HUT3$8R>#2@^ex$92QGve(khnsc2;_=-)-I1 zHfU3*v&V7DX(v2NeLlqrqNEz~ zI%BEAONQ(o#f3fQvKXyohw(+B8StCzY|aB$&x1ZtvRLh=@F^~$MDlB*hDP(mq+LzT zv%NZu7tb-Yjd&UY`o=c@^$QG->g#Zg zK1+~SXwyso;f+YN`fU_P3)@f4+LoY>Iiuqb!DD%0i|>-B00000NkvXXu0mjf%j8Wf literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_status_logo.png b/app/src/main/res/drawable-xhdpi/ic_status_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..5f8e116e70a3c864649c958cd59aa206bf8b1c10 GIT binary patch literal 919 zcmV;I18Dq-P)q63qyTAfh5_Rg@JW^nhFx<)T^`Q6ac2gTfwG*z^D9 z9IxFqb&{n1BSn zARn8k$kUB>kU***0y8fPPl5z~P$M3AMKzk*N#K|y9jRtsV1_M}Vmm?q=8N=YDtilemQIIK-Fo6C_AbAK&V*Jt`#-bVXNz zR)v#5nJbuGDqAX6z&9s``q~ZO5lnU!d5$ueUdoZ{%1mWUT}W{?^f3CMq-beQl*M1K zBoKIjToLa`(k6}les_WQsm&ute}n5a8Id!@#!dQZ(5K-uZxU#0F;_7&8j2nq=L^f~e6vJof;9$=6!v*w%g1(IP$V zVXLyY=?RQwI*AD;B449oVzF+S$F z&rVsFV1b_|7d(rNTHBSAQD7lBEIs!{>k%t`L;uDZi5i6r`jZyCX&Dlo>r5=vz^fT7RL%_qn*;E>d~a>Gq&^bHvLJ!2705kZ;(x6xkq_>VDM5ZG75137pY5YTO}h%LFYi5Rk;_- z-=?bv3I35_!3@% tTX>3(_<>$@;yv9*1>ffHllT8#e*p+L&$y(p;Vb|E002ovPDHLkV1myeu)qKS literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_status_logo.png b/app/src/main/res/drawable-xxxhdpi/ic_status_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..4714deeafb4d85dcb66b3aa3b5ccf591bc3d0c3a GIT binary patch literal 1858 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 i(7L3$efIxI-1ryL3`DS7a$Gt90000