From 1a44a98f34adf683be0f1aa027a3f31d9d9dafe5 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Thu, 9 Jul 2020 14:29:14 -0400 Subject: [PATCH 1/4] Update font family For notification settings, to match the inline settings Test: manual Fixes: 153886531 Change-Id: Ie338080bd35a8dc2715330f3b82c272b0be81d54 (cherry picked from commit edb8dd0ec4e110ddd0667886dc6c95284b2d14a8) --- res/values/styles.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/styles.xml b/res/values/styles.xml index c74a1a2268b..1be8ba0e0b6 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -618,7 +618,7 @@ From 2700b83c48479c454b9b3a2df45da407c6038fd1 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Wed, 8 Jul 2020 15:09:41 -0400 Subject: [PATCH 2/4] Restore original importance when unblocking notif channel Test: atest Fixes: 62355992 Change-Id: I5d764d0ade68b2ce5708ae79e9ef488ab57bb141 (cherry picked from commit e2a8266328761a1bbfd58d8169b2de4c229b455f) --- .../app/BlockPreferenceController.java | 7 ++++-- .../app/ChannelListPreferenceController.java | 25 ++----------------- .../app/BlockPreferenceControllerTest.java | 3 ++- 3 files changed, 9 insertions(+), 26 deletions(-) diff --git a/src/com/android/settings/notification/app/BlockPreferenceController.java b/src/com/android/settings/notification/app/BlockPreferenceController.java index f55ea8c609b..27389620c82 100644 --- a/src/com/android/settings/notification/app/BlockPreferenceController.java +++ b/src/com/android/settings/notification/app/BlockPreferenceController.java @@ -106,8 +106,11 @@ public class BlockPreferenceController extends NotificationPreferenceController // It's always safe to override the importance if it's meant to be blocked or if // it was blocked and we are unblocking it. if (blocked || originalImportance == IMPORTANCE_NONE) { - final int importance = blocked ? IMPORTANCE_NONE - : isDefaultChannel() ? IMPORTANCE_UNSPECIFIED : IMPORTANCE_DEFAULT; + final int importance = blocked + ? IMPORTANCE_NONE + : isDefaultChannel() + ? IMPORTANCE_UNSPECIFIED + : mChannel.getOriginalImportance(); mChannel.setImportance(importance); saveChannel(); } diff --git a/src/com/android/settings/notification/app/ChannelListPreferenceController.java b/src/com/android/settings/notification/app/ChannelListPreferenceController.java index b19fc71d422..8a34672eea1 100644 --- a/src/com/android/settings/notification/app/ChannelListPreferenceController.java +++ b/src/com/android/settings/notification/app/ChannelListPreferenceController.java @@ -207,17 +207,14 @@ public class ChannelListPreferenceController extends NotificationPreferenceContr channelPref.setOnPreferenceChangeListener( (preference, o) -> { boolean value = (Boolean) o; - int importance = value ? IMPORTANCE_LOW : IMPORTANCE_NONE; + int importance = value ? channel.getOriginalImportance() : IMPORTANCE_NONE; channel.setImportance(importance); - channel.lockFields( - NotificationChannel.USER_LOCKED_IMPORTANCE); + channel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE); MasterSwitchPreference channelPref1 = (MasterSwitchPreference) preference; channelPref1.setIcon(null); if (channel.getImportance() > IMPORTANCE_LOW) { channelPref1.setIcon(getAlertingIcon()); } - toggleBehaviorIconState(channelPref1.getIcon(), - importance != IMPORTANCE_NONE); mBackend.updateChannel(mAppRow.pkg, mAppRow.uid, channel); return true; @@ -234,24 +231,6 @@ public class ChannelListPreferenceController extends NotificationPreferenceContr return icon; } - private void toggleBehaviorIconState(Drawable icon, boolean enabled) { - if (icon == null) return; - - LayerDrawable layerDrawable = (LayerDrawable) icon; - GradientDrawable background = - (GradientDrawable) layerDrawable.findDrawableByLayerId(R.id.back); - - if (background == null) return; - - if (enabled) { - background.clearColorFilter(); - } else { - background.setColorFilter(new BlendModeColorFilter( - mContext.getColor(R.color.material_grey_300), - BlendMode.SRC_IN)); - } - } - protected void onGroupBlockStateChanged(NotificationChannelGroup group) { if (group == null) { return; diff --git a/tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java index d203c47abc8..2ea240e1be0 100644 --- a/tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java @@ -368,6 +368,7 @@ public class BlockPreferenceControllerTest { public void testOnSwitchChanged_channel_nonDefault() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = new NotificationChannel("a", "a", IMPORTANCE_HIGH); + channel.setOriginalImportance(IMPORTANCE_HIGH); mController.onResume(appRow, channel, null, null, null, null); mController.updateState(mPreference); @@ -375,7 +376,7 @@ public class BlockPreferenceControllerTest { assertEquals(IMPORTANCE_NONE, channel.getImportance()); mController.onSwitchChanged(null, true); - assertEquals(IMPORTANCE_DEFAULT, channel.getImportance()); + assertEquals(IMPORTANCE_HIGH, channel.getImportance()); verify(mBackend, times(2)).updateChannel(any(), anyInt(), any()); } From 2532f0b32cffeefd1648407715bf137c297f79de Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 14 Jul 2020 02:03:30 -0700 Subject: [PATCH 3/4] Import translations. DO NOT MERGE Auto-generated-cl: translation import Change-Id: I30a4580a86030d499cdaa42ee082af185543ee6d --- res/values-de/strings.xml | 8 ++++---- res/values-eu/strings.xml | 2 +- res/values-km/strings.xml | 2 +- res/values-sk/strings.xml | 4 ++-- res/values-uz/strings.xml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 48e8f7e81b9..75eca26b40e 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -4599,15 +4599,15 @@ "Belegter Speicherplatz" "(für Nutzer %s deinstalliert)" "(für Nutzer %s deaktiviert)" - "AutoFill-Dienst" + "Dienst für automatisches Ausfüllen" "automatisch, ausfüllen, füllen, autofill" - "<b>Nur für vertrauenswürdige Apps</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> greift auf die Displayanzeige zu, um zu bestimmen, welche Felder automatisch ausgefüllt werden können. AutoFill sollte daher nur für vertrauenswürdige Apps zugelassen werden." - "AutoFill" + "<b>Nur für vertrauenswürdige Apps</b> <br/> <br/> <xliff:g id=app_name example=Automatisches Ausfüllen von Google>%1$s</xliff:g> greift auf die Displayanzeige zu, um zu bestimmen, welche Felder automatisch ausgefüllt werden können. Die Funktion sollte daher nur für vertrauenswürdige Apps zugelassen werden." + "Automatisches Ausfüllen" "Protokollierungsebene" "Maximale Zahl von Anfragen pro Sitzung" "Maximale Zahl sichtbarer Datensätze" "Auf Standardwerte zurücksetzen" - "Die AutoFill-Optionen für Entwickler wurden zurückgesetzt" + "Die Optionen für automatisches Ausfüllen für Entwickler wurden zurückgesetzt" "Gerätedesign" "Standard" "Netzwerkname" diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index 3a89c6b7fae..963c270e1b6 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -3058,7 +3058,7 @@ "Ordaintzeko beste aplikazio bat irekita badago izan ezik" "Kontakturik gabeko ordainketa-terminaletan, erabili hau ordainketak egiteko:" "Terminalean ordaintzea" - "Konfiguratu ordaintzeko aplikazioa. Ondoren, jarri telefonoaren atzeko aldea ukipen gabeko sistemaren ikurra duen terminalaren aurrean." + "Konfiguratu ordaintzeko aplikazioa. Ondoren, jarri telefonoaren atzeko aldea kontakturik gabeko sistemaren ikurra duen terminalaren aurrean." "Ados" "Gehiago…" "Ezarri ordainketak egiteko aplikazio lehenetsia" diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml index 4a70b0f9637..8e588154eb8 100644 --- a/res/values-km/strings.xml +++ b/res/values-km/strings.xml @@ -3654,7 +3654,7 @@ "អនុញ្ញាតមុខងារកុំរំខាន" "គ្មានកម្មវិធីបានដំឡើងណាមួយបានស្នើការចូលដំណើរការមុខងារកុំរំខានទេ" "កំពុង​ផ្ទុក​កម្មវិធី..." - "តាមសំណើ​របស់អ្នក ប្រព័ន្ធ​ប្រតិបត្តិការ Android កំពុង​ទប់ស្កាត់​ការជូនដំណឹង​របស់កម្មវិធី​នេះ​មិន​ឱ្យ​បង្ហាញ​នៅលើ​ឧបករណ៍​នេះទេ" + "តាមសំណើ​របស់អ្នក Android កំពុង​ទប់ស្កាត់​ការជូនដំណឹង​របស់កម្មវិធី​នេះ​មិន​ឱ្យ​បង្ហាញ​នៅលើ​ឧបករណ៍​នេះទេ" "តាមសំណើ​របស់អ្នក ប្រព័ន្ធ​ប្រតិបត្តិការ Android កំពុង​ទប់ស្កាត់​ប្រភេទនៃការជូនដំណឹង​​នេះ​មិន​ឱ្យ​បង្ហាញ​នៅលើ​ឧបករណ៍​នេះទេ" "តាមសំណើ​របស់អ្នក ប្រព័ន្ធ​ប្រតិបត្តិការ Android កំពុង​ទប់ស្កាត់​ក្រុមនៃ​ការជូនដំណឹង​នេះ​មិន​ឱ្យ​បង្ហាញ​នៅលើ​ឧបករណ៍​នេះទេ" "ប្រភេទ" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 410c714e45c..c31e62dd8b3 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -1385,7 +1385,7 @@ "Stav batérie, siete a ďalšie informácie" "Telefónne číslo, signál atď." "Úložisko" - "Úložisko a vyrovnávacia pamäť" + "Ukladací priestor a vyrovnávacia pamäť" "Úložisko" "Nastavenia úložiska" "Odpojiť ukladací priestor USB a zobraziť dostupný ukladací priestor" @@ -1936,7 +1936,7 @@ "Inštalovať" "Deaktivovať" "Povoliť" - "Vymazať priestor" + "Vymazať obsah úložiska" "Odinštalovať aktualizácie" "Pre niektoré akcie ste sa rozhodli spúšťať túto aplikáciu ako predvolenú." "Tejto aplikácii ste povolili vytváranie miniaplikácií a pristupovanie k ich údajom." diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml index 2805bcab7af..881415b69ed 100644 --- a/res/values-uz/strings.xml +++ b/res/values-uz/strings.xml @@ -3582,7 +3582,7 @@ "Tovush yoki tebranishsiz hamda suhbatlar ruknining pastida chiqadi" "Telefon sozlamalari asosida jiringlashi yoki tebranishi mumkin" "Telefon qulfi yechilsa, bildirishnomalar ekranning yuqori qismida banner sifatida chiqsin" - "Barcha “%1$s” bildirishnomalari" + "Barcha %1$s bildirishnomalari" "Barcha %1$s bildirishnomalari" "Moslashuvchan bildirishnomalar" @@ -3654,7 +3654,7 @@ "Bezovta qilinmasin ruxsatini berish" "Hech qanday ilova “Bezovta qilinmasin” funksiyasiga ruxsat so‘ramagan" "Ilovalar yuklanmoqda…" - "Talabingizga binoa, Android bu ilova bildirishnomalarini ekranga chiqarmaydi" + "Android ushbu ilova bildirishnomalarini ekranga chiqarmaydi" "Talabingizga binoan, Android bu turkumdagi bildirishnomalarni bloklamoqda" "Talabingizga binoan, Android bunday bildirishnomalar guruhini bloklaydi" "Turkumlar" From a58e5de4c901e4e44981225ab89d78438f24d1e6 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 14 Jul 2020 04:13:50 -0700 Subject: [PATCH 4/4] Import translations. DO NOT MERGE Auto-generated-cl: translation import Change-Id: I3d7b397ba8a39c5f6a7ac75e0fa505be39b48775 --- res/values-de/strings.xml | 8 ++++---- res/values-eu/strings.xml | 2 +- res/values-km/strings.xml | 2 +- res/values-sk/strings.xml | 4 ++-- res/values-uz/strings.xml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 2f7fcf58115..87427119b0c 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -4598,15 +4598,15 @@ "Belegter Speicherplatz" "(für Nutzer %s deinstalliert)" "(für Nutzer %s deaktiviert)" - "AutoFill-Dienst" + "Dienst für automatisches Ausfüllen" "automatisch, ausfüllen, füllen, autofill" - "<b>Nur für vertrauenswürdige Apps</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> greift auf die Displayanzeige zu, um zu bestimmen, welche Felder automatisch ausgefüllt werden können. AutoFill sollte daher nur für vertrauenswürdige Apps zugelassen werden." - "AutoFill" + "<b>Nur für vertrauenswürdige Apps</b> <br/> <br/> <xliff:g id=app_name example=Automatisches Ausfüllen von Google>%1$s</xliff:g> greift auf die Displayanzeige zu, um zu bestimmen, welche Felder automatisch ausgefüllt werden können. Die Funktion sollte daher nur für vertrauenswürdige Apps zugelassen werden." + "Automatisches Ausfüllen" "Protokollierungsebene" "Maximale Zahl von Anfragen pro Sitzung" "Maximale Zahl sichtbarer Datensätze" "Auf Standardwerte zurücksetzen" - "Die AutoFill-Optionen für Entwickler wurden zurückgesetzt" + "Die Optionen für automatisches Ausfüllen für Entwickler wurden zurückgesetzt" "Gerätedesign" "Standard" "Netzwerkname" diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index 0b5d6ebea95..6e139fa7544 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -3057,7 +3057,7 @@ "Ordaintzeko beste aplikazio bat irekita badago izan ezik" "Kontakturik gabeko ordainketa-terminaletan, erabili hau ordainketak egiteko:" "Terminalean ordaintzea" - "Konfiguratu ordaintzeko aplikazioa. Ondoren, jarri telefonoaren atzeko aldea ukipen gabeko sistemaren ikurra duen terminalaren aurrean." + "Konfiguratu ordaintzeko aplikazioa. Ondoren, jarri telefonoaren atzeko aldea kontakturik gabeko sistemaren ikurra duen terminalaren aurrean." "Ados" "Gehiago…" "Ezarri ordainketak egiteko aplikazio lehenetsia" diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml index d97afecfc23..0f1731b7d38 100644 --- a/res/values-km/strings.xml +++ b/res/values-km/strings.xml @@ -3653,7 +3653,7 @@ "អនុញ្ញាតមុខងារកុំរំខាន" "គ្មានកម្មវិធីបានដំឡើងណាមួយបានស្នើការចូលដំណើរការមុខងារកុំរំខានទេ" "កំពុង​ផ្ទុក​កម្មវិធី..." - "តាមសំណើ​របស់អ្នក ប្រព័ន្ធ​ប្រតិបត្តិការ Android កំពុង​ទប់ស្កាត់​ការជូនដំណឹង​របស់កម្មវិធី​នេះ​មិន​ឱ្យ​បង្ហាញ​នៅលើ​ឧបករណ៍​នេះទេ" + "តាមសំណើ​របស់អ្នក Android កំពុង​ទប់ស្កាត់​ការជូនដំណឹង​របស់កម្មវិធី​នេះ​មិន​ឱ្យ​បង្ហាញ​នៅលើ​ឧបករណ៍​នេះទេ" "តាមសំណើ​របស់អ្នក ប្រព័ន្ធ​ប្រតិបត្តិការ Android កំពុង​ទប់ស្កាត់​ប្រភេទនៃការជូនដំណឹង​​នេះ​មិន​ឱ្យ​បង្ហាញ​នៅលើ​ឧបករណ៍​នេះទេ" "តាមសំណើ​របស់អ្នក ប្រព័ន្ធ​ប្រតិបត្តិការ Android កំពុង​ទប់ស្កាត់​ក្រុមនៃ​ការជូនដំណឹង​នេះ​មិន​ឱ្យ​បង្ហាញ​នៅលើ​ឧបករណ៍​នេះទេ" "ប្រភេទ" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index bac3700f658..a20d1eada36 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -1384,7 +1384,7 @@ "Stav batérie, siete a ďalšie informácie" "Telefónne číslo, signál atď." "Úložisko" - "Úložisko a vyrovnávacia pamäť" + "Ukladací priestor a vyrovnávacia pamäť" "Úložisko" "Nastavenia úložiska" "Odpojiť ukladací priestor USB a zobraziť dostupný ukladací priestor" @@ -1935,7 +1935,7 @@ "Inštalovať" "Deaktivovať" "Povoliť" - "Vymazať priestor" + "Vymazať obsah úložiska" "Odinštalovať aktualizácie" "Pre niektoré akcie ste sa rozhodli spúšťať túto aplikáciu ako predvolenú." "Tejto aplikácii ste povolili vytváranie miniaplikácií a pristupovanie k ich údajom." diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml index 6e1f2adc0fe..9e12f387b90 100644 --- a/res/values-uz/strings.xml +++ b/res/values-uz/strings.xml @@ -3581,7 +3581,7 @@ "Tovush yoki tebranishsiz hamda suhbatlar ruknining pastida chiqadi" "Telefon sozlamalari asosida jiringlashi yoki tebranishi mumkin" "Telefon qulfi yechilsa, bildirishnomalar ekranning yuqori qismida banner sifatida chiqsin" - "Barcha “%1$s” bildirishnomalari" + "Barcha %1$s bildirishnomalari" "Barcha %1$s bildirishnomalari" "Moslashuvchan bildirishnomalar" @@ -3653,7 +3653,7 @@ "Bezovta qilinmasin ruxsatini berish" "Hech qanday ilova “Bezovta qilinmasin” funksiyasiga ruxsat so‘ramagan" "Ilovalar yuklanmoqda…" - "Talabingizga binoa, Android bu ilova bildirishnomalarini ekranga chiqarmaydi" + "Android ushbu ilova bildirishnomalarini ekranga chiqarmaydi" "Talabingizga binoan, Android bu turkumdagi bildirishnomalarni bloklamoqda" "Talabingizga binoan, Android bunday bildirishnomalar guruhini bloklaydi" "Turkumlar"