diff --git a/proguard.flags b/proguard.flags index 6cbab08e2c..8ee6ccd344 100644 --- a/proguard.flags +++ b/proguard.flags @@ -94,3 +94,7 @@ -keep interface com.android.launcher3.userevent.nano.LauncherLogProto.** { *; } + +-keep interface com.android.launcher3.model.nano.LauncherDumpProto.** { + *; +} diff --git a/protos/launcher_log.proto b/protos/launcher_log.proto index 909a42987e..93e09aea8c 100644 --- a/protos/launcher_log.proto +++ b/protos/launcher_log.proto @@ -156,4 +156,5 @@ message LauncherEvent { optional int64 elapsed_session_millis = 6; optional bool is_in_multi_window_mode = 7; + optional bool is_in_landscape_mode = 8; } diff --git a/res/layout/all_apps_discovery_item.xml b/res/layout/all_apps_discovery_item.xml index 1a7eaa72de..fb1755c6b5 100644 --- a/res/layout/all_apps_discovery_item.xml +++ b/res/layout/all_apps_discovery_item.xml @@ -25,7 +25,9 @@ android:layout_width="56dp" android:layout_height="56dp" android:padding="8dp" - android:scaleType="fitCenter"/> + android:scaleType="fitCenter" + android:focusable="false" + android:importantForAccessibility="no"/> + android:layout_gravity="center_vertical" + android:includeFontPadding="false"/> @@ -34,7 +34,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:background="@drawable/all_apps_divider" - android:layout_gravity="center" + android:layout_gravity="bottom" android:visibility="invisible"/> \ No newline at end of file diff --git a/res/layout/deep_shortcut.xml b/res/layout/deep_shortcut.xml index 7744906bcb..85caba4a0b 100644 --- a/res/layout/deep_shortcut.xml +++ b/res/layout/deep_shortcut.xml @@ -26,11 +26,12 @@ android:background="?android:attr/selectableItemBackground" android:gravity="start|center_vertical" android:textAlignment="viewStart" - android:paddingStart="@dimen/bg_popup_item_height" + android:paddingStart="@dimen/deep_shortcuts_text_padding_start" android:paddingEnd="@dimen/popup_padding_end" android:drawableEnd="@drawable/deep_shortcuts_drag_handle" android:drawablePadding="@dimen/deep_shortcut_drawable_padding" android:textSize="14sp" + android:textColor="?android:attr/textColorPrimary" android:fontFamily="sans-serif" launcher:layoutHorizontal="true" launcher:iconDisplay="shortcut_popup" diff --git a/res/layout/notification.xml b/res/layout/notification.xml index 4250e1e545..f955c6b803 100644 --- a/res/layout/notification.xml +++ b/res/layout/notification.xml @@ -35,7 +35,7 @@ android:layout_height="@dimen/notification_header_height" android:paddingStart="@dimen/notification_padding_start" android:paddingEnd="@dimen/notification_padding_end" - android:background="@color/notification_header_background_color" + android:background="@color/popup_header_background_color" android:elevation="@dimen/notification_elevation"> + android:background="@color/popup_background_color"> + launcher:layoutHorizontal="true" + android:focusable="false" /> + android:background="@color/popup_header_background_color" /> diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index cfc27877c7..29e27eaa64 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -76,12 +76,14 @@ "Laat toe dat tuisskerm gedraai word" "Wanneer foon gedraai word" "Huidige vertooninstelling laat nie rotasie toe nie" + "Ikoon-kentekentoekenning" + "Aan vir alle programme" + "Af vir alle programme" "Voeg ikoon by tuisskerm" "Vir nuwe programme" - - + "Gebruik stelselverstek" "Onbekend" @@ -118,4 +120,7 @@ "Legstukgrootte is verander na breedte %1$s hoogte %2$s" "Kortpaaie" "%1$d kortpaaie vir %2$s" + "%1$d kortpaaie en %2$d kennisgewings vir %3$s" + "Maak toe" + "Kennisgewing is toegemaak" diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index 3ae9666258..59c44e211e 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -76,12 +76,14 @@ "የመነሻ ማያ ገጽ ማሽከርከርን ይፍቀዱ" "ስልኩ ሲዞር" "የአሁኑ የማሳያ ቅንብር ማሽከርከርን አይፈቅድም" + "የአዶ ባጅ" + "ለሁሉም መተግበሪያዎች በርቷል" + "ለሁሉም መተግበሪያዎች ጠፍጧል" "አዶ ወደ የመነሻ ማያ ገጽ አክል" "ለአዲስ መተግበሪያዎች" - - + "የሥርዓቱን ነባሪ ተጠቀም" "የማይታወቅ" @@ -118,4 +120,7 @@ "የመግብር መጠን ወደ ስፋት %1$s ቁመት %2$s ተለውጧል" "አቋራጮች" "%1$d የ%2$s አቋራጮች" + "%1$d አቋራጮች እና %2$d ማሳወቂያዎች ለ%3$s" + "አሰናብት" + "ማሳወቂያ ተሰናብቷል" diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 9c2167abea..d8b1cc93b4 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -76,12 +76,14 @@ "السماح بتدوير الشاشة الرئيسية" "عند تدوير الهاتف" "لا يسمح إعداد العرض الحالي بالتدوير" + "وضع شارات على رموز التطبيقات" + "تشغيل لجميع التطبيقات" + "إيقاف لجميع التطبيقات" "إضافة رمز إلى الشاشة الرئيسية" "للتطبيقات الجديدة" - - + "استخدام الإعداد الافتراضي للنظام" "غير معروفة" @@ -118,4 +120,7 @@ "تم تغيير حجم الأداة إلى العرض %1$s والارتفاع %2$s" "الاختصارات" "%1$d اختصار لتطبيق %2$s" + "هناك %1$d اختصار و%2$d إشعار عن %3$s" + "تجاهل" + "تم تجاهل الإشعار" diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml index 5cbe408522..e5d0a6c340 100644 --- a/res/values-az/strings.xml +++ b/res/values-az/strings.xml @@ -76,12 +76,14 @@ "Əsas ekranın firlanmağına icazə verin" "Telefon çevrilən zaman" "Cari Ekran ayarı fırlatmağa icazə vermir" + "İkona nişanı" + "Bütün tətbiqlər üçün aktivdir" + "Bütün tətbiqlər üçün deaktivdir" "Əsas ekrana ikona əlavə edin" "Yeni tətbiqlər üçün" - - + "Sistem defoltu istifadə edin" "Naməlum" @@ -118,4 +120,7 @@ "Vidcetin eni %1$s hündürlüyü %2$s kimi ölçüləndirildi" "Qısa yollar" "%1$d üçün %2$s qısa yolu" + "%3$s üçün %1$d qısayol və %2$d bildiriş" + "Rədd edin" + "Bildiriş rədd edildi" diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml index 1a9ad2a075..401fef38ac 100644 --- a/res/values-b+sr+Latn/strings.xml +++ b/res/values-b+sr+Latn/strings.xml @@ -76,12 +76,14 @@ "Dozvoli rotaciju početnog ekrana" "Kada se telefon rotira" "Aktuelno podešavanje prikaza ne dozvoljava rotaciju" + "Dodavanje znački na ikone" + "Uključeno za sve aplikacije" + "Isključeno za sve aplikacije" "Dodaj ikonu na početni ekran" "Za nove aplikacije" - - + "Koristi podrazumevano sistemsko podešavanje" "Nepoznato" @@ -118,4 +120,7 @@ "Veličina vidžeta je promenjena na širinu %1$s i visinu %2$s" "Prečice" "%1$d prečice(a) za %2$s" + "Prečice (%1$d) i obaveštenja (%2$d) za %3$s" + "Odbaci" + "Obaveštenje je odbačeno" diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 8dc1e10927..c19a8b47d8 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -76,12 +76,14 @@ "Разрешаване на завъртането на началния екран" "При завъртане на телефона" "Текущата настройка на екрана не разрешава завъртане" + "Означаване със значка на иконите" + "Включено за всички приложения" + "Изключено за всички приложения" "Добавяне на икона към началния екран" "За нови приложения" - - + "Използване на стандартната системна настройка" "Няма информация" @@ -118,4 +120,7 @@ "Приспособлението е преоразмерено към ширина %1$s и височина %2$s" "Преки пътища" "%1$d преки пътища за %2$s" + "%1$d преки пътища и %2$d известия за %3$s" + "Отхвърляне" + "Известието е отхвърлено" diff --git a/res/values-bn-rBD/config.xml b/res/values-bn-rBD/config.xml deleted file mode 100644 index 56f98c3563..0000000000 --- a/res/values-bn-rBD/config.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - "M50,0L100,0 100,100 0,100 0,0z" - "M50,0L80,0 A20,20,0,0 1 100,20 L100,80 A20,20,0,0 1 80,100 L20,100 A20,20,0,0 1 0,80 L 0,20 A20,20,0,0 1 20,0z" - "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" - "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" - "M50,0A50,30 0,0,1 100,30V70A50,30 0,0,1 0,70V30A50,30 0,0,1 50,0z" - - - diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml index 065019a29f..70e2c9be79 100644 --- a/res/values-bn/strings.xml +++ b/res/values-bn/strings.xml @@ -76,10 +76,13 @@ "হোমস্ক্রীন ঘোরানোর অনুমতি দিন" "যখন ফোনটি ঘোরানো হয়" "বর্তমান প্রদর্শনের সেটিংস ঘোরানোর মঞ্জুরি দেয় না" + "আইকনে ব্যাজ দেওয়া" + "সমস্ত অ্যাপের জন্য চালু আছে" + "সমস্ত অ্যাপের জন্য বন্ধ আছে" "হোম স্ক্রিনে আইকন যোগ করুন" "নতুন অ্যাপ্লিকেশানগুলির জন্যে" "আইকনের আকৃতি পরিবর্তন করুন" - "পরিবর্তন করবেন না" + "সিস্টেমের ডিফল্ট মান ব্যবহার করুন" "আইকনের আকৃতি পরিবর্তন করা হচ্ছে" "অজানা" "সরান" @@ -115,4 +118,7 @@ "উইজেটের আকার প্রস্থ %1$s উচ্চতা %2$s তে পরিবর্তন করা হয়েছে" "শর্টকাট" "%2$s এর %1$dটি শর্টকার্ট" + "%3$s এর জন্য %1$dটি শর্টকাট এবং %2$dটি বিজ্ঞপ্তি" + "খারিজ করুন" + "বিজ্ঞপ্তি খারিজ করা হয়েছে" diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml index 8e1234edc8..37850dbd6f 100644 --- a/res/values-bs/strings.xml +++ b/res/values-bs/strings.xml @@ -43,7 +43,7 @@ "Na ovom početnom ekranu nema više prostora." "Nema više prostora u ladici Favoriti" "Spisak aplikacija" - "Tipka za početak" + "Početna" "Ukloni" "Deinstaliraj" "Informacije o aplikaciji" @@ -57,31 +57,33 @@ "Problem pri učitavanju dodatka" "Postavljanje" "Ovo je sistemska aplikacija i ne može se deinstalirati." - "Neimenovana fascikla" + "Neimenovani folder" "Aplikacija %1$s je onemogućena" "Strana %1$d od %2$d" "Početni ekran %1$d od %2$d" "Nova stranica početnog ekrana" - "Fascikla je otvorena, (š) %1$d (v) %2$d" + "Folder je otvoren, (š) %1$d (v) %2$d" "Dodirnite da zatvorite folder" "Dodirnite da sačuvate promjenu imena" - "Fascikla je zatvorena" - "Ime fascikle je promijenjeno u %1$s" - "Fascikla: %1$s" + "Folder je zatvoren" + "Ime foldera je promijenjeno u %1$s" + "Folder: %1$s" "Dodaci" - "Pozadine" + "Pozadinske slike" "Postavke" "Onemogućio vaš administrator" "Pregled" "Dozvoli rotiranje početnog ekrana" "Kada se telefon zarotira" "Trenutne postavke ekrana ne dozvoljavaju rotiranje" + "Označavanje ikona" + "Uključeno za sve aplikacije" + "Isključeno za sve aplikacije" "Dodajte ikonu na početni ekran" "Za nove aplikacije" - - + "Koristite sistemski zadano" "Nepoznato" @@ -118,4 +120,7 @@ "Veličina vidžeta je promijenjena na širinu %1$s visinu %2$s" "Prečice" "%1$d prečica za aplikaciju %2$s" + "Za aplikaciju %3$s broj prečica je %1$d, a broj obavještenja je %2$d" + "Odbaci" + "Obavještenje je odbačeno" diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index bfbd31ebdd..9913d6d831 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -76,12 +76,14 @@ "Permet la rotació de la pantalla d\'inici" "En girar el telèfon" "La configuració actual de la pantalla no permet la rotació" + "Icones encerclades" + "Activades per a totes les aplicacions" + "Desactivades per a totes les aplicacions" "Afegeix la icona a la pantalla d\'inici" "Per a les aplicacions noves" - - + "Utilitza l\'opció predeterminada del sistema" "Desconegut" @@ -118,4 +120,7 @@ "S\'ha canviat la mida del widget a l\'amplada %1$s i l\'alçada %2$s" "Dreceres" "%1$d dreceres per a l\'aplicació %2$s" + "%1$d dreceres i %2$d notificacions per a %3$s" + "Ignora" + "S\'ha ignorat la notificació" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 7c61023060..03c109d468 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -76,12 +76,14 @@ "Povolit otáčení plochy" "Při otočení telefonu" "Aktuální nastavení displeje neumožňuje otáčení" + "Odznaky na ikonách" + "Zapnuto pro všechny aplikace" + "Vypnuto pro všechny aplikace" "Přidat ikonu na plochu" "Pro nové aplikace" - - + "Použít výchozí nastavení systému" "Neznámé" @@ -118,4 +120,7 @@ "Velikost widgetu upravena: šířka %1$s, výška %2$s" "Zkratky" "Počet zkratek pro aplikaci %2$s: %1$d" + "Zkratky (%1$d) a oznámení (%2$d) aplikace %3$s" + "Zavřít" + "Oznámení bylo zavřeno" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 65e513451a..c16b8c1668 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -76,12 +76,14 @@ "Tillad rotation af startskærmen" "Når telefonen roteres" "Den aktuelle indstilling for visning tillader ikke rotation" + "Ikonbadges" + "Slået til for alle apps" + "Slået fra for alle apps" "Føj ikon til startskærmen" "For nye apps" - - + "Brug systemstandarden" "Ukendt" @@ -118,4 +120,7 @@ "Størrelsen for widgetten er ændret til bredde %1$s og højde %2$s" "Genveje" "%1$d genveje til %2$s" + "%1$d genveje og %2$d underretninger for %3$s" + "Afvis" + "Underretningen blev afvist" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 59ce70c9c6..c627b74a1b 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -76,12 +76,14 @@ "Drehung des Startbildschirms zulassen" "Bei Drehung des Smartphones" "Die aktuelle \"Display\"-Einstellung verhindert eine Drehung der Anzeige" + "Logosymbole" + "Für alle Apps aktiviert" + "Für alle Apps deaktiviert" "Symbol zu Startbildschirm hinzufügen" "Für neue Apps" - - + "Systemstandardeinstellung verwenden" "Unbekannt" @@ -118,4 +120,7 @@ "Größe des Widgets zu Breite %1$s und Höhe %2$s geändert" "Verknüpfungen" "%1$d Verknüpfungen für %2$s" + "%1$d Verknüpfungen und %2$d Benachrichtigungen für %3$s" + "Schließen" + "Benachrichtigung geschlossen" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index d8da34b403..9f5c01ff03 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -76,12 +76,14 @@ "Να επιτρέπεται η περιστροφή της αρχικής οθόνης" "Όταν το τηλέφωνο περιστρέφεται" "Η τρέχουσα ρύθμιση οθόνης δεν επιτρέπει την περιστροφή" + "Σήματα εικονιδίων" + "Ενεργοποιημένα για όλες τις εφαρμογές" + "Απενεργοποιημένα για όλες τις εφαρμογές" "Προσθήκη εικονιδίου στην Αρχική οθόνη" "Για νέες εφαρμογές" - - + "Χρήση προεπιλογής συστήματος" "Άγνωστο" @@ -118,4 +120,7 @@ "Έγινε προσαρμογή του μεγέθους του γραφικού στοιχείου σε %1$s πλάτος και %2$s ύψος" "Συντομεύσεις" "%1$d συντομεύσεις για %2$s" + "%1$d συντομεύσεις και %2$d ειδοποιήσεις για την εφαρμογή %3$s" + "Παράβλεψη" + "Η ειδοποίηση παραβλέφθηκε" diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index ecfb0f5478..1a1c1c9744 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -76,12 +76,14 @@ "Allow Homescreen rotation" "When phone is rotated" "Current display setting doesn\'t permit rotation" + "Icon badging" + "On for all apps" + "Off for all apps" "Add icon to Home screen" "For new apps" - - + "Use system default" "Unknown" @@ -118,4 +120,7 @@ "Widget re-sized to width %1$s height %2$s" "Short cuts" "%1$d shortcuts for %2$s" + "%1$d shortcuts and %2$d notifications for %3$s" + "Dismiss" + "Notification dismissed" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index ecfb0f5478..1a1c1c9744 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -76,12 +76,14 @@ "Allow Homescreen rotation" "When phone is rotated" "Current display setting doesn\'t permit rotation" + "Icon badging" + "On for all apps" + "Off for all apps" "Add icon to Home screen" "For new apps" - - + "Use system default" "Unknown" @@ -118,4 +120,7 @@ "Widget re-sized to width %1$s height %2$s" "Short cuts" "%1$d shortcuts for %2$s" + "%1$d shortcuts and %2$d notifications for %3$s" + "Dismiss" + "Notification dismissed" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index ecfb0f5478..1a1c1c9744 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -76,12 +76,14 @@ "Allow Homescreen rotation" "When phone is rotated" "Current display setting doesn\'t permit rotation" + "Icon badging" + "On for all apps" + "Off for all apps" "Add icon to Home screen" "For new apps" - - + "Use system default" "Unknown" @@ -118,4 +120,7 @@ "Widget re-sized to width %1$s height %2$s" "Short cuts" "%1$d shortcuts for %2$s" + "%1$d shortcuts and %2$d notifications for %3$s" + "Dismiss" + "Notification dismissed" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 4a57396168..28d8be3351 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -76,12 +76,14 @@ "Permitir la rotación de la pantalla principal" "Al girar el teléfono" "La configuración actual no permite la rotación de la pantalla" + "Insignias de íconos" + "Activada para todas las apps" + "Desactivada para todas las apps" "Agregar ícono a la pantalla principal" "Para nuevas apps" - - + "Usar el sistema predeterminado" "Desconocido" @@ -118,4 +120,7 @@ "Se cambió la dimensión del widget a %1$s de ancho y %2$s de alto." "Accesos directos" "%1$d accesos directos para %2$s" + "%1$d accesos directos y %2$d notificaciones de %3$s" + "Descartar" + "Se descartó la notificación" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 3db1aa8ffd..badb33ec77 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -76,12 +76,14 @@ "Permitir rotación de la pantalla de inicio" "Al girar el teléfono" "La configuración de pantalla actual no permite girar la pantalla" + "Insignias de los iconos" + "Activadas para todas las aplicaciones" + "Desactivadas para todas las aplicaciones" "Añadir icono a la pantalla de inicio" "Para nuevas aplicaciones" - - + "Usar opción predeterminada del sistema" "Desconocido" @@ -118,4 +120,7 @@ "Se ha modificado el tamaño del widget a %1$s de ancho y %2$s de alto" "Accesos directos" "%1$d accesos directos de %2$s" + "%1$d accesos directos y %2$d notificaciones de %3$s" + "Ignorar" + "Notificación ignorada" diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index 1a4d809432..aa9c7969a5 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -76,12 +76,14 @@ "Baimendu hasierako pantaila biratzea" "Telefonoa biratzen denean" "Uneko pantaila-ezarpenak ez du onartzen ikuspegia biratzea" + "Ikonoen bereizgarriak" + "Aktibatuta aplikazio guztietan" + "Desaktibatuta aplikazio guztietan" "Gehitu ikonoa hasierako pantailan" "Aplikazio berrietan" - - + "Erabili sistemaren balio lehenetsiak" "Ezezaguna" @@ -118,4 +120,7 @@ "Aldatu da widgetaren tamaina. Zabalera: %1$s. Altuera: %2$s." "Lasterbideak" "%2$s aplikazioaren %1$d lasterbide" + "%3$s aplikazioaren %1$d lasterbide eta %2$d jakinarazpen" + "Baztertu" + "Baztertu egin da jakinarazpena" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 3a9a85af7d..e66ea80536 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -76,12 +76,14 @@ "امکان دادن به چرخش صفحه اصلی" "وقتی تلفن چرخانده می‌شود" "تنظیم نمایشگر کنونی اجازه چرخش نمی‌دهد" + "برچسب‌گذاری نماد" + "برای همه برنامه‌ها روشن‌ است" + "برای همه برنامه‌ها خاموش است" "افزودن نماد به صفحه اصلی" "برای برنامه‌های جدید" - - + "استفاده از پیش‌فرض سیستم" "نامشخص" @@ -118,4 +120,7 @@ "اندازه ابزارک به عرض %1$s ارتفاع %2$s تغییر کرد" "میان‌برها" "%1$d میانبر برای %2$s" + "%1$d میان‌بر و %2$d اعلان برای %3$s" + "رد کردن" + "اعلان رد شد" diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 6e4bc934ec..a7db2328c8 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -76,12 +76,14 @@ "Salli aloitusnäytön kiertäminen" "Kun puhelinta kierretään" "Nykyiset näyttöasetukset eivät salli näytön kiertämistä." + "Kuvakemerkit" + "Käytössä kaikissa sovelluksissa" + "Pois käytöstä kaikissa sovelluksissa" "Lisää kuvake aloitusruutuun" "Uusille sovelluksille" - - + "Käytä järjestelmän oletusarvoa" "Tuntematon" @@ -118,4 +120,7 @@ "Widgetin kokoa muutettiin. Sen leveys on nyt %1$s ja korkeus %2$s." "Pikakuvakkeet" "Sovelluksella %2$s on %1$d pikakuvaketta." + "%3$s: %1$d pikakuvaketta ja %2$d ilmoitusta" + "Hylkää" + "Ilmoitus hylätty" diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index a9f294726e..03757e01be 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -76,12 +76,14 @@ "Autoriser la rotation de l\'écran d\'accueil" "Lorsque vous faites pivoter le téléphone" "Le mode d\'affichage actuel ne permet pas le pivotement" + "Insignes d\'icône" + "Activé pour toutes les applications" + "Désactivé pour toutes les applications" "Ajouter l\'icône à l\'écran d\'accueil" "Pour les nouvelles applications" - - + "Utiliser les valeurs système par défaut" "Inconnu" @@ -118,4 +120,7 @@ "Le widget a été redimensionné (largeur : %1$s, hauteur : %2$s)" "Raccourcis" "%1$d raccourcis pour %2$s" + "%1$d raccourcis et %2$d notifications pour %3$s" + "Ignorer" + "Notification ignorée" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 2d7a38c039..75a693cf9a 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -76,12 +76,14 @@ "Autoriser la rotation de l\'écran d\'accueil" "Lorsque vous faites pivoter le téléphone" "Le paramètre d\'affichage actuel n\'autorise pas la rotation." + "Identification des icônes" + "Activée pour toutes les applications" + "Désactivée pour toutes les applications" "Ajouter l\'icône à l\'écran d\'accueil" "Pour les nouvelles applications" - - + "Utiliser la valeur système par défaut" "Inconnu" @@ -118,4 +120,7 @@ "Le widget a bien été redimensionné (largeur : %1$s, hauteur : %2$s)." "Raccourcis" "%1$d raccourcis pour %2$s" + "%1$d raccourcis et %2$d notifications pour %3$s" + "Ignorer" + "Notification ignorée" diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index e8213b51d2..4bff56f14d 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -76,12 +76,14 @@ "Permitir xirar a pantalla de inicio" "Ao xirar o teléfono" "A configuración de visualización actual non permite xirar a pantalla" + "Insignias de iconas" + "Activado para todas as aplicacións" + "Desactivado para todas as aplicacións" "Engadir icona á pantalla de inicio" "Para novas aplicacións" - - + "Usar valores predeterminados do sistema" "Descoñecido" @@ -118,4 +120,7 @@ "Cambiouse o tamaño do widget polo ancho %1$s e a altura %2$s" "Atallos" "%1$d atallos para %2$s" + "%1$d atallos e %2$d notificacións para a aplicación %3$s" + "Ignorar" + "Ignorouse a notificación" diff --git a/res/values-gu-rIN/config.xml b/res/values-gu-rIN/config.xml deleted file mode 100644 index 56f98c3563..0000000000 --- a/res/values-gu-rIN/config.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - "M50,0L100,0 100,100 0,100 0,0z" - "M50,0L80,0 A20,20,0,0 1 100,20 L100,80 A20,20,0,0 1 80,100 L20,100 A20,20,0,0 1 0,80 L 0,20 A20,20,0,0 1 20,0z" - "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" - "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" - "M50,0A50,30 0,0,1 100,30V70A50,30 0,0,1 0,70V30A50,30 0,0,1 50,0z" - - - diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml index aa4992db7a..b243da75d3 100644 --- a/res/values-gu/strings.xml +++ b/res/values-gu/strings.xml @@ -76,10 +76,13 @@ "હોમ સ્ક્રીનને ફેરવવાની મંજૂરી આપો" "જ્યારે ફોન ફેરવવામાં આવે ત્યારે" "વર્તમાન પ્રદર્શન સેટિંગ ફેરવવાની પરવાનગી આપતી નથી" + "આઇકનને બૅજ કરવું" + "બધી ઍપ્લિકેશનો માટે ચાલુ છે" + "બધી ઍપ્લિકેશનો માટે બંધ છે" "હોમ સ્ક્રીન પર આઇકન ઉમેરો" "નવી ઍપ્લિકેશનો માટે" "આઇકનનો આકાર બદલો" - "બદલશો નહીં" + "સિસ્ટમ ડિફૉલ્ટનો ઉપયોગ કરો" "આઇકનના આકારમાં કરેલ ફેરફારો લાગુ કરી રહ્યા છીએ" "અજાણ્યો" "દૂર કરો" @@ -115,4 +118,7 @@ "વિજેટનો આકાર બદલીને %1$s પહોળાઈ %2$s ઊંચાઈ કર્યો" "શૉર્ટકટ્સ" "%2$s માટે %1$d શૉર્ટકટ" + "%3$s માટે %1$d શૉર્ટકટ અને %2$d સૂચનાઓ" + "છોડી દો" + "સૂચના છોડી દીધી" diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index ba03a92675..9a14ae0fbf 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -76,12 +76,14 @@ "होमस्क्रीन घुमाने की अनुमति दें" "फ़ोन घुुमाए जाने पर" "वर्तमान प्रदर्शन सेटिंग घुमाने की अनुमति नहीं देती" + "आइकन बैजिंग" + "सभी ऐप्लिकेशन के लिए चालू है" + "सभी ऐप्लिकेशन के लिए बंद है" "होम स्क्रीन में आइकन जोड़ें" "नए ऐप्लिकेशन के लिए" - - + "सिस्टम डिफ़ॉल्ट का उपयोग करें" "अज्ञात" @@ -118,4 +120,7 @@ "विजेट का आकार बदलकर उसकी चौड़ाई %1$s और ऊंचाई %2$s कर दी गई" "शॉर्टकट" "%2$s के लिए %1$d शॉर्टकट" + "%3$s के लिए %1$d शॉर्टकट और %2$d नोटिफ़िकेशन हैं" + "खारिज करें" + "नोटिफ़िकेशन को खारिज किया गया" diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index b6448f1e74..4b6a0bd6eb 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -76,12 +76,14 @@ "Dopusti zakretanje početnog zaslona" "Kada se telefon zakrene" "Trenutačna postavka zaslona ne dopušta zakretanje" + "Dodavanje oznake na ikonu" + "Uključeno za sve aplikacije" + "Isključeno za sve aplikacije" "Dodaj ikonu na početni zaslon" "Za nove aplikacije" - - + "Upotrijebi zadane postavke sustava" "Nepoznato" @@ -118,4 +120,7 @@ "Širina widgeta promijenjena je na %1$s, a visina na %2$s" "Prečaci" "Prečaca za aplikaciju %2$s: %1$d" + "Za aplikaciju %3$s ima prečaca (ukupno %1$d) i obavijesti (ukupno %2$d)" + "Odbaci" + "Obavijest je odbačena" diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 45a50544cc..c5ac9074c2 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -76,12 +76,14 @@ "A kezdőképernyő elforgatásának engedélyezése" "A telefon elforgatásakor" "A jelenlegi kijelzőbeállítások nem teszik lehetővé az elforgatást" + "Ikonjelvények" + "Bekapcsolva az összes alkalmazásnál" + "Kikapcsolva az összes alkalmazásnál" "Ikon hozzáadása a kezdőképernyőhöz" "Új alkalmazásoknál" - - + "Alapértelmezett érték használata" "Ismeretlen" @@ -118,4 +120,7 @@ "Modul átméretezve %1$s szélességre és %2$s magasságra" "Gyorsparancsok" "%1$d gyorsparancs a(z) %2$s számára" + "%1$d parancsikon és %2$d értesítés a következő alkalmazásnál: %3$s" + "Elvetés" + "Értesítés elvetve" diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml index 7c39a3f182..46e5682dcb 100644 --- a/res/values-hy/strings.xml +++ b/res/values-hy/strings.xml @@ -76,12 +76,14 @@ "Թույլ տալ հիմնական էկրանի պտտումը" "Հեռախոսը պտտելու դեպքում" "Ցուցադրման ընթացիկ կարգավորումներն արգելում են պտտումը" + "Պատկերակի նշանակ" + "Միացված է բոլոր հավելվածների համար" + "Անջատված է բոլոր հավելվածների համար" "Ավելացնել պատկերակը Հիմնական էկրանին" "Նոր հավելվածների համար" - - + "Օգտագործել համակարգի կանխադրված կարգավորումը" "Անհայտ է" @@ -118,4 +120,7 @@ "Վիջեթի լայնությունը փոխվել է %1$s-ի, իսկ բարձրությունը՝ %2$s-ի" "Դյուրանցումներ" "%1$d դյուրանցումներ %2$s հավելվածի համար" + "%1$d դյուրացում և %2$d ծանուցում %3$s-ի համար" + "Անտեսել" + "Ծանուցումը մերժված է" diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 4d26ab36b9..fa7b8780d2 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -45,7 +45,7 @@ "Daftar aplikasi" "Layar Utama" "Hapus" - "Copot pemasangan" + "Uninstal" "Info aplikasi" "memasang pintasan" "Mengizinkan aplikasi menambahkan pintasan tanpa campur tangan pengguna." @@ -76,12 +76,14 @@ "Izinkan layar Utama diputar" "Saat ponsel diputar" "Setelan Tampilan Saat Ini tidak memungkinkan putaran" + "Badge ikon" + "Aktif untuk semua aplikasi" + "Nonaktif untuk semua aplikasi" "Tambahkan ikon ke layar Utama" "Untuk aplikasi baru" - - + "Gunakan default sistem" "Tidak dikenal" @@ -118,4 +120,7 @@ "Widget diubah ukurannya menjadi lebar %1$s tinggi %2$s" "Pintasan" "%1$d pintasan untuk %2$s" + "%1$d pintasan dan %2$d notifikasi untuk %3$s" + "Tutup" + "Notifikasi ditutup" diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml index 3694a10e43..1d7a511a23 100644 --- a/res/values-is/strings.xml +++ b/res/values-is/strings.xml @@ -76,12 +76,14 @@ "Leyfa snúning fyrir heimaskjá" "Þegar símanum er snúið" "Núverandi skjástilling leyfir ekki snúning" + "Merking á skjöldum" + "Virkt fyrir öll forrit" + "Slökkt fyrir öll forrit" "Bæta tákni á heimaskjáinn" "Fyrir ný forrit" - - + "Nota sjálfgildi kerfis" "Óþekkt" @@ -118,4 +120,7 @@ "Stærð græju breytt í %1$s á breidd og %2$s á hæð" "Flýtileiðir" "%1$d flýtileiðir fyrir %2$s" + "%1$d flýtileiðir og %2$d tilkynningar fyrir %3$s" + "Hunsa" + "Tilkynningu lokað" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 12088740d4..a63d495cca 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -76,12 +76,14 @@ "Consenti rotazione della schermata Home" "Con il telefono ruotato" "L\'impostazione corrente del display non consente la rotazione" + "Badge per le icone" + "Impostazione attiva per tutte le app" + "Impostazione non attiva per tutte le app" "Aggiungi icone alla schermata Home" "Per le nuove app" - - + "Usa impostazione predefinita di sistema" "Sconosciuto" @@ -118,4 +120,7 @@ "Widget ridimensionato a larghezza %1$s, altezza %2$s" "Scorciatoie" "%1$d scorciatoie per %2$s" + "%1$d scorciatoie e %2$d notifiche relative a %3$s" + "Ignora" + "Notifica ignorata" diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 858abfd4f3..7f960f24b0 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -76,12 +76,14 @@ "אפשרות סיבוב של מסך דף הבית" "כאשר הטלפון מסובב" "הגדרת התצוגה הנוכחית אינה מאפשרת סיבוב" + "הצגת תגים על גבי סמלים" + "מופעלת לכל האפליקציות" + "כבויה לכל האפליקציות" "הוספת סמל במסך דף הבית" "לאפליקציות חדשות" - - + "השתמש בברירת המחדל של המערכת" "לא ידוע" @@ -118,4 +120,7 @@ "גודל הווידג\'ט שונה - רוחב %1$s גובה %2$s" "קיצורי דרך" "%1$d קיצורי דרך עבור %2$s" + "%1$d קיצורי דרך ו-%2$d הודעות של %3$s" + "סגור" + "ההודעה נסגרה" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 846b884a6c..0d491acad0 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -76,12 +76,14 @@ "ホーム画面の回転を許可" "スマートフォンが回転したとき" "現在の [ディスプレイ] 設定では回転を使用できません" + "アイコンバッジ" + "すべてのアプリで ON" + "すべてのアプリで OFF" "ホーム画面にアイコンを追加" "新しいアプリをダウンロードしたときに" - - + "システムのデフォルトを使用" "不明" @@ -118,4 +120,7 @@ "ウィジェットのサイズを幅%1$s、高さ%2$sに変更しました" "ショートカット" "%2$s用の %1$d 件のショートカット" + "%3$s: %1$d 件のショートカットと %2$d 件の通知" + "表示しない" + "通知を非表示にしました" diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml index 197944936a..7ab510e005 100644 --- a/res/values-ka/strings.xml +++ b/res/values-ka/strings.xml @@ -76,12 +76,14 @@ "მთავარი ეკრანის შეტრიალების დაშვება" "ტელეფონის შეტრიალებისას" "ბრუნვა დაუშვებელია ჩვენების მიმდინარე პარამეტრებით" + "ხატულას ბეჯები" + "ჩართულია ყველა აპისთვის" + "გამორთულია ყველა აპისთვის" "ხატულას მთავარ ეკრანზე დამატება" "ახალი აპებისთვის" - - + "ნაგულისხმევი სისტემური პარამეტრების გამოყენება" "უცნობი" @@ -118,4 +120,7 @@ "ვიჯეტის ზომები შეიცვალა: სიგანე %1$s სიმაღლე %2$s" "მალსახმობები" "%2$s-ს აქვს %1$d მალსახმობი" + "%3$s-ის %1$d მალსახმობი და %2$d შეტყობინება" + "დახურვა" + "შეტყობინება დაიხურა" diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml index 5df503a103..c49ef3b5d1 100644 --- a/res/values-kk/strings.xml +++ b/res/values-kk/strings.xml @@ -76,12 +76,14 @@ "Негізгі экранның бұрылуына рұқсат ету" "Телефон бұрылғанда" "Экранның ағымдағы параметрі айналуға рұқсат бермейді" + "Белгілеу" + "Барлық қолданбалар үшін қосулы" + "Барлық қолданбалар үшін өшірулі" "Негізгі экранға белгіше енгізу" "Жаңа қолданбаларға арналған" - - + "Жүйенің әдепкі параметрін пайдалану" "Белгісіз" @@ -118,4 +120,7 @@ "Виджет өлшемінің ені %1$s, биіктігі %2$s болып өзгертілді" "Таңбашалар" "%2$s қолданбасына арналған %1$d таңбаша" + "%3$s қолданбасының %1$d таңбашасы мен %2$d хабарландыруы" + "Бас тарту" + "Хабарландырудан бас тартылды" diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml index a64b604cb1..82bf4bbbb8 100644 --- a/res/values-km/strings.xml +++ b/res/values-km/strings.xml @@ -76,12 +76,14 @@ "អនុញ្ញាតការបងិ្វលអេក្រង់ដើម" "នៅពេលដែលបង្វិលទូរស័ព្ទរបស់អ្នក" "ការកំណត់អេក្រង់បច្ចុប្បន្នមិនអនុញ្ញាតការបង្វិលទេ" + "ការដាក់ស្លាក​សញ្ញារូបតំណាង" + "បើក​សម្រាប់​កម្មវិធីទាំងអស់" + "បិទសម្រាប់កម្មវិធីទាំងអស់" "បញ្ចូល​រូបតំណាង​ទៅ​អេក្រង់​ដើម" "សម្រាប់កម្មវិធីថ្មី" - - + "ប្រើលំនាំដើមរបស់ប្រព័ន្ធ" "មិន​ស្គាល់" @@ -118,4 +120,7 @@ "ធាតុក្រាហ្វិកដែលបានប្តូរទំហំទៅទទឹងប្រវែង %1$s កម្ពស់ប្រវែង %2$s" "ផ្លូវកាត់" "%1$d ផ្លូវកាត់សម្រាប់ %2$s" + "ផ្លូវកាត់ចំនួន %1$d និង​ការជូនដំណឹងចំនួន %2$d សម្រាប់ %3$s" + "បដិសេធ" + "បាន​បដិសេធ​ការជូនដំណឹង" diff --git a/res/values-kn-rIN/config.xml b/res/values-kn-rIN/config.xml deleted file mode 100644 index 56f98c3563..0000000000 --- a/res/values-kn-rIN/config.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - "M50,0L100,0 100,100 0,100 0,0z" - "M50,0L80,0 A20,20,0,0 1 100,20 L100,80 A20,20,0,0 1 80,100 L20,100 A20,20,0,0 1 0,80 L 0,20 A20,20,0,0 1 20,0z" - "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" - "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" - "M50,0A50,30 0,0,1 100,30V70A50,30 0,0,1 0,70V30A50,30 0,0,1 50,0z" - - - diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml index b22af0de8b..6e61af554f 100644 --- a/res/values-kn/strings.xml +++ b/res/values-kn/strings.xml @@ -76,10 +76,13 @@ "ಮುಖಪುಟ ತಿರುಗುವಿಕೆಯನ್ನು ಅನುಮತಿಸಿ" "ಫೋನ್‌ ತಿರುಗಿಸಿದಾಗ" "ಪ್ರಸ್ತುತ ಪ್ರದರ್ಶನ ಸೆಟ್ಟಿಂಗ್ ತಿರುಗುವಿಕೆಯನ್ನು ಅನುಮತಿಸುವುದಿಲ್ಲ" + "ಐಕಾನ್ ಬ್ಯಾಡ್ಜ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ" + "ಎಲ್ಲ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಆನ್ ಮಾಡಲಾಗಿದೆ" + "ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಆಫ್ ಆಗಿದೆ" "ಮುಖಪುಟದ ಪರದೆಗೆ ಐಕಾನ್ ಸೇರಿಸಿ" "ಹೊಸ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ" "ಐಕಾನ್ ಆಕಾರವನ್ನು ಬದಲಿಸಿ" - "ಬದಲಿಸಬೇಡಿ" + "ಸಿಸ್ಟಂ ಡಿಫಾಲ್ಟ್ ಬಳಸಿ" "ಐಕಾನ್ ಆಕಾರ ಬದಲಾವಣೆಯನ್ನು ಅನ್ವಯಿಸಲಾಗುತ್ತಿದೆ" "ಅಪರಿಚಿತ" "ತೆಗೆದುಹಾಕಿ" @@ -115,4 +118,7 @@ "ವಿಜೆಟ್ ಅನ್ನು %1$s ಅಗಲ %2$s ಎತ್ತರಕ್ಕೆ ಮರುಗಾತ್ರಗೊಳಿಸಲಾಗಿದೆ" "ಶಾರ್ಟ್‌ಕಟ್‌ಗಳು" "%2$s ಗೆ %1$d ಶಾರ್ಟ್‌ಕಟ್‌ಗಳು" + "%3$s ಗಾಗಿ %1$d ಶಾರ್ಟ್‌ಕಟ್‌ಗಳು ಮತ್ತು %2$d ಅಧಿಸೂಚನೆಗಳು" + "ವಜಾಗೊಳಿಸಿ" + "ಅಧಿಸೂಚನೆಯನ್ನು ವಜಾಗೊಳಿಸಲಾಗಿದೆ" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 9e1eba4c0b..d6226d6c1f 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -76,12 +76,14 @@ "홈 화면 회전 허용" "휴대전화 회전 시" "현재 표시 설정에는 회전 기능이 허용되지 않습니다." + "아이콘 배지" + "모든 앱에서 사용 설정됨" + "모든 앱에서 사용 중지됨" "홈 화면에 아이콘 추가" "새로 설치한 앱에 적용" - - + "시스템 기본값 사용" "알 수 없음" @@ -118,4 +120,7 @@ "폭 %1$s, 높이 %2$s로 위젯 크기 조정됨" "바로가기" "%2$s에 사용 가능한 단축키 %1$d개" + "바로가기 %1$d개 및 %3$s 알림 %2$d개" + "닫기" + "알림이 해제되었습니다." diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml index cfdcc18847..bdfd15c39a 100644 --- a/res/values-ky/strings.xml +++ b/res/values-ky/strings.xml @@ -76,12 +76,14 @@ "Башкы экранды айлантууга уруксат берүү" "Телефон айланганда" "Экранды айлантуу параметри өчүрүлгөн" + "Бейджик тагуу сүрөтчөсү" + "Бардык колдонмолор үчүн күйүк" + "Бардык колдонмолор үчүн өчүк" "Башкы экранга сүрөтчө кошуу" "Жаңы колдонмолор үчүн" - - + "Тутум сушунтаган демейкисин колдонуу" "Белгисиз" @@ -118,4 +120,7 @@ "Виджеттин кеңдиги %1$s бийиктиги %2$s болду" "Кыска жолдор" "%2$s колдонмосуна %1$d кыска жол бар" + "%3$s колдонмосу үчүн %1$d кыска жол жана %2$d эскертме бар" + "Этибарга албоо" + "Эскертме көз жаздымда калтырылды" diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml index 334305afe1..799db3c46d 100644 --- a/res/values-lo/strings.xml +++ b/res/values-lo/strings.xml @@ -76,12 +76,14 @@ "ອະນຸຍາດໃຫ້ໝຸນໜ້າຈໍທຳອິດໄດ້" "ເມື່ອໝຸນໂທລະສັບ" "ການຕັ້ງຄ່າສະແດງຜົນປັດຈຸບັນບໍ່ອະນຸຍາດໃຫ້ໝຸນໄດ້" + "ປ້າຍໄອຄອນ" + "ເປີດສຳລັບທຸກແອັບ" + "ປິດສຳລັບທຸກແອັບ" "ເພີ່ມໄອຄອນໃສ່ໜ້າຈໍຫຼັກ" "ສຳລັບແອັບໃໝ່" - - + "ໃຊ້ຄ່າເລີ່ມຕົ້ນລະບົບ" "​ບໍ່​ຮູ້​ຈັກ" @@ -118,4 +120,7 @@ "ປ່ຽນ​ຂະ​ໜາດ​ວິດ​ເຈັດ​ເປັນ​ລວງ​ກ້​ວາງ %1$s ລວງ​ສູງ %2$s ແລ້ວ" "ທາງລັດ" "%1$d ທາງລັດສຳລັບ %2$s" + "%1$d ທາງລັດ ແລະ %2$d ການແຈ້ງເຕືອນສຳລັບ %3$s" + "ປິດໄວ້" + "ປິດການແຈ້ງເຕືອນແລ້ວ" diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 558e1a9494..bbf7f1a176 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -76,12 +76,14 @@ "Leisti pasukti pagrindinį ekraną" "Kai telefonas pasukamas" "Naudojant dabartinį pateikties nustatymą neleidžiama pasukti" + "Piktogramos ženklelių informacija" + "Įjungta visoms programoms" + "Išjungta visoms programoms" "Pridėti piktogr. prie pagrindinio ekrano" "Skirta naujoms programoms" - - + "Naudoti numatytuosius sistemos nustatymus" "Nežinoma" @@ -118,4 +120,7 @@ "Valdiklio dydis pakeistas: plotis – %1$s, aukštis – %2$s" "Spartieji klavišai" "Programos „%2$s“ spartieji klavišai (%1$d)" + "„%3$s“ spartieji klavišai (%1$d) ir pranešimai (%2$d)" + "Atsisakyti" + "Pranešimo atsisakyta" diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 733d647605..75e1bef4f2 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -76,12 +76,14 @@ "Atļaut sākuma ekrāna pagriešanu" "Pagriežot tālruni" "Pašreizējā displeja iestatījumā nav atļauta pagriešana." + "Ikonu emblēmas" + "Ieslēgts visām lietotnēm" + "Izslēgts visām lietotnēm" "Pievienot ikonu sākuma ekrānā" "Jaunām lietotnēm" - - + "Izmantot sistēmas noklusējumu" "Nezināma" @@ -118,4 +120,7 @@ "Logrīka lielums mainīts — platums: %1$s, augstums: %2$s." "Saīsnes" "%1$d saīsnes lietotnei %2$s" + "%1$d saīsnes un %2$d paziņojumi lietotnei %3$s" + "Nerādīt" + "Paziņojums netiek rādīts" diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml index 267e75b98d..f0c1b64b2d 100644 --- a/res/values-mk/strings.xml +++ b/res/values-mk/strings.xml @@ -76,12 +76,14 @@ "Дозволете ротација на Почетниот екран" "Кога телефонот се ротира" "Тековната поставка на Екранот не дозволува ротација" + "Ставање значки на икони" + "Вклучено за сите апликации" + "Исклучено за сите апликации" "Додајте икона на почетниот екран" "За нови апликации" - - + "Користи ја стандардната поставка на системот" "Непознато" @@ -118,4 +120,7 @@ "Големината на виџетот е променета на ширина %1$s висина %2$s" "Кратенки" "%1$d кратенки за %2$s" + "%1$d кратенки и %2$d известувања за %3$s" + "Отфрли" + "Известувањето е отфрлено" diff --git a/res/values-ml-rIN/config.xml b/res/values-ml-rIN/config.xml deleted file mode 100644 index 56f98c3563..0000000000 --- a/res/values-ml-rIN/config.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - "M50,0L100,0 100,100 0,100 0,0z" - "M50,0L80,0 A20,20,0,0 1 100,20 L100,80 A20,20,0,0 1 80,100 L20,100 A20,20,0,0 1 0,80 L 0,20 A20,20,0,0 1 20,0z" - "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" - "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" - "M50,0A50,30 0,0,1 100,30V70A50,30 0,0,1 0,70V30A50,30 0,0,1 50,0z" - - - diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml index a92fc03568..9dc4bb18bf 100644 --- a/res/values-ml/strings.xml +++ b/res/values-ml/strings.xml @@ -36,7 +36,7 @@ "സ്വമേധയാ സ്ഥാപിക്കുന്നതിന് സ്‌പർശിച്ചുപിടിക്കുക" "സ്വയമേവ ചേർക്കുക" "ആപ്പുകളെ തിരയുക" - "ആപ്പ്‌സ് ലോഡുചെയ്യുന്നു..." + "ആപ്പുകൾ ലോഡുചെയ്യുന്നു..." "\"%1$s\" എന്നതുമായി പൊരുത്തപ്പെടുന്ന ആപ്പ്‌സൊന്നും കണ്ടെത്തിയില്ല" "കൂടുതൽ ആപ്പുകൾക്ക് തിരയുക" "അറിയിപ്പുകൾ" @@ -76,10 +76,13 @@ "ഹോം സ്ക്രീൻ തിരിക്കൽ അനുവദിക്കുക" "ഫോൺ തിരിച്ച നിലയിലായിരിക്കുമ്പോൾ" "നിലവിലെ ഡിസ്പ്ലേ ക്രമീകരണം തിരിക്കൽ അനുവദിക്കുന്നില്ല" + "ഐക്കൺ ബാഡ്‌ജിംഗ്" + "എല്ലാ ആപ്പുകൾക്കും ഓണാണ്" + "എല്ലാ ആപ്പുകൾക്കും ഓഫാണ്" "ഹോം സ്ക്രീനിലേക്ക് ഐക്കൺ ചേർക്കുക" "പുതിയ ആപ്പുകൾക്ക്" "ഐക്കണിന്റെ ആകാരം മാറ്റുക" - "മാറ്റരുത്" + "സിസ്‌റ്റം ഡിഫോൾട്ട് ഉപയോഗിക്കുക" "ഐക്കൺ ആകാര മാറ്റങ്ങൾ പ്രയോഗിക്കുന്നു" "അജ്ഞാതം" "നീക്കംചെയ്യുക" @@ -115,4 +118,7 @@ "വീതി %1$s ഉയരം %2$s-ലേക്ക് വിഡ്‌ജെറ്റിന്റെ വലുപ്പം മാറ്റി" "കുറുക്കുവഴികൾ" "%2$s ആപ്പിനുള്ള %1$d കുറുക്കുവഴികൾ" + "%3$s ആപ്പിനായുള്ള %1$d കുറുക്കുവഴികളും %2$d അറിയിപ്പുകളും" + "നിരസിക്കുക" + "അറിയിപ്പ് നിരസിച്ചു" diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml index 5b74fd2049..c1accc56f6 100644 --- a/res/values-mn/strings.xml +++ b/res/values-mn/strings.xml @@ -76,12 +76,14 @@ "Нүүр дэлгэцийг эргүүлэхийг зөвшөөрөх" "Утсыг эргүүлсэн үед" "Дэлгэцийн одоогийн тохиргоогоор эргүүлэх боломжгүй" + "Дүрс тэмдэг" + "Бүх аппад асаасан" + "Бүх аппад унтраасан" "Нүүр хуудаст дүрс тэмдэг нэмэх" "Шинэ аппад зориулсан" - - + "Системийн өгөгдмөл тохиргоог ашиглах" "Тодорхойгүй" @@ -118,4 +120,7 @@ "Виджэтийн өргөн %1$s, өндөр %2$s болсон" "Товчлол" "%2$s-н %1$d товчлол" + "%1$d товчлол болон %3$s-н %2$d мэдэгдэл" + "Хаах" + "Мэдэгдлийг хаасан" diff --git a/res/values-mr-rIN/config.xml b/res/values-mr-rIN/config.xml deleted file mode 100644 index 56f98c3563..0000000000 --- a/res/values-mr-rIN/config.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - "M50,0L100,0 100,100 0,100 0,0z" - "M50,0L80,0 A20,20,0,0 1 100,20 L100,80 A20,20,0,0 1 80,100 L20,100 A20,20,0,0 1 0,80 L 0,20 A20,20,0,0 1 20,0z" - "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" - "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" - "M50,0A50,30 0,0,1 100,30V70A50,30 0,0,1 0,70V30A50,30 0,0,1 50,0z" - - - diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml index 1a10e4b571..a7a8c80d5d 100644 --- a/res/values-mr/strings.xml +++ b/res/values-mr/strings.xml @@ -76,10 +76,13 @@ "मुख्यस्क्रीन फिरविण्‍यास अनुमती द्या" "फोन फिरविला जातो तेव्हा" "वर्तमान प्रदर्शन सेटिंग फिरविण्यास परवानगी देत नाही" + "चिन्ह बॅज करणे" + "सर्व अॅपसाठी चालू आहे" + "सर्व अॅपसाठी बंद आहे" "मुख्य स्क्रीनवर चिन्ह जोडा" "नवीन अॅप्ससाठी" "चिन्हाचा आकार बदला" - "बदलू नका" + "सिस्‍टमचे डीफॉल्‍ट वापरा" "चिन्हाचा आकार बदल लागू करत आहे" "अज्ञात" "काढा" @@ -115,4 +118,7 @@ "विजेटचा आकार रुंदी %1$s उंची %2$s मध्ये बदलला" "शॉर्टकट" "%2$s साठी %1$d शॉर्टकट" + "%3$sसाठी %1$d शॉर्टकट आणि %2$d सूचना" + "डिसमिस करा" + "सूचना डिसमिस केली" diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml index 449aae8e02..c8bad182a7 100644 --- a/res/values-my/strings.xml +++ b/res/values-my/strings.xml @@ -76,12 +76,14 @@ "ပင်မစာမျက်နှာလှည့်ခြင်းကို ခွင့်ပြုပါ" "ဖုန်းကိုလှည့်ထားစဉ်" "လက်ရှိ မြင်ကွင်းဆက်တင်တွင် မြင်ကွင်းကို လှည့်ခွင့်မပေးပါ" + "သင်္ကေတ တံဆိပ်" + "အက်ပ်များအားလုံးအတွက် ဖွင့်ထားသည်" + "အက်ပ်များအားလုံးအတွက် ပိတ်ထားသည်" "ပင်မစာမျက်နှာသို့ သင်္ကေတပုံ ထည့်ရန်" "အက်ပ်အသစ်များအတွက်" - - + "စနစ်၏ မူရင်းပုံကို အသုံးပြုရန်" "မသိရ" @@ -118,4 +120,7 @@ "Widget အား အကျယ် %1$s အမြင့် %2$s အရွယ်အစားပြန်လည်ချိန်ညှိပြီး၏" "ဖြတ်လမ်းများ" "%2$s အတွက် အမြန်နည်း %1$d ခု" + "%3$s အတွက် ဖြတ်လမ်းလင့်ခ် %1$d နှင့် အကြောင်းကြားချက် %2$d ခု" + "ပယ်ရန်" + "အသိပေးချက်ကို ဖယ်ထုတ်ပြီးပါပြီ" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 6c70038bb5..e75e83106f 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -76,12 +76,14 @@ "Tillat rotasjon av startskjermen" "Når telefonen roteres" "Med den nåværende skjerminnstillingen støttes ikke rotasjon" + "Ikonmerking" + "På for alle apper" + "Av for alle apper" "Legg til ikon på startsiden" "For nye apper" - - + "Bruk systemstandard" "Ukjent" @@ -118,4 +120,7 @@ "Størrelsen på modulen er endret til bredde %1$s og høyde %2$s" "Snarveier" "%1$d snarveier for %2$s" + "%1$d snarveier og %2$d varsler for %3$s" + "Avvis" + "Varselet ble avvist" diff --git a/res/values-ne-rNP/config.xml b/res/values-ne-rNP/config.xml deleted file mode 100644 index 56f98c3563..0000000000 --- a/res/values-ne-rNP/config.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - "M50,0L100,0 100,100 0,100 0,0z" - "M50,0L80,0 A20,20,0,0 1 100,20 L100,80 A20,20,0,0 1 80,100 L20,100 A20,20,0,0 1 0,80 L 0,20 A20,20,0,0 1 20,0z" - "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" - "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" - "M50,0A50,30 0,0,1 100,30V70A50,30 0,0,1 0,70V30A50,30 0,0,1 50,0z" - - - diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index 46c8f9ceae..dee84e6859 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -76,10 +76,13 @@ "गृह स्क्रिनलाई घुम्ने अनुमति दिनुहोस्" "फोनलाई घुमाइँदा" "हालको प्रदर्शन सम्बन्धी सेटिङले घुमाउने सुविधालाई अनुमति दिँदैन" + "आइकनलाई पदक दिने कार्य" + "सबै अनुप्रयोगहरूमा सक्रिय छ" + "सबै अनुप्रयोगहरूमा निष्क्रिय छ" "गृह स्क्रिनमा आइकन थप्नुहोस्" "नयाँ अनुप्रयोगका लागि" "आइकनको आकार परिवर्तन गर्नुहोस्" - "परिवर्तन नगर्नुहोस्" + "प्रणालीको पूर्वनिर्धारित सेटिङ प्रयोग गर्नुहोस्" "आइकनको आकारमा गरिएका परिवर्तनहरू लागू गरिँदैछन्" "अज्ञात" "हटाउनुहोस्" @@ -115,4 +118,7 @@ "विजेट चौडाइ %1$s उचाइ %2$s मा पुनः आकार मिलाइयो" "सर्टकटहरू" "%2$s का %1$d सर्टकटहरू" + "%3$s का %1$d सर्टकट र %2$d सूचनाहरू" + "खारेज गर्नुहोस्" + "सूचना खारेज गरियो" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index e8caeb448f..a712d4805e 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -76,12 +76,14 @@ "Draaien van startscherm toestaan" "Wanneer de telefoon gedraaid is" "Huidige scherminstelling staat draaien niet toe" + "Pictogrambadges" + "Ingeschakeld voor alle apps" + "Uitgeschakeld voor alle apps" "Pictogram toevoegen aan startscherm" "Voor nieuwe apps" - - + "Systeemstandaard gebruiken" "Onbekend" @@ -118,4 +120,7 @@ "Formaat van widget gewijzigd in breedte %1$s en hoogte %2$s" "Snelkoppelingen" "%1$d snelkoppelingen voor %2$s" + "%1$d snelkoppelingen en %2$d meldingen voor %3$s" + "Sluiten" + "Melding gesloten" diff --git a/res/values-pa-rIN/config.xml b/res/values-pa-rIN/config.xml deleted file mode 100644 index 56f98c3563..0000000000 --- a/res/values-pa-rIN/config.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - "M50,0L100,0 100,100 0,100 0,0z" - "M50,0L80,0 A20,20,0,0 1 100,20 L100,80 A20,20,0,0 1 80,100 L20,100 A20,20,0,0 1 0,80 L 0,20 A20,20,0,0 1 20,0z" - "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" - "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" - "M50,0A50,30 0,0,1 100,30V70A50,30 0,0,1 0,70V30A50,30 0,0,1 50,0z" - - - diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index c4c11ce04e..8e51bd3cf0 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -76,10 +76,13 @@ "ਮੁੱਖ ਸਕ੍ਰੀਨ ਨੂੰ ਘੁੰਮਾਉਣ ਦੀ ਆਗਿਆ ਦਿਓ" "ਜਦੋਂ ਫ਼ੋਨ ਘੁੰਮਾਇਆ ਜਾਂਦਾ ਹੈ" "ਵਰਤਮਾਨ ਡਿਸਪਲੇ ਸੈਟਿੰਗ ਘੁੰਮਾਉਣ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਦਿੰਦੀ ਹੈ" + "ਪ੍ਰਤੀਕ \'ਤੇ ਬੈਜ ਲਗਾਉਣਾ" + "ਸਾਰੀਆਂ ਐਪਾਂ ਦੇ ਲਈ ਚਾਲੂ ਹੈ" + "ਸਾਰੀਆਂ ਐਪਾਂ ਦੇ ਲਈ ਬੰਦ ਹੈ" "ਮੁੱਖ ਸਕ੍ਰੀਨ \'ਤੇ ਪ੍ਰਤੀਕ ਸ਼ਾਮਲ ਕਰੋ" "ਨਵੀਆਂ ਐਪਾਂ ਲਈ" "ਆਈਕਨ ਦੀ ਆਕ੍ਰਿਤੀ ਬਦਲੋ" - "ਨਾ ਬਦਲੋ" + "ਸਿਸਟਮ ਦੀ ਪੂਰਵ-ਨਿਰਧਾਰਤ ਸੈਟਿੰਗ ਵਰਤੋ" "ਆਈਕਨ ਦੀ ਆਕ੍ਰਿਤੀ ਵਿੱਚ ਤਬਦੀਲੀਆਂ ਨੂੰ ਲਾਗੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" "ਅਗਿਆਤ" "ਹਟਾਓ" @@ -115,4 +118,7 @@ "ਵਿਜੈਟ ਨੂੰ ਚੌੜਾਈ %1$s ਉਂਚਾਈ %2$s ਨੂੰ ਮੁੜ ਆਕਾਰ ਦਿੱਤਾ" "ਸ਼ਾਰਟਕੱਟ" "%2$s ਲਈ %1$d ਸ਼ਾਰਟਕੱਟ" + "%3$s ਲਈ %1$d ਸ਼ਾਰਟਕੱਟ ਅਤੇ %2$d ਸੂਚਨਾਵਾਂ" + "ਖਾਰਜ ਕਰੋ" + "ਸੂਚਨਾ ਖਾਰਜ ਕੀਤੀ ਗਈ" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index e611fcd9a8..9192732ed9 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -76,12 +76,14 @@ "Zezwalaj na obrót ekranu głównego" "Po obróceniu telefonu" "Obecne ustawienia wyświetlania nie pozwalają na obrót ekranu" + "Plakietki na ikonach" + "Włączone dla wszystkich aplikacji" + "Wyłączone dla wszystkich aplikacji" "Dodaj ikonę do ekranu głównego" "W przypadku nowych aplikacji" - - + "Użyj ustawienia domyślnego" "Brak informacji" @@ -118,4 +120,7 @@ "Szerokość i wysokość widżetu zmieniła się na %1$s x %2$s" "Skróty" "Skróty aplikacji %2$s: %1$d" + "Skróty (%1$d) i powiadomienia (%2$d) aplikacji %3$s" + "Odrzuć" + "Powiadomienie odrzucone" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 0aa987bdac..605dff2644 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -76,12 +76,14 @@ "Permitir rotação do ecrã principal" "Quando o telemóvel é rodado" "A definição de visualização atual não permite a rotação" + "Emblemas dos ícones" + "Ativada para todas as aplicações" + "Desativada para todas as aplicações" "Adicionar ícone ao ecrã principal" "Para novas aplicações" - - + "Utilizar a predefinição do sistema" "Desconhecido" @@ -118,4 +120,7 @@ "Widget redimensionado para a largura %1$s, altura %2$s" "Atalhos" "%1$d atalhos para a aplicação %2$s" + "%1$d atalhos e %2$d notificações para a aplicação %3$s" + "Ignorar" + "Notificação ignorada" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 39a16515f1..7945b0726c 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -76,12 +76,14 @@ "Permitir rotação da tela inicial" "Quando o smartphone for girado" "A configuração atual de exibição não permite rotação" + "Uso de selo de ícone" + "Ativado para todos os apps" + "Desativado para todos os apps" "Adicionar ícone à tela inicial" "Para novos apps" - - + "Usar padrão do sistema" "Desconhecido" @@ -118,4 +120,7 @@ "Widget redimensionado para a largura %1$s, altura %2$s" "Atalhos" "%1$d atalhos para %2$s" + "%1$d atalhos e %2$d notificações para o app %3$s" + "Dispensar" + "Notificação dispensada" diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index c7c0994a36..b433029fd7 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -76,12 +76,14 @@ "Permiteți rotirea ecranului de pornire" "Când telefonul este rotit" "Setarea actuală a afișajului nu permite rotirea" + "Aplicarea insignelor pentru pictograme" + "Activată pentru toate aplicațiile" + "Dezactivată pentru toate aplicațiile" "Adaugă pictograme în ecranul de pornire" "Pentru aplicații noi" - - + "Folosiți setarea prestabilită a sistemului" "Necunoscut" @@ -118,4 +120,7 @@ "Widgetul a fost redimensionat la lățimea %1$s și înălțimea %2$s" "Comenzi rapide" "%1$d comenzi rapide pentru %2$s" + "%1$d comenzi rapide și %2$d notificări pentru %3$s" + "Închideți" + "Notificare închisă" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index acb49d5987..6c87042f9b 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -76,12 +76,14 @@ "Разрешить поворачивать главный экран" "Когда телефон повернут" "В настройках отключен поворот экрана" + "Уведомления на значке приложения" + "Включено для всех приложений" + "Отключено для всех приложений" "Добавлять значки" "Добавлять значки установленных приложений на главный экран." - - + "Использовать системные настройки по умолчанию" "Неизвестно" @@ -118,4 +120,7 @@ "Изменен размер виджета: до %1$s в ширину и %2$s в высоту" "Ярлыки" "Количество ярлыков для приложения \"%2$s\": %1$d" + "Количество ярлыков для приложения \"%3$s\": %1$d. Количество уведомлений: %2$d." + "Закрыть" + "Уведомление закрыто" diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml index 569a77f003..f8f8e85f31 100644 --- a/res/values-si/strings.xml +++ b/res/values-si/strings.xml @@ -76,12 +76,14 @@ "මුල් පිටු තිරය කරකැවීමට ඉඩ දෙන්න" "දුරකථනය කරකවන විට" "වත්මන් සංදර්ශක සැකසීම් කරකැවීමට සහාය නොදක්වයි" + "නිරූපක ලාංඡනය" + "සියලු යෙදුම් සඳහා ක්‍රියාත්මකයි" + "සියලු යෙදුම් සඳහා ක්‍රියාවිරහිතයි" "මුල් පිටු තිරය වෙත අයිකනය එක් කරන්න" "නව යෙදුම් සඳහා" - - + "පද්ධති පෙරනිමි භාවිත කරන්න" "නොදනී" @@ -118,4 +120,7 @@ "විජට් පළල %1$s උස %2$s වෙත ප්‍රමාණකරණය කරන ලදි" "කෙටිමං" "%2$s සඳහා කෙටි මං %1$d" + "%3$s සඳහා කෙටි මං %1$dක් සහ දැනුම්දීම් %2$dක්" + "ඉවතලන්න" + "දැනුම්දීම ඉවතලන ලදී" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index dd03fd6f3c..3d754b21fb 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -76,12 +76,14 @@ "Povoliť otáčanie plochy" "Pri otočení telefónu" "Aktuálne nastavenie obrazovky nepovoľuje otáčanie" + "Označovanie ikon" + "Zapnuté pre všetky aplikácie" + "Vypnuté pre všetky aplikácie" "Pridať ikonu na plochu" "Pri inštalácii novej aplikácie" - - + "Použiť predvolené nastavenie systému" "Neznáme" @@ -118,4 +120,7 @@ "Veľkosť miniaplikácie bola zmenená na %1$s x %2$s (šírka x výška)" "Skratky" "Počet skratiek aplikácie %2$s: %1$d" + "Odkazy (%1$d) a upozornenia (%2$d) pre aplikáciu %3$s" + "Zavrieť" + "Upozornenie bolo zavreté" diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index f8761d2af7..fddb4452d5 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -76,12 +76,14 @@ "Omogočanje sukanja začetnega zaslona" "Ko se telefon zasuka" "Trenutna nastavitev zaslona ne dovoljuje sukanja" + "Označevanje z ikonami" + "Vklopljeno za vse aplikacije" + "Izklopljeno za vse aplikacije" "Dodaj ikono na začetni zaslon" "Za nove aplikacije" - - + "Uporabi privzeto nastavitev sistema" "Neznano" @@ -118,4 +120,7 @@ "Velikost pripomočka je bila spremenjena na %1$s širine in %2$s višine" "Bližnjice" "Št. bližnjic za aplikacijo %2$s: %1$d" + "Bližnjice (%1$d) in obvestila (%2$d) aplikacije %3$s" + "Opusti" + "Obvestilo je bilo opuščeno" diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml index 2b656840d7..f300d037e5 100644 --- a/res/values-sq/strings.xml +++ b/res/values-sq/strings.xml @@ -76,12 +76,14 @@ "Lejo rrotullimin e ekranit kryesor" "Kur telefoni rrotullohet" "Cilësimi aktuali i afishimit nuk lejon rrotullimin" + "Caktimi i simbolit të ikonës" + "Aktiv për të gjitha aplikacionet" + "Joaktiv për të gjitha aplikacionet" "Shto ikonë në ekranin bazë" "Për aplikacionet e reja" - - + "Përdor parazgjedhjen e sisteit" "I panjohur" @@ -118,4 +120,7 @@ "Madhësia e miniaplikacionit u ndryshua me gjerësinë %1$s dhe lartësinë %2$s" "Shkurtoret" "%1$d shkurtesa për %2$s" + "%1$d shkurtore dhe %2$d njoftime për %3$s" + "Hiqe" + "Njoftimi u hoq" diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index ac2114266f..68cb442d1d 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -76,12 +76,14 @@ "Дозволи ротацију почетног екрана" "Када се телефон ротира" "Актуелно подешавање приказа не дозвољава ротацију" + "Додавање значки на иконе" + "Укључено за све апликације" + "Искључено за све апликације" "Додај икону на почетни екран" "За нове апликације" - - + "Користи подразумевано системско подешавање" "Непознато" @@ -118,4 +120,7 @@ "Величина виџета је промењена на ширину %1$s и висину %2$s" "Пречице" "%1$d пречице(а) за %2$s" + "Пречице (%1$d) и обавештења (%2$d) за %3$s" + "Одбаци" + "Обавештење је одбачено" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 7d6e053690..4dd6f48bff 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -76,12 +76,14 @@ "Tillåt rotering av startskärmen" "När mobilen vrids" "Rotering tillåts inte i de nuvarande skärminställningarna" + "Ikonmärken" + "Aktiverat för alla appar" + "Inaktiverat för alla appar" "Lägg till ikonen på startskärmen" "För nya appar" - - + "Använd systemstandard" "Okänt" @@ -118,4 +120,7 @@ "Widgetens storlek har ändrats till: bredd %1$s, höjd %2$s" "Genvägar" "%1$d genvägar för %2$s" + "%3$s har %1$d genvägar och %2$d aviseringar" + "Ignorera" + "Aviseringen togs bort" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 62e3385342..ce06bdb0cb 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -78,12 +78,14 @@ "Ruhusu kuzungusha skrini ya Kwanza" "Simu inapozungushwa" "Mipangilio ya sasa ya sehemu ya Onyesho hairuhusu kuzungusha" + "Kuweka beji kwenye aikoni" + "Imewashwa katika programu zote" + "Imezimwa katika programu zote" "Ongeza aikoni kwenye Skrini ya kwanza" "Kwa ajili ya programu mpya" - - + "Tumia umbo chaguo-msingi la mfumo" "Yasiyojulikana" @@ -120,4 +122,7 @@ "Wijeti imepunguzwa hadi upana %1$s urefu %2$s" "Njia za mkato" "Njia %1$d za mkato za %2$s" + "Njia %1$d za mkato na arifa %2$d za %3$s" + "Ondoa" + "Arifa imeondolewa" diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml index a1e00a11dc..eae471c0dd 100644 --- a/res/values-ta/strings.xml +++ b/res/values-ta/strings.xml @@ -76,12 +76,14 @@ "முகப்புத் திரை சுழற்சியை அனுமதி" "மொபைலைச் சுழற்றும் போது" "தற்போதைய திரை அமைப்பு சுழற்றுவதை அனுமதிக்கவில்லை" + "ஐகான் பேட்ஜிங்" + "எல்லாப் பயன்பாடுகளுக்கும் இயக்கப்பட்டது" + "எல்லாப் பயன்பாடுகளுக்கும் முடக்கப்பட்டது" "முகப்புத் திரையில் ஐகானைச் சேர்" "புதிய பயன்பாடுகளுக்கு" - - + "அமைப்பின் இயல்புநிலையைப் பயன்படுத்து" "தெரியாதது" @@ -118,4 +120,7 @@ "அகலம் %1$s மற்றும் உயரம் %2$sக்கு விட்ஜெட் அளவு மாற்றப்பட்டது" "குறுக்குவழிகள்" "%2$sக்கான %1$d குறுக்குவழிகள்" + "%3$s பயன்பாட்டிற்கான %1$d குறுக்குவழிகளும் %2$d அறிவிப்புகளும் உள்ளன" + "நிராகரி" + "அறிவிப்பு நிராகரிக்கப்பட்டது" diff --git a/res/values-te-rIN/config.xml b/res/values-te-rIN/config.xml deleted file mode 100644 index 56f98c3563..0000000000 --- a/res/values-te-rIN/config.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - "M50,0L100,0 100,100 0,100 0,0z" - "M50,0L80,0 A20,20,0,0 1 100,20 L100,80 A20,20,0,0 1 80,100 L20,100 A20,20,0,0 1 0,80 L 0,20 A20,20,0,0 1 20,0z" - "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" - "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" - "M50,0A50,30 0,0,1 100,30V70A50,30 0,0,1 0,70V30A50,30 0,0,1 50,0z" - - - diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml index 65ca927753..338c1585c3 100644 --- a/res/values-te/strings.xml +++ b/res/values-te/strings.xml @@ -76,10 +76,13 @@ "హోమ్ స్క్రీన్ భ్రమణాన్ని అనుమతించండి" "ఫోన్‌‌ను తిప్పినప్పుడు" "ప్రస్తుత డిస్‌ప్లే సెట్టింగ్ భ్రమణాన్ని అనుమతించలేదు" + "చిహ్నం బ్యాడ్జ్" + "అన్ని అనువర్తనాలలో ఆన్ చేయబడ్డాయి" + "అన్ని అనువర్తనాలలో ఆఫ్‌ చేయబడ్డాయి" "హోమ్ స్క్రీన్‌కి చిహ్నాన్ని జోడించు" "కొత్త అనువర్తనాల కోసం" "చిహ్న ఆకారాన్ని మార్చు" - "మార్చవద్దు" + "సిస్టమ్ డిఫాల్ట్‌ను ఉపయోగించండి" "చిహ్న ఆకార మార్పులను వర్తింపజేస్తోంది" "తెలియదు" "తీసివేయి" @@ -115,4 +118,7 @@ "విడ్జెట్ పరిమాణం వెడల్పు %1$sకి, ఎత్తు %2$sకి మార్చబడింది" "సత్వరమార్గాలు" "%2$s కోసం %1$d సత్వరమార్గాలు" + "%3$s కోసం %1$d సత్వరమార్గాలు మరియు %2$d నోటిఫికేషన్‌లు" + "తీసివేయి" + "నోటిఫికేషన్ తీసివేయబడింది" diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index fb7b587152..65702a05b1 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -76,12 +76,14 @@ "อนุญาตให้หมุนหน้าจอหลัก" "เมื่อหมุนโทรศัพท์" "การตั้งค่าการแสดงผลปัจจุบันไม่อนุญาตให้มีการหมุน" + "การติดป้ายไอคอน" + "เปิดสำหรับแอปทั้งหมด" + "ปิดสำหรับแอปทั้งหมด" "เพิ่มไอคอนในหน้าจอหลัก" "สำหรับแอปใหม่" - - + "ใช้ค่าเริ่มต้นของระบบ" "ไม่รู้จัก" @@ -118,4 +120,7 @@ "ปรับขนาดของวิดเจ็ตเป็นกว้าง %1$s สูง %2$s แล้ว" "ทางลัด" "%1$d ทางลัดสำหรับ %2$s" + "ทางลัด %1$d รายการและการแจ้งเตือน %2$d รายการสำหรับ %3$s" + "ปิด" + "ปิดการแจ้งเตือนแล้ว" diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index d18bd1e974..827070829e 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -76,12 +76,14 @@ "Payagan ang pag-rotate ng Home screen" "Kailan maro-rotate ang telepono" "Hindi pinahihintulutan ng kasalukuyang setting ng Display ang pag-rotate" + "Pag-badge ng icon" + "Naka-on para sa lahat ng app" + "Naka-off para sa lahat ng app" "Idagdag ang icon sa Home screen" "Para sa mga bagong app" - - + "Gamitin ang default ng system" "Hindi kilala" @@ -118,4 +120,7 @@ "Na-resize ang widget sa lapad %1$s taas %2$s" "Mga Shortcut" "%1$d (na) shortcut para sa %2$s" + "%1$d (na) shortcut at %2$d (na) notification para sa %3$s" + "I-dismiss" + "Na-dismiss ang notification" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 0c655fd7cd..da0aa28f2a 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -76,12 +76,14 @@ "Ana ekranı döndürmeye izin ver" "Telefon döndürüldüğünde" "Mevcut Ekran ayarı, döndürmeye izin vermiyor" + "Simge rozeti ekleme" + "Tüm uygulamalar için açık" + "Tüm uygulamalar için kapalı" "Ana ekrana simge ekle" "Yeni uygulamalar için" - - + "Sistem varsayılanını kullan" "Bilinmiyor" @@ -118,4 +120,7 @@ "Widget, %1$s genişlik ve %2$s yükseklik değerine yeniden boyutlandırıldı" "Kısayollar" "%2$s için %1$d kısayol" + "%3$s için %1$d kısayol ve %2$d bildirim" + "Kapat" + "Bildirim kapatıldı" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 8679628c29..a9cefaf502 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -76,12 +76,14 @@ "Дозволити обертання головного екрана" "Коли телефон обертається" "Поточні налаштування дисплея не підтримують обертання" + "Позначення значків" + "Увімкнено для всіх додатків" + "Вимкнено для всіх додатків" "Додати значок на головний екран" "Для нових додатків" - - + "Використовувати налаштування системи за умовчанням" "Невідомо" @@ -118,4 +120,7 @@ "Розміри віджета змінено на %1$s завширшки та %2$s заввишки" "Ярлики" "Ярликів для додатка %2$s: %1$d" + "Ярлики (%1$d) і сповіщення (%2$d) додатка %3$s" + "Закрити" + "Сповіщення закрито" diff --git a/res/values-ur-rPK/config.xml b/res/values-ur-rPK/config.xml deleted file mode 100644 index 56f98c3563..0000000000 --- a/res/values-ur-rPK/config.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - "M50,0L100,0 100,100 0,100 0,0z" - "M50,0L80,0 A20,20,0,0 1 100,20 L100,80 A20,20,0,0 1 80,100 L20,100 A20,20,0,0 1 0,80 L 0,20 A20,20,0,0 1 20,0z" - "M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" - "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" - "M50,0A50,30 0,0,1 100,30V70A50,30 0,0,1 0,70V30A50,30 0,0,1 50,0z" - - - diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml index 29d1cd53cd..195a107ad8 100644 --- a/res/values-ur/strings.xml +++ b/res/values-ur/strings.xml @@ -76,10 +76,13 @@ "ہوم اسکرین گھمانے کی اجازت دیں" "جب فون گھمایا جاتا ہے" "موجودہ ڈسپلے ترتیب گھمانے کی اجازت نہیں دیتی" + "آئیکن کی بیج سازی" + "سبھی ایپس کیلئے آن ہے" + "تمام ایپس کے لئے بند ہے" "آئیکن کو ہوم اسکرین میں شامل کریں" "نئی ایپس کیلئے" "آئیکن کی شکل تبدیل کریں" - "تبدیل نہ کریں" + "سسٹم ڈیفالٹ کا استعمال کریں" "آئيکن کی شکل کی تبدیلیاں لاگو ہو رہی ہیں" "نامعلوم" "ہٹائیں" @@ -115,4 +118,7 @@ "ویجیٹ کے سائز کو چوڑائی %1$s اونچائی %2$s میں تبدیل کر دیا گیا" "شارٹ کٹس" "%2$s کیلئے %1$d شارٹ کٹس" + "%3$s کے %1$d شارٹ کٹس اور %2$d اطلاعات" + "برخاست کریں" + "اطلاع مسترد ہو گئی" diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml index 81be979cc6..fbd153b5a6 100644 --- a/res/values-uz/strings.xml +++ b/res/values-uz/strings.xml @@ -76,12 +76,14 @@ "Asosiy ekranni aylantirishga ruxsat berish" "Telefon burilganda" "Ekran sozlamalariga ko‘ra uni aylantirib bo‘lmaydi" + "Ikonka ustida nishoncha" + "Barcha ilovalar uchun yoniq" + "Barcha ilovalar uchun o‘chiq" "Bosh ekranga ikonka qo‘shish" "Yangi o‘rnatilgan ilovalar ikonkasini bosh ekranga chiqarish" - - + "Standart tizim parametrlaridan foydalanish" "Noma’lum" @@ -118,4 +120,7 @@ "Vidjetning eni %1$s, bo‘yi %2$s qilib o‘zgartirildi" "Tezkor tugmalar" "%2$s ilovasi uchun %1$d ta tezkor tugma" + "%3$s ilovasi uchun %1$d ta yorliq va %2$d ta bildirishnoma" + "Yopish" + "Bildirishnoma yopildi" diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 5fc9542d1e..626ea99eed 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -76,12 +76,14 @@ "Cho phép xoay Màn hình chính" "Khi xoay điện thoại" "Cài đặt Hiển thị hiện tại không cho phép xoay" + "Gắn huy hiệu biểu tượng" + "Bật cho tất cả ứng dụng" + "Tắt cho tất cả ứng dụng" "Thêm biểu tượng vào màn hình chính" "Cho ứng dụng mới" - - + "Sử dụng mặc định của hệ thống" "Không xác định" @@ -118,4 +120,7 @@ "Đã đổi kích thước tiện ích thành chiều rộng %1$s chiều cao %2$s" "Lối tắt" "%1$d phím tắt cho %2$s" + "%1$d phím tắt và %2$d thông báo cho %3$s" + "Loại bỏ" + "Đã loại bỏ thông báo" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index a6f8bf4d3b..fde198650a 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -29,8 +29,8 @@ "无法使用快捷方式" "主屏幕" "自定义操作" - "触摸并按住小部件即可选择。" - "点按两次并按住小部件即可选择小部件，您也可以使用自定义操作。" + "触摸并按住微件即可选择。" + "点按两次并按住微件即可选择微件，您也可以使用自定义操作。" "%1$d × %2$d" "宽 %1$d，高 %2$d" "触摸并按住即可手动放置" @@ -54,7 +54,7 @@ "写入主屏幕设置和快捷方式" "允许应用更改主屏幕中的设置和快捷方式。" "不允许使用“%1$s”拨打电话" - "加载小部件时出现问题" + "加载微件时出现问题" "设置" "这是系统应用，无法卸载。" "未命名文件夹" @@ -76,12 +76,14 @@ "允许旋转主屏幕" "手机旋转时" "当前的显示设置不允许旋转设备" + "在图标上显示标记" + "已针对所有应用开启" + "已针对所有应用关闭" "将图标添加到主屏幕" "适用于新应用" - - + "使用系统默认设置" "未知" @@ -115,7 +117,10 @@ "增加高度" "减小宽度" "减小高度" - "小部件尺寸已调整为：宽度 %1$s，高度 %2$s" + "微件尺寸已调整为：宽度 %1$s，高度 %2$s" "快捷方式" "%2$s有 %1$d 个快捷方式" + "%3$s的 %1$d 个快捷方式和 %2$d 条通知" + "关闭" + "已关闭通知" diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 867c350ebd..d5cf9971cf 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -76,12 +76,14 @@ "允許主畫面旋轉" "當手機旋轉時" "「目前顯示屏」設定不允許旋轉" + "在圖示上顯示標誌" + "已為所有應用程式開啟" + "已為所有應用程式關閉" "將圖示加到主畫面" "適用於新安裝的應用程式" - - + "使用系統預設設定" "不明" @@ -118,4 +120,7 @@ "已調整小工具的大小至闊 %1$s 高 %2$s" "捷徑" "「%2$s」嘅 %1$d 個捷徑" + "「%3$s」嘅 %1$d 個捷徑同 %2$d 個通知" + "關閉" + "關閉咗通知" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index ee92cf1675..276ddec496 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -76,12 +76,14 @@ "允許旋轉主螢幕" "當手機旋轉時" "目前的顯示設定不允許旋轉畫面" + "在圖示上顯示標記" + "為所有應用程式開啟這項設定" + "為所有應用程式關閉這項設定" "將圖示加到主螢幕" "適用於新安裝的應用程式" - - + "使用系統預設值" "不明" @@ -118,4 +120,7 @@ "已將小工具的寬度和高度分別調整為 %1$s 和 %2$s" "捷徑" "「%2$s」有 %1$d 個捷徑" + "%1$d 個捷徑和 %2$d 則「%3$s」通知" + "關閉" + "已關閉通知" diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index aa918b3f2b..82fd4cfcca 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -76,12 +76,14 @@ "Vumela ukuphendukiswa kwesikrini sasekhaya" "Uma ifoni iphendukiswa" "Isilungiselelo sesiboniso samanje asivumeli ukuzungezisa" + "Ibheji yesithonjana" + "Kuvuliwe kuzo zonke izinhlelo zokusebenza" + "Kuvaliwe kuzo zonke izinhlelo zokusebenza" "Engeza isithonjana eskrinini sasekhaya" "Kwezinhlelo zokusebenza ezintsha" - - + "Sebenzisa okuzenzakalelayo kwesistimu" "Akwaziwa" @@ -118,4 +120,7 @@ "Iwijethi inikezwe usayizi omusha ngobubanzi obungu-%1$s ubude obungu-%2$s" "Izinqamuleli" "%1$d izinqamuleli ze-%2$s" + "%1$d izinqamuleli nezaziso ezingu-%2$d ze-%3$s" + "Cashisa" + "Isaziso sicashisiwe" diff --git a/res/values/colors.xml b/res/values/colors.xml index f148cf2a57..25893088d5 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -35,12 +35,13 @@ #40FFFFFF #FFF - + + #EEEEEE + #FFF #757575 - #EEEEEE - #FFF #E0E0E0 - @color/notification_color_beneath + + #1DE9B6 @android:color/tertiary_text_light diff --git a/res/values/config.xml b/res/values/config.xml index 19966f61c5..5a8da7618a 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -15,23 +15,21 @@ - + - M50,0L100,0 100,100 0,100 0,0z - M50,0L80,0 A20,20,0,0 1 100,20 L100,80 A20,20,0,0 1 80,100 L20,100 A20,20,0,0 1 0,80 L 0,20 A20,20,0,0 1 20,0z - M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z - M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0 - M50,0A50,30 0,0,1 100,30V70A50,30 0,0,1 0,70V30A50,30 0,0,1 50,0z + M50,0L100,0 100,100 0,100 0,0z + M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z + M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0 + M50,0A50,50,0,0 1 100,50 L100,85 A15,15,0,0 1 85,100 L50,100 A50,50,0,0 1 50,0z - + - @string/icon_shape_no_override - Square - Rounded corner rect - Squircle - Circle - Cylinder + @string/icon_shape_system_default + Square + Squircle + Circle + Teardrop @@ -135,4 +133,5 @@ + diff --git a/res/values/dimens.xml b/res/values/dimens.xml index ca74f15afa..bd6466b462 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -150,7 +150,7 @@ 9dp - 208dp + 220dp 56dp 4dp 6dp @@ -159,23 +159,27 @@ 36dp 8dp 16dp - 6dp + 10dp 16dp 10dp 8dp -2dp - - 24dp - - 19dp + 28dp + + 24dp + + 23dp + + 19dp 2dp - - 158dp + + 56dp + + 164dp 24dp - - 12dp + + 16dp 40dp 48dp @@ -196,15 +200,15 @@ 32dp 13sp 12sp - 15sp + 14sp 24dp 18dp 52dp 2dp 18dp - - 15dp + + 19dp 0.5dp 70dp diff --git a/res/values/strings.xml b/res/values/strings.xml index 4bee87d334..1fe33aedfa 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -172,6 +172,12 @@ When phone is rotated Current Display setting doesn\'t permit rotation + + Icon badging + + On for all apps + + Off for all apps Add icon to Home screen @@ -180,8 +186,8 @@ Change icon shape - - Do not change + + Use system default Applying icon shape changes @@ -286,5 +292,13 @@ %1$d shortcuts for %2$s + + %1$d shortcuts and %2$d notifications for %3$s + + + Dismiss + + + Notification dismissed diff --git a/res/xml/launcher_preferences.xml b/res/xml/launcher_preferences.xml index 301bef104d..876388363f 100644 --- a/res/xml/launcher_preferences.xml +++ b/res/xml/launcher_preferences.xml @@ -16,13 +16,6 @@ - - + + + + + + /> + + + diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java index 410d590adc..08cd955a54 100644 --- a/src/com/android/launcher3/BaseActivity.java +++ b/src/com/android/launcher3/BaseActivity.java @@ -39,7 +39,7 @@ public abstract class BaseActivity extends Activity { public final UserEventDispatcher getUserEventDispatcher() { if (mUserEventDispatcher == null) { mUserEventDispatcher = UserEventDispatcher.newInstance(this, - isInMultiWindowModeCompat()); + mDeviceProfile.isLandscape, isInMultiWindowModeCompat()); } return mUserEventDispatcher; } diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index cb40d3d5e0..94c7e07fb2 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -453,7 +453,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver { final int scrollX = getScrollX(); final int scrollY = getScrollY(); canvas.translate(scrollX, scrollY); - mBadgeRenderer.draw(canvas, mIconPalette, mBadgeInfo, mTempIconBounds, mBadgeScale, + mBadgeRenderer.draw(canvas, mBadgeInfo, mTempIconBounds, mBadgeScale, mTempSpaceForBadgeOffset); canvas.translate(-scrollX, -scrollY); } @@ -659,14 +659,6 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver { } } - /** - * Returns true if the view can show custom shortcuts. - */ - public boolean hasDeepShortcuts() { - return !mLauncher.getPopupDataProvider().getShortcutIdsForItem((ItemInfo) getTag()) - .isEmpty(); - } - /** * Interface to be implemented by the grand parent to allow click shadow effect. */ diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index eef578d8fc..2de10030d9 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -4061,8 +4061,8 @@ public class Launcher extends BaseActivity shortcutInfos.add(new KeyboardShortcutInfo(getString(R.string.custom_actions), KeyEvent.KEYCODE_O, KeyEvent.META_CTRL_ON)); } - if (currentFocus instanceof BubbleTextView && - ((BubbleTextView) currentFocus).hasDeepShortcuts()) { + if (currentFocus.getTag() instanceof ItemInfo + && DeepShortcutManager.supportsShortcuts((ItemInfo) currentFocus.getTag())) { shortcutInfos.add(new KeyboardShortcutInfo(getString(R.string.action_deep_shortcut), KeyEvent.KEYCODE_S, KeyEvent.META_CTRL_ON)); } diff --git a/src/com/android/launcher3/LauncherAppWidgetHostView.java b/src/com/android/launcher3/LauncherAppWidgetHostView.java index 61b8a7aa8a..13cc7ba077 100644 --- a/src/com/android/launcher3/LauncherAppWidgetHostView.java +++ b/src/com/android/launcher3/LauncherAppWidgetHostView.java @@ -100,7 +100,7 @@ public class LauncherAppWidgetHostView extends AppWidgetHostView if (Utilities.isAtLeastO()) { try { Method asyncMethod = AppWidgetHostView.class - .getMethod("setAsyncExecutor", Executor.class); + .getMethod("setExecutor", Executor.class); asyncMethod.invoke(this, Utilities.THREAD_POOL_EXECUTOR); } catch (Exception e) { Log.e(TAG, "Unable to set async executor", e); diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 2586764239..b2f628417e 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -1783,17 +1783,15 @@ public class LauncherModel extends BroadcastReceiver } private void loadDeepShortcuts() { - if (!mModelLoaded) { - sBgDataModel.deepShortcutMap.clear(); - DeepShortcutManager shortcutManager = DeepShortcutManager.getInstance(mContext); - mHasShortcutHostPermission = shortcutManager.hasHostPermission(); - if (mHasShortcutHostPermission) { - for (UserHandle user : mUserManager.getUserProfiles()) { - if (mUserManager.isUserUnlocked(user)) { - List shortcuts = - shortcutManager.queryForAllShortcuts(user); - sBgDataModel.updateDeepShortcutMap(null, user, shortcuts); - } + sBgDataModel.deepShortcutMap.clear(); + DeepShortcutManager shortcutManager = DeepShortcutManager.getInstance(mContext); + mHasShortcutHostPermission = shortcutManager.hasHostPermission(); + if (mHasShortcutHostPermission) { + for (UserHandle user : mUserManager.getUserProfiles()) { + if (mUserManager.isUserUnlocked(user)) { + List shortcuts = + shortcutManager.queryForAllShortcuts(user); + sBgDataModel.updateDeepShortcutMap(null, user, shortcuts); } } } diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index d4e3171e51..3150d5b0e3 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -755,7 +755,6 @@ public class LauncherProvider extends ContentProvider { } } case 2: - removeGhostWidgets(db); case 3: // data updated return; diff --git a/src/com/android/launcher3/SettingsActivity.java b/src/com/android/launcher3/SettingsActivity.java index 7ae6b261d6..0902b2029d 100644 --- a/src/com/android/launcher3/SettingsActivity.java +++ b/src/com/android/launcher3/SettingsActivity.java @@ -34,6 +34,11 @@ import com.android.launcher3.graphics.IconShapeOverride; * Settings activity for Launcher. Currently implements the following setting: Allow rotation */ public class SettingsActivity extends Activity { + + private static final String ICON_BADGING_PREFERENCE_KEY = "pref_icon_badging"; + // TODO: use Settings.Secure.NOTIFICATION_BADGING + private static final String NOTIFICATION_BADGING = "notification_badging"; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -50,6 +55,7 @@ public class SettingsActivity extends Activity { public static class LauncherSettingsFragment extends PreferenceFragment { private SystemDisplayRotationLockObserver mRotationLockObserver; + private IconBadgingObserver mIconBadgingObserver; @Override public void onCreate(Bundle savedInstanceState) { @@ -57,13 +63,14 @@ public class SettingsActivity extends Activity { getPreferenceManager().setSharedPreferencesName(LauncherFiles.SHARED_PREFERENCES_KEY); addPreferencesFromResource(R.xml.launcher_preferences); + ContentResolver resolver = getActivity().getContentResolver(); + // Setup allow rotation preference Preference rotationPref = findPreference(Utilities.ALLOW_ROTATION_PREFERENCE_KEY); if (getResources().getBoolean(R.bool.allow_rotation)) { // Launcher supports rotation by default. No need to show this setting. getPreferenceScreen().removePreference(rotationPref); } else { - ContentResolver resolver = getActivity().getContentResolver(); mRotationLockObserver = new SystemDisplayRotationLockObserver(rotationPref, resolver); // Register a content observer to listen for system setting changes while @@ -77,9 +84,18 @@ public class SettingsActivity extends Activity { rotationPref.setDefaultValue(Utilities.getAllowRotationDefaultValue(getActivity())); } + Preference iconBadgingPref = findPreference(ICON_BADGING_PREFERENCE_KEY); if (!BuildCompat.isAtLeastO()) { getPreferenceScreen().removePreference( findPreference(SessionCommitReceiver.ADD_ICON_PREFERENCE_KEY)); + getPreferenceScreen().removePreference(iconBadgingPref); + } else { + // Listen to system notification badge settings while this UI is active. + mIconBadgingObserver = new IconBadgingObserver(iconBadgingPref, resolver); + resolver.registerContentObserver( + Settings.Secure.getUriFor(NOTIFICATION_BADGING), + false, mIconBadgingObserver); + mIconBadgingObserver.onChange(true); } Preference iconShapeOverride = findPreference(IconShapeOverride.KEY_PREFERENCE); @@ -98,6 +114,10 @@ public class SettingsActivity extends Activity { getActivity().getContentResolver().unregisterContentObserver(mRotationLockObserver); mRotationLockObserver = null; } + if (mIconBadgingObserver != null) { + getActivity().getContentResolver().unregisterContentObserver(mIconBadgingObserver); + mIconBadgingObserver = null; + } super.onDestroy(); } } @@ -127,4 +147,29 @@ public class SettingsActivity extends Activity { ? R.string.allow_rotation_desc : R.string.allow_rotation_blocked_desc); } } + + /** + * Content observer which listens for system badging setting changes, + * and updates the launcher badging setting subtext accordingly. + */ + private static class IconBadgingObserver extends ContentObserver { + + private final Preference mBadgingPref; + private final ContentResolver mResolver; + + public IconBadgingObserver(Preference badgingPref, ContentResolver resolver) { + super(new Handler()); + mBadgingPref = badgingPref; + mResolver = resolver; + } + + @Override + public void onChange(boolean selfChange) { + boolean enabled = Settings.Secure.getInt(mResolver, NOTIFICATION_BADGING, 1) == 1; + mBadgingPref.setSummary(enabled + ? R.string.icon_badging_desc_on + : R.string.icon_badging_desc_off); + } + } + } diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 48a62d9812..36f2880cb9 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -75,6 +75,7 @@ import com.android.launcher3.folder.FolderIcon; import com.android.launcher3.graphics.DragPreviewProvider; import com.android.launcher3.graphics.PreloadIconDrawable; import com.android.launcher3.popup.PopupContainerWithArrow; +import com.android.launcher3.shortcuts.ShortcutDragPreviewProvider; import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType; import com.android.launcher3.userevent.nano.LauncherLogProto.Target; import com.android.launcher3.util.ItemInfoMatcher; @@ -2257,6 +2258,8 @@ public class Workspace extends PagedView int previewSize = grid.folderIconSizePx; dragVisualizeOffset = new Point(- halfPadding, halfPadding - child.getPaddingTop()); dragRect = new Rect(0, child.getPaddingTop(), child.getWidth(), previewSize); + } else if (previewProvider instanceof ShortcutDragPreviewProvider) { + dragVisualizeOffset = new Point(- halfPadding, halfPadding); } // Clear the pressed state if necessary @@ -2269,7 +2272,7 @@ public class Workspace extends PagedView mDragSourceInternal = (ShortcutAndWidgetContainer) child.getParent(); } - if (child instanceof BubbleTextView) { + if (child instanceof BubbleTextView && !dragOptions.isAccessibleDrag) { PopupContainerWithArrow popupContainer = PopupContainerWithArrow .showForIcon((BubbleTextView) child); if (popupContainer != null) { @@ -2521,6 +2524,8 @@ public class Workspace extends PagedView } } + boolean droppedOnOriginalCell = false; + int snapScreen = -1; boolean resizeOnDrop = false; if (d.dragSource != this) { @@ -2572,9 +2577,9 @@ public class Workspace extends PagedView minSpanY = item.minSpanY; } - droppedOnOriginalCellDuringTransition = mIsSwitchingState - && item.screenId == screenId && item.container == container + droppedOnOriginalCell = item.screenId == screenId && item.container == container && item.cellX == mTargetCell[0] && item.cellY == mTargetCell[1]; + droppedOnOriginalCellDuringTransition = droppedOnOriginalCell && mIsSwitchingState; // When quickly moving an item, a user may accidentally rearrange their // workspace. So instead we move the icon back safely to its original position. @@ -2709,7 +2714,7 @@ public class Workspace extends PagedView } parent.onDropChild(cell); } - if (d.stateAnnouncer != null) { + if (d.stateAnnouncer != null && !droppedOnOriginalCell) { d.stateAnnouncer.completeAction(R.string.item_moved); } } diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java index a476650c99..70e578163a 100644 --- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java +++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java @@ -37,6 +37,7 @@ import com.android.launcher3.Workspace; import com.android.launcher3.dragndrop.DragController.DragListener; import com.android.launcher3.dragndrop.DragOptions; import com.android.launcher3.folder.Folder; +import com.android.launcher3.shortcuts.DeepShortcutManager; import com.android.launcher3.util.Thunk; import java.util.ArrayList; @@ -104,8 +105,7 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme // If the request came from keyboard, do not add custom shortcuts as that is already // exposed as a direct shortcut - if (!fromKeyboard && host instanceof BubbleTextView - && ((BubbleTextView) host).hasDeepShortcuts()) { + if (!fromKeyboard && DeepShortcutManager.supportsShortcuts(item)) { info.addAction(mActions.get(DEEP_SHORTCUTS)); } diff --git a/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java index b784fe7f84..816121995f 100644 --- a/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java +++ b/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java @@ -18,14 +18,15 @@ package com.android.launcher3.accessibility; import android.view.View; import android.view.accessibility.AccessibilityNodeInfo; +import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction; import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.ItemInfo; import com.android.launcher3.Launcher; -import com.android.launcher3.LauncherModel; import com.android.launcher3.LauncherSettings; import com.android.launcher3.R; import com.android.launcher3.ShortcutInfo; +import com.android.launcher3.notification.NotificationMainView; import com.android.launcher3.shortcuts.DeepShortcutView; import java.util.ArrayList; @@ -36,14 +37,23 @@ import java.util.ArrayList; */ public class ShortcutMenuAccessibilityDelegate extends LauncherAccessibilityDelegate { + private static final int DISMISS_NOTIFICATION = R.id.action_dismiss_notification; + public ShortcutMenuAccessibilityDelegate(Launcher launcher) { super(launcher); + mActions.put(DISMISS_NOTIFICATION, new AccessibilityAction(DISMISS_NOTIFICATION, + launcher.getText(R.string.action_dismiss_notification))); } @Override public void addSupportedActions(View host, AccessibilityNodeInfo info, boolean fromKeyboard) { if ((host.getParent() instanceof DeepShortcutView)) { info.addAction(mActions.get(ADD_TO_WORKSPACE)); + } else if (host instanceof NotificationMainView) { + NotificationMainView notificationView = (NotificationMainView) host; + if (notificationView.canChildBeDismissed(notificationView)) { + info.addAction(mActions.get(DISMISS_NOTIFICATION)); + } } } @@ -74,6 +84,14 @@ public class ShortcutMenuAccessibilityDelegate extends LauncherAccessibilityDele onComplete.run(); } return true; + } else if (action == DISMISS_NOTIFICATION) { + if (!(host instanceof NotificationMainView)) { + return false; + } + NotificationMainView notificationView = (NotificationMainView) host; + notificationView.onChildDismissed(notificationView); + announceConfirmation(R.string.notification_dismissed); + return true; } return false; } diff --git a/src/com/android/launcher3/badge/BadgeRenderer.java b/src/com/android/launcher3/badge/BadgeRenderer.java index ba1977af44..adde4a2fc4 100644 --- a/src/com/android/launcher3/badge/BadgeRenderer.java +++ b/src/com/android/launcher3/badge/BadgeRenderer.java @@ -63,6 +63,7 @@ public class BadgeRenderer { private final Paint mBackgroundPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG); private final SparseArray mBackgroundsWithShadow; + private final IconPalette mIconPalette; public BadgeRenderer(Context context, int iconSizePx) { mContext = context; @@ -82,24 +83,25 @@ public class BadgeRenderer { mTextHeight = tempTextHeight.height(); mBackgroundsWithShadow = new SparseArray<>(3); + + mIconPalette = IconPalette.fromDominantColor(context.getColor(R.color.badge_color)); } /** * Draw a circle in the top right corner of the given bounds, and draw * {@link BadgeInfo#getNotificationCount()} on top of the circle. - * @param palette The colors (based on the icon) to use for the badge. * @param badgeInfo Contains data to draw on the badge. Could be null if we are animating out. * @param iconBounds The bounds of the icon being badged. * @param badgeScale The progress of the animation, from 0 to 1. * @param spaceForOffset How much space is available to offset the badge up and to the right. */ - public void draw(Canvas canvas, IconPalette palette, @Nullable BadgeInfo badgeInfo, + public void draw(Canvas canvas, @Nullable BadgeInfo badgeInfo, Rect iconBounds, float badgeScale, Point spaceForOffset) { - mTextPaint.setColor(palette.textColor); + mTextPaint.setColor(mIconPalette.textColor); IconDrawer iconDrawer = badgeInfo != null && badgeInfo.isIconLarge() ? mLargeIconDrawer : mSmallIconDrawer; Shader icon = badgeInfo == null ? null : badgeInfo.getNotificationIconForBadge( - mContext, palette.backgroundColor, mSize, iconDrawer.mPadding); + mContext, mIconPalette.backgroundColor, mSize, iconDrawer.mPadding); String notificationCount = badgeInfo == null ? "0" : String.valueOf(badgeInfo.getNotificationCount()); int numChars = notificationCount.length(); @@ -125,7 +127,7 @@ public class BadgeRenderer { canvas.translate(badgeCenterX + offsetX, badgeCenterY - offsetY); canvas.scale(badgeScale, badgeScale); // Prepare the background and shadow and possible stacking effect. - mBackgroundPaint.setColorFilter(palette.backgroundColorMatrixFilter); + mBackgroundPaint.setColorFilter(mIconPalette.backgroundColorMatrixFilter); int backgroundWithShadowSize = backgroundWithShadow.getHeight(); // Same as width. boolean shouldStack = !isDot && badgeInfo != null && badgeInfo.getNotificationKeys().size() > 1; @@ -147,7 +149,7 @@ public class BadgeRenderer { -backgroundWithShadowSize / 2, mBackgroundPaint); iconDrawer.drawIcon(icon, canvas); } else if (isDot) { - mBackgroundPaint.setColorFilter(palette.saturatedBackgroundColorMatrixFilter); + mBackgroundPaint.setColorFilter(mIconPalette.saturatedBackgroundColorMatrixFilter); canvas.drawBitmap(backgroundWithShadow, -backgroundWithShadowSize / 2, -backgroundWithShadowSize / 2, mBackgroundPaint); } diff --git a/src/com/android/launcher3/discovery/AppDiscoveryItemView.java b/src/com/android/launcher3/discovery/AppDiscoveryItemView.java index 9bb3b100e1..809d7249db 100644 --- a/src/com/android/launcher3/discovery/AppDiscoveryItemView.java +++ b/src/com/android/launcher3/discovery/AppDiscoveryItemView.java @@ -82,7 +82,7 @@ public class AppDiscoveryItemView extends RelativeLayout { mPrice.setText(info.priceFormatted != null ? info.priceFormatted : ""); mReviewCount.setVisibility(SHOW_REVIEW_COUNT ? View.VISIBLE : View.GONE); if (info.rating >= 0) { - mRatingText.setText(new DecimalFormat("#.#").format(info.rating)); + mRatingText.setText(new DecimalFormat("#.0").format(info.rating)); mRatingView.setRating(info.rating); mRatingView.setVisibility(View.VISIBLE); String reviewCountFormatted = NumberFormat.getInstance().format(info.reviewCount); diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java index 25123fb1da..0b356b52ce 100644 --- a/src/com/android/launcher3/folder/FolderIcon.java +++ b/src/com/android/launcher3/folder/FolderIcon.java @@ -75,7 +75,6 @@ import com.android.launcher3.badge.FolderBadgeInfo; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.dragndrop.DragLayer; import com.android.launcher3.dragndrop.DragView; -import com.android.launcher3.graphics.IconPalette; import com.android.launcher3.util.Thunk; import java.util.ArrayList; @@ -886,7 +885,7 @@ public class FolderIcon extends FrameLayout implements FolderListener { // If we are animating to the accepting state, animate the badge out. float badgeScale = Math.max(0, mBadgeScale - mBackground.getScaleProgress()); mTempSpaceForBadgeOffset.set(getWidth() - mTempBounds.right, mTempBounds.top); - mBadgeRenderer.draw(canvas, IconPalette.FOLDER_ICON_PALETTE, mBadgeInfo, mTempBounds, + mBadgeRenderer.draw(canvas, mBadgeInfo, mTempBounds, badgeScale, mTempSpaceForBadgeOffset); } } diff --git a/src/com/android/launcher3/graphics/IconPalette.java b/src/com/android/launcher3/graphics/IconPalette.java index 0182e53b94..60ca7b236b 100644 --- a/src/com/android/launcher3/graphics/IconPalette.java +++ b/src/com/android/launcher3/graphics/IconPalette.java @@ -49,7 +49,7 @@ public class IconPalette { private IconPalette(int color) { dominantColor = color; - backgroundColor = getMutedColor(dominantColor); + backgroundColor = dominantColor; ColorMatrix backgroundColorMatrix = new ColorMatrix(); Themes.setColorScaleOnMatrix(backgroundColor, backgroundColorMatrix); backgroundColorMatrixFilter = new ColorMatrixColorFilter(backgroundColorMatrix); @@ -176,10 +176,6 @@ public class IconPalette { return ColorUtils.LABToColor(low, a, b); } - private static int getMutedColor(int color) { - return getMutedColor(color, 0.87f); - } - private static int getMutedColor(int color, float whiteScrimAlpha) { int whiteScrim = ColorUtils.setAlphaComponent(Color.WHITE, (int) (255 * whiteScrimAlpha)); return ColorUtils.compositeColors(whiteScrim, color); diff --git a/src/com/android/launcher3/logging/UserEventDispatcher.java b/src/com/android/launcher3/logging/UserEventDispatcher.java index 07e99c6934..258af1689d 100644 --- a/src/com/android/launcher3/logging/UserEventDispatcher.java +++ b/src/com/android/launcher3/logging/UserEventDispatcher.java @@ -62,9 +62,11 @@ public class UserEventDispatcher { private static final boolean IS_VERBOSE = ProviderConfig.IS_DOGFOOD_BUILD && Utilities.isPropertyEnabled(LogConfig.USEREVENT); - public static UserEventDispatcher newInstance(Context context, boolean isInMultiWindowMode) { + public static UserEventDispatcher newInstance(Context context, boolean isInLandscapeMode, + boolean isInMultiWindowMode) { UserEventDispatcher ued = Utilities.getOverrideObject(UserEventDispatcher.class, context.getApplicationContext(), R.string.user_event_dispatcher_class); + ued.mIsInLandscapeMode = isInLandscapeMode; ued.mIsInMultiWindowMode = isInMultiWindowMode; return ued; } @@ -112,6 +114,7 @@ public class UserEventDispatcher { private long mElapsedSessionMillis; private long mActionDurationMillis; private boolean mIsInMultiWindowMode; + private boolean mIsInLandscapeMode; // Used for filling in predictedRank on {@link Target}s. private List mPredictedApps; @@ -296,6 +299,7 @@ public class UserEventDispatcher { } public void dispatchUserEvent(LauncherEvent ev, Intent intent) { + ev.isInLandscapeMode = mIsInLandscapeMode; ev.isInMultiWindowMode = mIsInMultiWindowMode; ev.elapsedContainerMillis = SystemClock.uptimeMillis() - mElapsedContainerMillis; ev.elapsedSessionMillis = SystemClock.uptimeMillis() - mElapsedSessionMillis; @@ -315,6 +319,7 @@ public class UserEventDispatcher { ev.elapsedContainerMillis, ev.elapsedSessionMillis, ev.actionDurationMillis); + log += "\n isInLandscapeMode " + ev.isInLandscapeMode; log += "\n isInMultiWindowMode " + ev.isInMultiWindowMode; Log.d(TAG, log); } diff --git a/src/com/android/launcher3/notification/NotificationFooterLayout.java b/src/com/android/launcher3/notification/NotificationFooterLayout.java index 1eef743fe8..051c0333dc 100644 --- a/src/com/android/launcher3/notification/NotificationFooterLayout.java +++ b/src/com/android/launcher3/notification/NotificationFooterLayout.java @@ -141,6 +141,7 @@ public class NotificationFooterLayout extends FrameLayout { icon.setBackground(info.getIconForBackground(getContext(), mBackgroundColor)); icon.setOnClickListener(info); icon.setTag(info); + icon.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO); mIconRow.addView(icon, 0, mIconLayoutParams); return icon; } diff --git a/src/com/android/launcher3/notification/NotificationItemView.java b/src/com/android/launcher3/notification/NotificationItemView.java index e5bf35a1e3..997def277d 100644 --- a/src/com/android/launcher3/notification/NotificationItemView.java +++ b/src/com/android/launcher3/notification/NotificationItemView.java @@ -21,6 +21,7 @@ import android.app.Notification; import android.content.Context; import android.graphics.Rect; import android.support.annotation.Nullable; +import android.support.v4.content.ContextCompat; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; @@ -76,6 +77,10 @@ public class NotificationItemView extends PopupItemView implements LogContainerP mSwipeHelper.setDisableHardwareLayers(true); } + public NotificationMainView getMainView() { + return mMainView; + } + public int getHeightMinusFooter() { int footerHeight = mFooter.getParent() == null ? 0 : mFooter.getHeight(); return getHeight() - footerHeight; @@ -93,7 +98,7 @@ public class NotificationItemView extends PopupItemView implements LogContainerP if (mNotificationHeaderTextColor == Notification.COLOR_DEFAULT) { mNotificationHeaderTextColor = IconPalette.resolveContrastColor(getContext(), palette.dominantColor, - getResources().getColor(R.color.notification_header_background_color)); + getResources().getColor(R.color.popup_header_background_color)); } mHeaderCount.setTextColor(mNotificationHeaderTextColor); } @@ -157,6 +162,13 @@ public class NotificationItemView extends PopupItemView implements LogContainerP } } + @Override + public int getArrowColor(boolean isArrowAttachedToBottom) { + return ContextCompat.getColor(getContext(), isArrowAttachedToBottom + ? R.color.popup_background_color + : R.color.popup_header_background_color); + } + @Override public void fillInLogContainerData(View v, ItemInfo info, LauncherLogProto.Target target, LauncherLogProto.Target targetParent) { diff --git a/src/com/android/launcher3/notification/NotificationMainView.java b/src/com/android/launcher3/notification/NotificationMainView.java index d6e0272fe2..0d6da77ee1 100644 --- a/src/com/android/launcher3/notification/NotificationMainView.java +++ b/src/com/android/launcher3/notification/NotificationMainView.java @@ -122,7 +122,7 @@ public class NotificationMainView extends FrameLayout implements SwipeHelper.Cal @Override public boolean canChildBeDismissed(View v) { - return mNotificationInfo.dismissable; + return mNotificationInfo != null && mNotificationInfo.dismissable; } @Override diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java index fb7f80cebb..ccead37dc8 100644 --- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java +++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java @@ -25,7 +25,6 @@ import android.animation.ValueAnimator; import android.annotation.TargetApi; import android.content.Context; import android.content.res.Resources; -import android.graphics.Color; import android.graphics.CornerPathEffect; import android.graphics.Paint; import android.graphics.PointF; @@ -115,7 +114,6 @@ public class PopupContainerWithArrow extends AbstractFloatingView implements Dra mStartDragThreshold = getResources().getDimensionPixelSize( R.dimen.deep_shortcuts_start_drag_threshold); - // TODO: make sure the delegate works for all items, not just shortcuts. mAccessibilityDelegate = new ShortcutMenuAccessibilityDelegate(mLauncher); mIsRtl = Utilities.isRtl(getResources()); } @@ -169,8 +167,6 @@ public class PopupContainerWithArrow extends AbstractFloatingView implements Dra final Resources resources = getResources(); final int arrowWidth = resources.getDimensionPixelSize(R.dimen.popup_arrow_width); final int arrowHeight = resources.getDimensionPixelSize(R.dimen.popup_arrow_height); - final int arrowHorizontalOffset = resources.getDimensionPixelSize( - R.dimen.popup_arrow_horizontal_offset); final int arrowVerticalOffset = resources.getDimensionPixelSize( R.dimen.popup_arrow_vertical_offset); @@ -179,7 +175,7 @@ public class PopupContainerWithArrow extends AbstractFloatingView implements Dra // Add dummy views first, and populate with real info when ready. PopupPopulator.Item[] itemsToPopulate = PopupPopulator .getItemsToPopulate(shortcutIds, notificationKeys, systemShortcuts); - addDummyViews(originalIcon, itemsToPopulate, notificationKeys.size() > 1); + addDummyViews(itemsToPopulate, notificationKeys.size() > 1); measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED); orientAboutIcon(originalIcon, arrowHeight + arrowVerticalOffset); @@ -190,7 +186,7 @@ public class PopupContainerWithArrow extends AbstractFloatingView implements Dra mNotificationItemView = null; mShortcutsItemView = null; itemsToPopulate = PopupPopulator.reverseItems(itemsToPopulate); - addDummyViews(originalIcon, itemsToPopulate, notificationKeys.size() > 1); + addDummyViews(itemsToPopulate, notificationKeys.size() > 1); measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED); orientAboutIcon(originalIcon, arrowHeight + arrowVerticalOffset); @@ -207,7 +203,21 @@ public class PopupContainerWithArrow extends AbstractFloatingView implements Dra updateNotificationHeader(); } + int numShortcuts = shortcutViews.size() + systemShortcutViews.size(); + int numNotifications = notificationKeys.size(); + if (numNotifications == 0) { + setContentDescription(getContext().getString(R.string.shortcuts_menu_description, + numShortcuts, originalIcon.getContentDescription().toString())); + } else { + setContentDescription(getContext().getString( + R.string.shortcuts_menu_with_notifications_description, numShortcuts, + numNotifications, originalIcon.getContentDescription().toString())); + } + // Add the arrow. + final int arrowHorizontalOffset = resources.getDimensionPixelSize(isAlignedWithStart() ? + R.dimen.popup_arrow_horizontal_offset_start : + R.dimen.popup_arrow_horizontal_offset_end); mArrow = addArrowView(arrowHorizontalOffset, arrowVerticalOffset, arrowWidth, arrowHeight); mArrow.setPivotX(arrowWidth / 2); mArrow.setPivotY(mIsAboveIcon ? 0 : arrowHeight); @@ -225,8 +235,8 @@ public class PopupContainerWithArrow extends AbstractFloatingView implements Dra systemShortcuts, systemShortcutViews)); } - private void addDummyViews(BubbleTextView originalIcon, - PopupPopulator.Item[] itemTypesToPopulate, boolean notificationFooterHasIcons) { + private void addDummyViews(PopupPopulator.Item[] itemTypesToPopulate, + boolean notificationFooterHasIcons) { final Resources res = getResources(); final int spacing = res.getDimensionPixelSize(R.dimen.popup_items_spacing); final LayoutInflater inflater = mLauncher.getLayoutInflater(); @@ -243,12 +253,14 @@ public class PopupContainerWithArrow extends AbstractFloatingView implements Dra int footerHeight = notificationFooterHasIcons ? res.getDimensionPixelSize(R.dimen.notification_footer_height) : 0; item.findViewById(R.id.footer).getLayoutParams().height = footerHeight; + mNotificationItemView.getMainView().setAccessibilityDelegate(mAccessibilityDelegate); + } else if (itemTypeToPopulate == PopupPopulator.Item.SHORTCUT) { + item.setAccessibilityDelegate(mAccessibilityDelegate); } boolean shouldAddBottomMargin = nextItemTypeToPopulate != null && itemTypeToPopulate.isShortcut ^ nextItemTypeToPopulate.isShortcut; - item.setAccessibilityDelegate(mAccessibilityDelegate); if (itemTypeToPopulate.isShortcut) { if (mShortcutsItemView == null) { mShortcutsItemView = (ShortcutsItemView) inflater.inflate( @@ -266,9 +278,6 @@ public class PopupContainerWithArrow extends AbstractFloatingView implements Dra } } } - // TODO: update this, since not all items are shortcuts - setContentDescription(getContext().getString(R.string.shortcuts_menu_description, - numItems, originalIcon.getContentDescription().toString())); } protected PopupItemView getItemViewAt(int index) { @@ -493,7 +502,11 @@ public class PopupContainerWithArrow extends AbstractFloatingView implements Dra ShapeDrawable arrowDrawable = new ShapeDrawable(TriangleShape.create( width, height, !mIsAboveIcon)); Paint arrowPaint = arrowDrawable.getPaint(); - arrowPaint.setColor(Color.WHITE); + // Note that we have to use getChildAt() instead of getItemViewAt(), + // since the latter expects the arrow which hasn't been added yet. + PopupItemView itemAttachedToArrow = (PopupItemView) + (getChildAt(mIsAboveIcon ? getChildCount() - 1 : 0)); + arrowPaint.setColor(itemAttachedToArrow.getArrowColor(mIsAboveIcon)); // The corner path effect won't be reflected in the shadow, but shouldn't be noticeable. int radius = getResources().getDimensionPixelSize(R.dimen.popup_arrow_corner_radius); arrowPaint.setPathEffect(new CornerPathEffect(radius)); diff --git a/src/com/android/launcher3/popup/PopupItemView.java b/src/com/android/launcher3/popup/PopupItemView.java index a18f650c16..384f554e15 100644 --- a/src/com/android/launcher3/popup/PopupItemView.java +++ b/src/com/android/launcher3/popup/PopupItemView.java @@ -48,7 +48,7 @@ public abstract class PopupItemView extends FrameLayout protected final Rect mPillRect; private float mOpenAnimationProgress; - + protected final boolean mIsRtl; protected View mIconView; private final Paint mBackgroundClipPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG); @@ -75,6 +75,8 @@ public abstract class PopupItemView extends FrameLayout canvas.setBitmap(mRoundedCornerBitmap); canvas.drawArc(0, 0, radius*2, radius*2, 180, 90, true, mBackgroundClipPaint); mBackgroundClipPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.DST_IN)); + + mIsRtl = Utilities.isRtl(getResources()); } @Override @@ -120,7 +122,9 @@ public abstract class PopupItemView extends FrameLayout */ public Animator createOpenAnimation(boolean isContainerAboveIcon, boolean pivotLeft) { Point center = getIconCenter(); - int arrowCenter = getResources().getDimensionPixelSize(R.dimen.popup_arrow_horizontal_center); + int arrowCenter = getResources().getDimensionPixelSize(pivotLeft ^ mIsRtl ? + R.dimen.popup_arrow_horizontal_center_start: + R.dimen.popup_arrow_horizontal_center_end); ValueAnimator openAnimator = new ZoomRevealOutlineProvider(center.x, center.y, mPillRect, this, mIconView, isContainerAboveIcon, pivotLeft, arrowCenter) .createRevealAnimator(this, false); @@ -144,7 +148,9 @@ public abstract class PopupItemView extends FrameLayout public Animator createCloseAnimation(boolean isContainerAboveIcon, boolean pivotLeft, long duration) { Point center = getIconCenter(); - int arrowCenter = getResources().getDimensionPixelSize(R.dimen.popup_arrow_horizontal_center); + int arrowCenter = getResources().getDimensionPixelSize(pivotLeft ^ mIsRtl ? + R.dimen.popup_arrow_horizontal_center_start : + R.dimen.popup_arrow_horizontal_center_end); ValueAnimator closeAnimator = new ZoomRevealOutlineProvider(center.x, center.y, mPillRect, this, mIconView, isContainerAboveIcon, pivotLeft, arrowCenter) .createRevealAnimator(this, true); @@ -177,6 +183,8 @@ public abstract class PopupItemView extends FrameLayout return getResources().getDimensionPixelSize(R.dimen.bg_round_rect_radius); } + public abstract int getArrowColor(boolean isArrowAttachedToBottom); + /** * Extension of {@link PillRevealOutlineProvider} which scales the icon based on the height. */ diff --git a/src/com/android/launcher3/shortcuts/ShortcutsItemView.java b/src/com/android/launcher3/shortcuts/ShortcutsItemView.java index ee64b984a7..5b3b02eac2 100644 --- a/src/com/android/launcher3/shortcuts/ShortcutsItemView.java +++ b/src/com/android/launcher3/shortcuts/ShortcutsItemView.java @@ -20,6 +20,7 @@ import android.animation.Animator; import android.animation.AnimatorSet; import android.content.Context; import android.graphics.Point; +import android.support.v4.content.ContextCompat; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; @@ -109,7 +110,7 @@ public class ShortcutsItemView extends PopupItemView implements View.OnLongClick mIconShift.x = mIconLastTouchPos.x - sv.getIconCenter().x; mIconShift.y = mIconLastTouchPos.y - mLauncher.getDeviceProfile().iconSizePx; - DragView dv = mLauncher.getWorkspace().beginDragShared(sv.getBubbleText(), + DragView dv = mLauncher.getWorkspace().beginDragShared(sv.getIconView(), (PopupContainerWithArrow) getParent(), sv.getFinalInfo(), new ShortcutDragPreviewProvider(sv.getIconView(), mIconShift), new DragOptions()); dv.animateShift(-mIconShift.x, -mIconShift.y); @@ -245,6 +246,14 @@ public class ShortcutsItemView extends PopupItemView implements View.OnLongClick return closeAnimation; } + @Override + public int getArrowColor(boolean isArrowAttachedToBottom) { + return ContextCompat.getColor(getContext(), + isArrowAttachedToBottom || mSystemShortcutIcons == null + ? R.color.popup_background_color + : R.color.popup_header_background_color); + } + @Override public void fillInLogContainerData(View v, ItemInfo info, LauncherLogProto.Target target, LauncherLogProto.Target targetParent) {