diff --git a/WallpaperPicker/res/values-af/strings.xml b/WallpaperPicker/res/values-af/strings.xml index bc87fe1213..c926f48781 100644 --- a/WallpaperPicker/res/values-af/strings.xml +++ b/WallpaperPicker/res/values-af/strings.xml @@ -23,15 +23,20 @@ "Kon nie prent laai nie" "Kon nie prent as muurpapier laai nie" "Kon nie prent as muurpapier stel nie" - - "%1$d gekies" - "%1$d gekies" - "%1$d gekies" - + + %1$d gekies + %1$d gekies + "Muurpapier %1$d van %2$d" "Het %1$s gekies" "Vee uit" "My foto\'s" "Muurpapiere" "Snoei muurpapier" + + + + + + diff --git a/WallpaperPicker/res/values-am/strings.xml b/WallpaperPicker/res/values-am/strings.xml index 23bf538e3c..1b067d4f65 100644 --- a/WallpaperPicker/res/values-am/strings.xml +++ b/WallpaperPicker/res/values-am/strings.xml @@ -23,15 +23,20 @@ "ምስሉን መጫን አልተቻለም" "ምስሉን እንደ ግድግዳ ወረቀት መጫን አልተቻለም" "ምስሉን እንደ ግድግዳ ወረቀት ማዘጋጀት አልተቻለም" - - "%1$d ተመርጧል" - "%1$d ተመርጧል" - "%1$d ተመርጧል" - + + %1$d ተመርጧል + %1$d ተመርጠዋል + "ልጣፍ %1$d የ%2$d" "%1$s ተመርጧል" "ሰርዝ" "የእኔ ፎቶዎች" "የግድግዳ ወረቀቶች" "ልጣፍ ይከርክሙ" + + + + + + diff --git a/WallpaperPicker/res/values-ar/strings.xml b/WallpaperPicker/res/values-ar/strings.xml index db6834c9ad..354b34405a 100644 --- a/WallpaperPicker/res/values-ar/strings.xml +++ b/WallpaperPicker/res/values-ar/strings.xml @@ -23,15 +23,21 @@ "تعذر تحميل الصورة" "تعذر تحميل الصورة كخلفية" "تعذر تعيين الصورة كخلفية" - - "‏تم تحديد %1$d" - "‏تم تحديد %1$d" - "‏تم تحديد %1$d" - + + ‏تم تحديد %1$d + ‏تم تحديد %1$d + ‏تم تحديد %1$d + ‏تم تحديد %1$d + ‏تم تحديد %1$d + ‏تم تحديد %1$d + "‏الخلفية %1$d من %2$d" "تم تحديد %1$s" "حذف" "صوري" "الخلفيات" "اقتصاص الخلفية" + "الشاشة الرئيسية" + "شاشة التأمين" + "الشاشة الرئيسية وشاشة التأمين" diff --git a/WallpaperPicker/res/values-az-rAZ/strings.xml b/WallpaperPicker/res/values-az-rAZ/strings.xml index 883673dd6c..cb894c960a 100644 --- a/WallpaperPicker/res/values-az-rAZ/strings.xml +++ b/WallpaperPicker/res/values-az-rAZ/strings.xml @@ -22,15 +22,21 @@ "Divar kağı seçin" "Şəkli yükləmək alınmadı" "Şəkli divar kağızı olaraq yükləmək alınmadı" - - "%1$d seçilib" - "%1$d seçilib" - "%1$d seçilib" - + "Şəkli divar kağızı olaraq quraşdırmaq alınmadı" + + %1$d seçilib + %1$d seçilib + "Divar kağızı %1$d of %2$d" "%1$s seçilib" "Sil" "Fotolarım" "Divar kağızları" "Divar kağızını kəsin" + + + + + + diff --git a/WallpaperPicker/res/values-b+sr+Latn/strings.xml b/WallpaperPicker/res/values-b+sr+Latn/strings.xml new file mode 100644 index 0000000000..2ac08034e6 --- /dev/null +++ b/WallpaperPicker/res/values-b+sr+Latn/strings.xml @@ -0,0 +1,43 @@ + + + + + "Podesi pozadinu" + "Nije moguće učitati sliku" + "Nije moguće učitati sliku kao pozadinu" + "Učitavanje slike kao pozadine nije uspelo" + + Izabrana je %1$d stavka + Izabrane su %1$d stavke + Izabrano je %1$d stavki + + "Pozadina %1$d od %2$d" + "Izabrana je %1$s" + "Izbriši" + "Moje fotografije" + "Pozadine" + "Opseci pozadinu" + + + + + + + diff --git a/WallpaperPicker/res/values-be-rBY/strings.xml b/WallpaperPicker/res/values-be-rBY/strings.xml new file mode 100644 index 0000000000..c78814a4a2 --- /dev/null +++ b/WallpaperPicker/res/values-be-rBY/strings.xml @@ -0,0 +1,44 @@ + + + + + "Задаць шпалеры" + "Не атрымалася загрузіць відарыс" + "Не атрымалася загрузіць відарыс у якасці шпалер" + "Не атрымалася задаць відарыс як шпалеры" + + %1$d выбраны + %1$d выбраны + %1$d выбраны + %1$d выбраны + + "Шпалеры %1$d з %2$d" + "Выбрана: %1$s" + "Выдаліць" + "Мае фатаграфii" + "Шпалеры" + "Абрэзаць шпалеры" + + + + + + + diff --git a/WallpaperPicker/res/values-bg/strings.xml b/WallpaperPicker/res/values-bg/strings.xml index bf2a83b1ee..bd49629fa7 100644 --- a/WallpaperPicker/res/values-bg/strings.xml +++ b/WallpaperPicker/res/values-bg/strings.xml @@ -23,15 +23,17 @@ "Изображението не можа да бъде заредено" "Изображението не можа да бъде заредено като тапет" "Изображението не можа да бъде зададено като тапет" - - "Избрахте %1$d" - "Избрахте %1$d" - "Избрахте %1$d" - + + Избрахте %1$d + Избрахте %1$d + "Тапет %1$d от %2$d" "Избрахте %1$s" "Изтриване" "Моите снимки" "Тапети" "Подрязване на тапета" + "Начален екран" + "Заключен екран" + "Начален и заключен екран" diff --git a/WallpaperPicker/res/values-bn-rBD/strings.xml b/WallpaperPicker/res/values-bn-rBD/strings.xml index 1c4d3d493c..79a370ec32 100644 --- a/WallpaperPicker/res/values-bn-rBD/strings.xml +++ b/WallpaperPicker/res/values-bn-rBD/strings.xml @@ -23,15 +23,20 @@ "চিত্র লোড করা যায়নি" "ওয়ালপেপার হিসাবে চিত্র লোড করা যায়নি" "ওয়ালপেপার হিসাবে চিত্র সেট করা যায়নি" - - "%1$dটি নির্বাচন করা হয়েছে" - "%1$dটি নির্বাচন করা হয়েছে" - "%1$dটি নির্বাচন করা হয়েছে" - + + %1$dটি নির্বাচন করা হয়েছে + %1$dটি নির্বাচন করা হয়েছে + "%2$dটির মধ্যে %1$dটি ওয়ালপেপার" "%1$s নির্বাচন করা হয়েছে" "মুছুন" "আমার ফটো" "ওয়ালপেপারগুলি" "ওয়ালপেপার কাটছাঁট করুন" + + + + + + diff --git a/WallpaperPicker/res/values-bs-rBA/strings.xml b/WallpaperPicker/res/values-bs-rBA/strings.xml new file mode 100644 index 0000000000..304bc57789 --- /dev/null +++ b/WallpaperPicker/res/values-bs-rBA/strings.xml @@ -0,0 +1,43 @@ + + + + + "Postavi pozadinu" + "Nije moguće učitati sliku" + "Nije moguće učitati sliku kao pozadinu" + "Nije moguće postaviti sliku kao pozadinu" + + odabran je %1$d + odabrana su %1$d + odabrano je %1$d + + "Pozadina %1$d od %2$d" + "Odabrano: %1$s" + "Izbriši" + "Moje fotografije" + "Pozadine" + "Izreži pozadinsku sliku" + + + + + + + diff --git a/WallpaperPicker/res/values-ca/strings.xml b/WallpaperPicker/res/values-ca/strings.xml index 9533ae918c..3110e3486a 100644 --- a/WallpaperPicker/res/values-ca/strings.xml +++ b/WallpaperPicker/res/values-ca/strings.xml @@ -23,15 +23,20 @@ "No s\'ha pogut carregar la imatge." "No s\'ha pogut carregar la imatge com a fons de pantalla." "No s\'ha pogut definir la imatge com a fons de pantalla" - - "Seleccionats: %1$d" - "Seleccionats: %1$d" - "Seleccionats: %1$d" - + + Seleccionats: %1$d + Seleccionats: %1$d + "Fons de pantalla %1$d de %2$d" "S\'ha seleccionat %1$s." "Suprimeix" "Les meves fotos" "Fons de pantalla" "Retallar fons de pantalla" + + + + + + diff --git a/WallpaperPicker/res/values-cs/strings.xml b/WallpaperPicker/res/values-cs/strings.xml index aab8cc8b34..8ec211ae8f 100644 --- a/WallpaperPicker/res/values-cs/strings.xml +++ b/WallpaperPicker/res/values-cs/strings.xml @@ -23,15 +23,22 @@ "Obrázek nelze načíst." "Obrázek nelze načíst jako tapetu." "Obrázek nelze nastavit jako tapetu" - - "Vybráno: %1$d" - "Vybráno: %1$d" - "Vybráno: %1$d" - + + Vybráno: %1$d + Vybráno: %1$d + Vybráno: %1$d + Vybráno: %1$d + "Tapeta %1$d z %2$d" "Vybrána položka %1$s" "Smazat" "Moje fotografie" "Tapety" "Oříznutí tapety" + + + + + + diff --git a/WallpaperPicker/res/values-da/strings.xml b/WallpaperPicker/res/values-da/strings.xml index 10ef5b3da0..58409b8e2e 100644 --- a/WallpaperPicker/res/values-da/strings.xml +++ b/WallpaperPicker/res/values-da/strings.xml @@ -23,15 +23,20 @@ "Billedet kunne ikke indlæses" "Billedet kunne ikke indlæses som baggrund" "Billedet kunne ikke indlæses som baggrund" - - "%1$d er valgt" - "%1$d er valgt" - "%1$d er valgt" - + + %1$d er valgt + %1$d er valgt + "Baggrund %1$d af %2$d" "%1$s blev valgt" "Slet" "Mine billeder" "Baggrunde" "Beskær baggrunden" + + + + + + diff --git a/WallpaperPicker/res/values-de/strings.xml b/WallpaperPicker/res/values-de/strings.xml index be35b736bd..175e6a7f85 100644 --- a/WallpaperPicker/res/values-de/strings.xml +++ b/WallpaperPicker/res/values-de/strings.xml @@ -23,15 +23,20 @@ "Bild konnte nicht geladen werden." "Bild konnte nicht als Hintergrund geladen werden." "Bild konnte nicht als Hintergrund festgelegt werden." - - "%1$d ausgewählt" - "%1$d ausgewählt" - "%1$d ausgewählt" - + + %1$d ausgewählt + %1$d ausgewählt + "Hintergrund %1$d von %2$d" "%1$s ausgewählt" "Löschen" "Meine Fotos" "Hintergründe" "Hintergrund zuschneiden" + + + + + + diff --git a/WallpaperPicker/res/values-el/strings.xml b/WallpaperPicker/res/values-el/strings.xml index 1d799a86d5..4b2963ebcf 100644 --- a/WallpaperPicker/res/values-el/strings.xml +++ b/WallpaperPicker/res/values-el/strings.xml @@ -23,15 +23,20 @@ "Δεν ήταν δυνατή η φόρτωση της εικόνας" "Δεν ήταν δυνατή η φόρτωση της εικόνας ως ταπετσαρία" "Δεν ήταν δυνατός ο ορισμός της εικόνας ως ταπετσαρία" - - "%1$d επιλεγμένα" - "%1$d επιλεγμένα" - "%1$d επιλεγμένα" - + + %1$d επιλεγμένες + %1$d επιλεγμένη + "Ταπετσαρία %1$d από %2$d" "Επιλέχθηκε το %1$s" "Διαγραφή" "Οι φωτογραφίες μου" "Ταπετσαρίες" "Περικοπή ταπετσαρίας" + + + + + + diff --git a/WallpaperPicker/res/values-en-rAU/strings.xml b/WallpaperPicker/res/values-en-rAU/strings.xml index a384ff6083..d9b9cb1470 100644 --- a/WallpaperPicker/res/values-en-rAU/strings.xml +++ b/WallpaperPicker/res/values-en-rAU/strings.xml @@ -23,15 +23,17 @@ "Couldn\'t load image" "Couldn\'t load image as wallpaper" "Couldn\'t set image as wallpaper" - - "%1$d selected" - "%1$d selected" - "%1$d selected" - + + %1$d selected + %1$d selected + "Wallpaper %1$d of %2$d" "Selected %1$s" "Delete" "My photos" "Wallpapers" "Crop wallpaper" + "Home screen" + "Lock screen" + "Home screen and lock screen" diff --git a/WallpaperPicker/res/values-en-rGB/strings.xml b/WallpaperPicker/res/values-en-rGB/strings.xml index a384ff6083..d9b9cb1470 100644 --- a/WallpaperPicker/res/values-en-rGB/strings.xml +++ b/WallpaperPicker/res/values-en-rGB/strings.xml @@ -23,15 +23,17 @@ "Couldn\'t load image" "Couldn\'t load image as wallpaper" "Couldn\'t set image as wallpaper" - - "%1$d selected" - "%1$d selected" - "%1$d selected" - + + %1$d selected + %1$d selected + "Wallpaper %1$d of %2$d" "Selected %1$s" "Delete" "My photos" "Wallpapers" "Crop wallpaper" + "Home screen" + "Lock screen" + "Home screen and lock screen" diff --git a/WallpaperPicker/res/values-en-rIN/strings.xml b/WallpaperPicker/res/values-en-rIN/strings.xml index a384ff6083..d9b9cb1470 100644 --- a/WallpaperPicker/res/values-en-rIN/strings.xml +++ b/WallpaperPicker/res/values-en-rIN/strings.xml @@ -23,15 +23,17 @@ "Couldn\'t load image" "Couldn\'t load image as wallpaper" "Couldn\'t set image as wallpaper" - - "%1$d selected" - "%1$d selected" - "%1$d selected" - + + %1$d selected + %1$d selected + "Wallpaper %1$d of %2$d" "Selected %1$s" "Delete" "My photos" "Wallpapers" "Crop wallpaper" + "Home screen" + "Lock screen" + "Home screen and lock screen" diff --git a/WallpaperPicker/res/values-es-rUS/strings.xml b/WallpaperPicker/res/values-es-rUS/strings.xml index 924ea56155..cb625138ba 100644 --- a/WallpaperPicker/res/values-es-rUS/strings.xml +++ b/WallpaperPicker/res/values-es-rUS/strings.xml @@ -23,15 +23,20 @@ "No se pudo cargar la imagen." "No se pudo cargar la imagen como fondo de pantalla." "No se pudo establecer la imagen como fondo de pantalla" - - "%1$d seleccionado" - "%1$d seleccionado" - "%1$d seleccionados" - + + %1$d seleccionados + %1$d seleccionado + "Fondo de pantalla %1$d de %2$d" "%1$s seleccionado" "Eliminar" "Mis fotos" "Fondos de pantalla" "Recortar fondo de pantalla" + + + + + + diff --git a/WallpaperPicker/res/values-es/strings.xml b/WallpaperPicker/res/values-es/strings.xml index 8ecd3f4c36..121b392ccf 100644 --- a/WallpaperPicker/res/values-es/strings.xml +++ b/WallpaperPicker/res/values-es/strings.xml @@ -23,15 +23,20 @@ "No se ha podido cargar la imagen" "No se ha podido cargar la imagen como fondo de pantalla" "No se ha podido establecer la imagen como fondo de pantalla" - - "Seleccionados: %1$d" - "Seleccionados: %1$d" - "Seleccionados: %1$d" - + + %1$d seleccionados + %1$d seleccionado + "Fondo de pantalla %1$d de %2$d" "%1$s seleccionado" "Eliminar" "Mis fotos" "Fondos de pantalla" "Recortar fondo de pantalla" + + + + + + diff --git a/WallpaperPicker/res/values-et-rEE/strings.xml b/WallpaperPicker/res/values-et-rEE/strings.xml index 59ca7704c4..53be95734c 100644 --- a/WallpaperPicker/res/values-et-rEE/strings.xml +++ b/WallpaperPicker/res/values-et-rEE/strings.xml @@ -23,15 +23,20 @@ "Kujutist ei õnnestunud laadida" "Kujutist ei õnnestunud taustapildina laadida" "Kujutist ei õnnestunud taustapildiks määrata" - - "Valitud on %1$d" - "Valitud on %1$d" - "Valitud on %1$d" - + + Valitud on %1$d + Valitud on %1$d + "%1$d/%2$d taustapildist" "Valitud on %1$s" "Kustuta" "Minu fotod" "Taustapildid" "Taustapildi kärpimine" + + + + + + diff --git a/WallpaperPicker/res/values-eu-rES/strings.xml b/WallpaperPicker/res/values-eu-rES/strings.xml index fb77b1acd5..8eb490cf69 100644 --- a/WallpaperPicker/res/values-eu-rES/strings.xml +++ b/WallpaperPicker/res/values-eu-rES/strings.xml @@ -23,15 +23,20 @@ "Ezin izan da irudia kargatu" "Ezin izan da irudia horma-paper gisa kargatu" "Ezin izan da ezarri irudia horma-paper gisa" - - "%1$d hautatuta" - "%1$d hautatuta" - "%1$d hautatuta" - + + %1$d hautatu dira + %1$d hautatu da + "%1$d/%2$d horma-papera" "%1$s hautatu da" "Ezabatu" "Nire argazkiak" "Horma-paperak" "Ebaki horma-papera" + + + + + + diff --git a/WallpaperPicker/res/values-fa/strings.xml b/WallpaperPicker/res/values-fa/strings.xml index da4b7a10d4..9764e9a9d3 100644 --- a/WallpaperPicker/res/values-fa/strings.xml +++ b/WallpaperPicker/res/values-fa/strings.xml @@ -23,15 +23,20 @@ "تصویر بارگیری نشد" "تصویر به‌عنوان کاغذدیواری بارگیری نشد" "تصویر به‌عنوان کاغذدیواری تنظیم نشد" - - "‏%1$d انتخاب شد" - "‏%1$d انتخاب شد" - "‏%1$d انتخاب شد" - + + ‏%1$d انتخاب شد + ‏%1$d انتخاب شد + "‏کاغذدیواری %1$d از %2$d" "%1$s انتخاب شد" "حذف" "عکس‌های من" "کاغذدیواری‌ها" "برش کاغذدیواری" + + + + + + diff --git a/WallpaperPicker/res/values-fi/strings.xml b/WallpaperPicker/res/values-fi/strings.xml index 3c8f1f538c..7d5a30a18d 100644 --- a/WallpaperPicker/res/values-fi/strings.xml +++ b/WallpaperPicker/res/values-fi/strings.xml @@ -23,15 +23,20 @@ "Kuvan lataus epäonnistui" "Kuvaa ei voitu ladata taustakuvaksi" "Kuvan asettaminen taustakuvaksi epäonnistui." - - "%1$d valittu" - "%1$d valittu" - "%1$d valittu" - + + %1$d valittu + %1$d valittu + "Taustakuva %1$d/%2$d" "Valittu: %1$s" "Poista" "Omat valokuvat" "Taustakuvat" "Rajaa taustakuva" + + + + + + diff --git a/WallpaperPicker/res/values-fr-rCA/strings.xml b/WallpaperPicker/res/values-fr-rCA/strings.xml index ba1d430002..78ed16521a 100644 --- a/WallpaperPicker/res/values-fr-rCA/strings.xml +++ b/WallpaperPicker/res/values-fr-rCA/strings.xml @@ -23,15 +23,20 @@ "Impossible de charger l\'image" "Impossible de charger l\'image comme fond d\'écran" "Impossible d\'utiliser l\'image comme fond d\'écran" - - "%1$d sélectionné" - "%1$d sélectionné" - "%1$d sélectionné(s)" - + + %1$d fond d\'écran sélectionné + %1$d fonds d\'écran sélectionnés + "Fond d\'écran %1$d de %2$d" "Sélection : %1$s" "Supprimer" "Mes photos" "Fonds d\'écran" "Rogner le fond d\'écran" + + + + + + diff --git a/WallpaperPicker/res/values-fr/strings.xml b/WallpaperPicker/res/values-fr/strings.xml index 9f3b525311..8a3ba67a0f 100644 --- a/WallpaperPicker/res/values-fr/strings.xml +++ b/WallpaperPicker/res/values-fr/strings.xml @@ -23,15 +23,20 @@ "Impossible de charger l\'image." "Impossible de charger l\'image comme fond d\'écran." "Impossible de définir l\'image comme fond d\'écran." - - "%1$d élément sélectionné" - "%1$d élément sélectionné" - "%1$d éléments sélectionnés" - + + %1$d fond d\'écran sélectionné + %1$d fonds d\'écran sélectionnés + "Fond d\'écran %1$d sur %2$d" "%1$s sélectionné" "Supprimer" "Mes photos" "Fonds d\'écran" "Recadrer le fond d\'écran" + + + + + + diff --git a/WallpaperPicker/res/values-gl-rES/strings.xml b/WallpaperPicker/res/values-gl-rES/strings.xml index 5805489a7d..4ac52c6151 100644 --- a/WallpaperPicker/res/values-gl-rES/strings.xml +++ b/WallpaperPicker/res/values-gl-rES/strings.xml @@ -23,15 +23,20 @@ "Non se puido cargar a imaxe" "Non se puido cargar a imaxe como fondo de pantalla" "Non se puido definir a imaxe como fondo de pantalla" - - "Seleccionaches %1$d" - "Seleccionaches %1$d" - "Seleccionaches %1$d" - + + Seleccionáronse %1$d elementos + Seleccionouse %1$d elemento + "Fondo de pantalla %1$d de %2$d" "Seleccionaches %1$s" "Eliminar" "As miñas fotos" "Fondos de pantalla" "Recortar fondo de pantalla" + + + + + + diff --git a/WallpaperPicker/res/values-gu-rIN/strings.xml b/WallpaperPicker/res/values-gu-rIN/strings.xml index e201d523f3..48fc6e8a90 100644 --- a/WallpaperPicker/res/values-gu-rIN/strings.xml +++ b/WallpaperPicker/res/values-gu-rIN/strings.xml @@ -22,15 +22,21 @@ "વૉલપેપર સેટ કરો" "છબી લોડ કરી શકાઈ નથી" "વૉલપેપર તરીકે છબી લોડ કરી શકાઈ નથી" - - "%1$d પસંદ કર્યો" - "%1$d પસંદ કર્યો" - "%1$d પસંદ કર્યો" - + "વૉલપેપર તરીકે છબી સેટ કરી શક્યાં નથી" + + %1$d પસંદ કર્યાં + %1$d પસંદ કર્યાં + "%2$d માંથી %1$d વૉલપેપર" "%1$s પસંદ કર્યો" "કાઢી નાખો" "મારા ફોટા" "વૉલપેપર્સ" "વૉલપેપર કાપો" + + + + + + diff --git a/WallpaperPicker/res/values-hi/strings.xml b/WallpaperPicker/res/values-hi/strings.xml index 6f610b5bb5..5b2cd624ea 100644 --- a/WallpaperPicker/res/values-hi/strings.xml +++ b/WallpaperPicker/res/values-hi/strings.xml @@ -23,15 +23,20 @@ "चित्र लोड नहीं किया जा सका" "चित्र को वॉलपेपर के रूप में लोड नहीं किया जा सका" "चित्र को वॉलपेपर के रूप में सेट नहीं किया जा सका" - - "%1$d चयनित" - "%1$d चयनित" - "%1$d चयनित" - + + %1$d चुना गया + %1$d चुने गए + "वॉलपेपर %2$d में से %1$d" "चयनित %1$s" "हटाएं" "मेरी फ़ोटो" "वॉलपेपर" "वॉलपेपर काटें" + + + + + + diff --git a/WallpaperPicker/res/values-hr/strings.xml b/WallpaperPicker/res/values-hr/strings.xml index aaf5e1bcd0..fa98cfabfe 100644 --- a/WallpaperPicker/res/values-hr/strings.xml +++ b/WallpaperPicker/res/values-hr/strings.xml @@ -23,15 +23,21 @@ "Nije moguće učitati sliku" "Nije moguće učitati sliku kao pozadinu" "Postavljanje slike kao pozadine nije uspjelo" - - "Odabrano je %1$d stavki" - "Odabrana je %1$d stavka" - "Odabrano stavki: %1$d" - + + Odabrana je %1$d stavka + Odabrane su %1$d stavke + Odabrano je %1$d stavki + "%1$d. pozadinska slika od %2$d" "Odabrana je %1$s" "Izbriši" "Moje fotografije" "Pozadine" "Obrezivanje pozadinske slike" + + + + + + diff --git a/WallpaperPicker/res/values-hu/strings.xml b/WallpaperPicker/res/values-hu/strings.xml index 06c0952a40..bb59ee33e8 100644 --- a/WallpaperPicker/res/values-hu/strings.xml +++ b/WallpaperPicker/res/values-hu/strings.xml @@ -23,15 +23,20 @@ "A kép betöltése nem sikerült" "A kép betöltése háttérképként nem sikerült" "A kép beállítása háttérképként nem sikerült" - - "%1$d kiválasztva" - "%1$d kiválasztva" - "%1$d kiválasztva" - + + %1$d kiválasztva + %1$d kiválasztva + "%1$d/%2$d. háttérkép" "%1$s kiválasztva" "Törlés" "Saját fotók" "Háttérképek" "Háttérkép körbevágása" + + + + + + diff --git a/WallpaperPicker/res/values-hy-rAM/strings.xml b/WallpaperPicker/res/values-hy-rAM/strings.xml index f68d49f903..8d011c3010 100644 --- a/WallpaperPicker/res/values-hy-rAM/strings.xml +++ b/WallpaperPicker/res/values-hy-rAM/strings.xml @@ -23,15 +23,20 @@ "Չհաջողվեց բեռնել նկարը" "Չհաջողվեց նկարը սահմանել որպես պաստառ" "Չհաջողվեց նկարը դնել որպես պաստառ" - - "%1$d ընտրված" - "%1$d ընտրված" - "%1$d ընտրված" - + + %1$d ընտրված + %1$d ընտրված + "%1$d պաստառ՝ %2$d-ից" "Ընտրված է %1$s" "Ջնջել" "Իմ լուսանկարները" "Պաստառներ" "Եզրատել պաստառը" + + + + + + diff --git a/WallpaperPicker/res/values-in/strings.xml b/WallpaperPicker/res/values-in/strings.xml index 634eb1f765..990a235d82 100644 --- a/WallpaperPicker/res/values-in/strings.xml +++ b/WallpaperPicker/res/values-in/strings.xml @@ -23,15 +23,20 @@ "Tidak dapat memuat gambar" "Tidak dapat memuat gambar sebagai wallpaper" "Tidak dapat menyetel gambar sebagai wallpaper" - - "%1$d dipilih" - "%1$d dipilih" - "%1$d dipilih" - + + %1$d dipilih + %1$d dipilih + "Wallpaper %1$d dari %2$d" "%1$s terpilih" "Hapus" "Foto saya" "Wallpaper" "Pangkas wallpaper" + + + + + + diff --git a/WallpaperPicker/res/values-is-rIS/strings.xml b/WallpaperPicker/res/values-is-rIS/strings.xml index eac44ec2ad..9c1db9fbd3 100644 --- a/WallpaperPicker/res/values-is-rIS/strings.xml +++ b/WallpaperPicker/res/values-is-rIS/strings.xml @@ -23,15 +23,20 @@ "Ekki var hægt að hlaða mynd" "Ekki var hægt að hlaða mynd sem veggfóður" "Ekki var hægt að nota mynd sem veggfóður" - - "%1$d valin" - "%1$d valið" - "%1$d valin" - + + %1$d valið + %1$d valin + "Veggfóður %1$d af %2$d" "%1$s valið" "Eyða" "Myndirnar mínar" "Veggfóður" "Skera veggfóður" + + + + + + diff --git a/WallpaperPicker/res/values-it/strings.xml b/WallpaperPicker/res/values-it/strings.xml index fdb0ce8de7..91430dd9d5 100644 --- a/WallpaperPicker/res/values-it/strings.xml +++ b/WallpaperPicker/res/values-it/strings.xml @@ -23,15 +23,20 @@ "Impossibile caricare l\'immagine" "Impossibile caricare l\'immagine come sfondo" "Impossibile impostare l\'immagine come sfondo" - - "%1$d selezionati" - "%1$d selezionato" - "%1$d selezionati" - + + %1$d selezionati + %1$d selezionato + "Sfondo %1$d di %2$d" "Elemento selezionato: %1$s" "Elimina" "Le mie foto" "Sfondi" "Ritaglia sfondo" + + + + + + diff --git a/WallpaperPicker/res/values-iw/strings.xml b/WallpaperPicker/res/values-iw/strings.xml index c6a583d0e8..72ad4c24c8 100644 --- a/WallpaperPicker/res/values-iw/strings.xml +++ b/WallpaperPicker/res/values-iw/strings.xml @@ -23,15 +23,22 @@ "לא ניתן היה לטעון את התמונה" "לא ניתן היה לטעון את התמונה כטפט" "לא ניתן היה להגדיר את התמונה כטפט" - - "‏%1$d נבחרו" - "‏%1$d נבחרו" - "‏%1$d נבחרו" - + + ‏נבחרו %1$d פריטים + ‏נבחרו %1$d פריטים + ‏נבחרו %1$d פריטים + נבחר פריט אחד + "‏טפט %1$d מתוך %2$d" "בחרת %1$s" "מחק" "התמונות שלי" "טפטים" "חתוך את הטפט" + + + + + + diff --git a/WallpaperPicker/res/values-ja/strings.xml b/WallpaperPicker/res/values-ja/strings.xml index f18da5d429..39e82706b7 100644 --- a/WallpaperPicker/res/values-ja/strings.xml +++ b/WallpaperPicker/res/values-ja/strings.xml @@ -23,15 +23,20 @@ "画像を読み込めませんでした" "画像を壁紙として読み込めませんでした" "画像を壁紙として設定できませんでした" - - "%1$d個選択済み" - "%1$d個選択済み" - "%1$d個選択済み" - + + %1$d 個を選択済み + %1$d 個を選択済み + "壁紙: %1$d/%2$d" "選択: %1$s" "削除" "マイフォト" "壁紙" "壁紙のトリミング" + + + + + + diff --git a/WallpaperPicker/res/values-ka-rGE/strings.xml b/WallpaperPicker/res/values-ka-rGE/strings.xml index 1f652823f7..1cc78cd60b 100644 --- a/WallpaperPicker/res/values-ka-rGE/strings.xml +++ b/WallpaperPicker/res/values-ka-rGE/strings.xml @@ -23,15 +23,20 @@ "სურათი ვერ ჩაიტვირთა." "სურათი ფონად ვერ ჩაიტვირთა." "სურათი ფონად ვერ დაყენდა" - - "არჩეულია %1$d" - "არჩეულია %1$d" - "არჩეულია %1$d" - + + არჩეულია %1$d + არჩეულია %1$d + "ფონი %1$d %2$d-დან" "არჩეული %1$s" "წაშლა" "ჩემი ფოტოები" "ფონები" "ფონის ჩამოჭრა" + + + + + + diff --git a/WallpaperPicker/res/values-kk-rKZ/strings.xml b/WallpaperPicker/res/values-kk-rKZ/strings.xml index 6f4ee7ca2e..c78a8d8eb6 100644 --- a/WallpaperPicker/res/values-kk-rKZ/strings.xml +++ b/WallpaperPicker/res/values-kk-rKZ/strings.xml @@ -23,15 +23,20 @@ "Суретті жүктей алмады" "Суретті артқы фон ретінде жүктей алмады" "Кескінді тұсқағаз ретінде орнату мүмкін болмады" - - "%1$d таңдалған" - "%1$d таңдалған" - "%1$d таңдалған" - + + %1$d таңдалған + %1$d таңдалған + "%1$d артқы фон, барлығы %2$d" "%1$s таңдалған" "Жою" "Менің фотосуреттерім" "Артқы фондар" "Артқы фонды кесу" + + + + + + diff --git a/WallpaperPicker/res/values-km-rKH/strings.xml b/WallpaperPicker/res/values-km-rKH/strings.xml index 801260d3fa..402f28e67c 100644 --- a/WallpaperPicker/res/values-km-rKH/strings.xml +++ b/WallpaperPicker/res/values-km-rKH/strings.xml @@ -23,15 +23,20 @@ "មិន​អាច​ផ្ទុក​រូបភាព" "មិន​អាច​ផ្ទុក​រូបភាព​ជា​ផ្ទាំង​រូបភាព" "មិនអាចកំណត់រូបភាពជាផ្ទាំងរូបភាពទេ" - - "បាន​ជ្រើស %1$d" - "បាន​ជ្រើស %1$d" - "បាន​ជ្រើស %1$d" - + + បានជ្រើស %1$d + បានជ្រើស %1$d + "ផ្ទាំង​រូបភាព %1$d នៃ %2$d" "បាន​ជ្រើស %1$s" "លុប" "រូបថតរបស់ខ្ញុំ" "ផ្ទាំង​រូបភាព" "ច្រឹប​ផ្ទាំង​រូបភាព" + + + + + + diff --git a/WallpaperPicker/res/values-kn-rIN/strings.xml b/WallpaperPicker/res/values-kn-rIN/strings.xml index 7d4d7e70e4..1b467f40a8 100644 --- a/WallpaperPicker/res/values-kn-rIN/strings.xml +++ b/WallpaperPicker/res/values-kn-rIN/strings.xml @@ -23,15 +23,20 @@ "ಚಿತ್ರವನ್ನು ಲೋಡ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ" "ಚಿತ್ರವನ್ನು ವಾಲ್‌ಪೇಪರ್‌ ರೂಪದಲ್ಲಿ ಲೋಡ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ" "ಚಿತ್ರವನ್ನು ವಾಲ್‌ಪೇಪರ್‌ ರೂಪದಲ್ಲಿ ಹೊಂದಿಸಲಾಗಲಿಲ್ಲ" - - "%1$d ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ" - "%1$d ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ" - "%1$d ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ" - + + %1$d ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ + %1$d ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ + "%2$d ರಲ್ಲಿ %1$d ವಾಲ್‌ಪೇಪರ್‌" "%1$s ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ" "ಅಳಿಸು" "ನನ್ನ ಫೋಟೋಗಳು" "ವಾಲ್‌ಪೇಪರ್‌ಗಳು" "ವಾಲ್‌ಪೇಪರ್‌ ಕತ್ತರಿಸಿ" + + + + + + diff --git a/WallpaperPicker/res/values-ko/strings.xml b/WallpaperPicker/res/values-ko/strings.xml index f4072946da..7da91da264 100644 --- a/WallpaperPicker/res/values-ko/strings.xml +++ b/WallpaperPicker/res/values-ko/strings.xml @@ -23,15 +23,17 @@ "이미지를 로드할 수 없습니다." "이미지를 배경화면으로 로드할 수 없습니다." "이미지를 배경화면으로 설정할 수 없습니다." - - "%1$d개 선택됨" - "%1$d개 선택됨" - "%1$d개 선택됨" - + + %1$d개 선택됨 + %1$d개 선택됨 + "배경화면 %1$d/%2$d" "%1$s 선택함" "삭제" "내 사진" "배경화면" "배경화면 잘라내기" + "메인 스크린" + "잠금 화면" + "메인 스크린 및 잠금 화면" diff --git a/WallpaperPicker/res/values-ky-rKG/strings.xml b/WallpaperPicker/res/values-ky-rKG/strings.xml index f53f52b29f..acf8b5ddc4 100644 --- a/WallpaperPicker/res/values-ky-rKG/strings.xml +++ b/WallpaperPicker/res/values-ky-rKG/strings.xml @@ -23,15 +23,20 @@ "Сүрөт жүктөө мүмкүн болбоду" "Сүрөттү тушкагаз катары жүктөө кыйрады" "Сүрөт тушкагаз катары коюлбай койду" - - "%1$d тандалды" - "%1$d тандалды" - "%1$d тандалды" - + + %1$d тандалды + %1$d тандалды + "%2$d ичинен %1$d тушкагаз" "%1$s тандалды" "Жок кылуу" "Менин сүрөттөрүм" "Тушкагаздар" "Тушкагазды тегиздөө" + + + + + + diff --git a/WallpaperPicker/res/values-lo-rLA/strings.xml b/WallpaperPicker/res/values-lo-rLA/strings.xml index 1da6d29c4a..f6bfa1e48d 100644 --- a/WallpaperPicker/res/values-lo-rLA/strings.xml +++ b/WallpaperPicker/res/values-lo-rLA/strings.xml @@ -23,15 +23,17 @@ "ບໍ່ສາມາດໂຫຼດຮູບໄດ້" "ບໍ່ສາມາດໂຫຼດຮູບເປັນພາບພື້ນຫຼັງໄດ້" "ບໍ່ສາມາດໂຫຼດຮູບເປັນພາບພື້ນຫຼັງໄດ້" - - "ເລືອກ %1$d" - "ເລືອກ %1$d" - "ເລືອກ %1$d" - + + ເລືອກ %1$d ແລ້ວ + ເລືອກ %1$d ແລ້ວ + "ພາບພື້ນຫຼັງ %1$d ໃນ %2$d" "ເລືອກ %1$s" "ລຶບ" "ຮູບຂອງຂ້ອຍ" "ພາບພື້ນຫຼັງ" "ຕັດພາບພື້ນຫຼັງ" + "ໜ້າຈໍຫຼັກ" + "ໜ້າຈໍລັອກ" + "ໜ້າຈໍຫຼັກ ແລະ ໜ້າຈໍລັອກ" diff --git a/WallpaperPicker/res/values-lt/strings.xml b/WallpaperPicker/res/values-lt/strings.xml index 98c9a365c4..f9127d828a 100644 --- a/WallpaperPicker/res/values-lt/strings.xml +++ b/WallpaperPicker/res/values-lt/strings.xml @@ -23,15 +23,22 @@ "Nepavyko įkelti vaizdo" "Nepavyko įkelti vaizdo kaip ekrano fono" "Nepavyko nustatyti vaizdo kaip ekrano fono" - - "Pasirinkta: %1$d" - "Pasirinkta: %1$d" - "Pasirinkta: %1$d" - + + Pasirinktas %1$d elementas + Pasirinkti %1$d elementai + Pasirinkta %1$d elemento + Pasirinkta %1$d elementų + "%1$d ekrano fonas iš %2$d" "Pasirinkta: %1$s" "Ištrinti" "Mano nuotraukos" "Ekrano fonai" "Apkirpti ekrano foną" + + + + + + diff --git a/WallpaperPicker/res/values-lv/strings.xml b/WallpaperPicker/res/values-lv/strings.xml index ff7876c72e..d8601dce95 100644 --- a/WallpaperPicker/res/values-lv/strings.xml +++ b/WallpaperPicker/res/values-lv/strings.xml @@ -23,15 +23,21 @@ "Nevarēja ielādēt attēlu." "Nevarēja ielādēt attēlu kā fona tapeti." "Nevarēja iestatīt attēlu kā fona tapeti." - - "Atlasīts: %1$d" - "Atlasīta: %1$d" - "Atlasītas: %1$d" - + + Atlasītas: %1$d + Atlasītas: %1$d + Atlasītas: %1$d + "%1$d. fona tapete no %2$d" "Atlasīta: %1$s" "Dzēst" "Mani fotoattēli" "Fona tapetes" "Apgriezt fona tapeti" + + + + + + diff --git a/WallpaperPicker/res/values-mk-rMK/strings.xml b/WallpaperPicker/res/values-mk-rMK/strings.xml index 13b38cd1d5..c881595181 100644 --- a/WallpaperPicker/res/values-mk-rMK/strings.xml +++ b/WallpaperPicker/res/values-mk-rMK/strings.xml @@ -23,15 +23,20 @@ "Сликата не можеше да се вчита" "Сликата не можеше да се вчита како тапет" "Сликата не може да се постави како тапет" - - "Избрано %1$d" - "Избрано %1$d" - "Избрано %1$d" - + + Избран е %1$d + Избрани се %1$d + "Тапет %1$d од %2$d" "Избран %1$s" "Избриши" "Моите фотографии" "Тапети" "Исечи тапет" + + + + + + diff --git a/WallpaperPicker/res/values-ml-rIN/strings.xml b/WallpaperPicker/res/values-ml-rIN/strings.xml index 5831b36b91..35eb6c0325 100644 --- a/WallpaperPicker/res/values-ml-rIN/strings.xml +++ b/WallpaperPicker/res/values-ml-rIN/strings.xml @@ -23,15 +23,20 @@ "ചിത്രം ലോഡുചെയ്യാനായില്ല" "വാൾപേപ്പറായി ചിത്രം ലോഡുചെയ്യാനായില്ല" "വാൾപേപ്പറായി ചിത്രം ലോഡുചെയ്യാനായില്ല" - - "%1$d തിരഞ്ഞെടുത്തു" - "%1$d തിരഞ്ഞെടുത്തു" - "%1$d തിരഞ്ഞെടുത്തു" - + + %1$d തിരഞ്ഞെടുത്തു + %1$d തിരഞ്ഞെടുത്തു + "%1$d / %2$d വാൾപേപ്പർ" "%1$s തിരഞ്ഞെടുത്തു" "ഇല്ലാതാക്കുക" "എന്റെ ഫോട്ടോകൾ" "വാൾപേപ്പറുകൾ" "വാൾപേപ്പറിന്റെ വലുപ്പം മാറ്റൽ" + + + + + + diff --git a/WallpaperPicker/res/values-mn-rMN/strings.xml b/WallpaperPicker/res/values-mn-rMN/strings.xml index 9995547d55..ca55055d48 100644 --- a/WallpaperPicker/res/values-mn-rMN/strings.xml +++ b/WallpaperPicker/res/values-mn-rMN/strings.xml @@ -23,15 +23,20 @@ "Зургийг ачаалж чадсангүй" "Зургийг ханын зураг болгож ачаалж чадсангүй" "Зургийг ханын зураг болгож чадсангүй" - - "%1$d сонгогдсон" - "%1$d сонгогдсон" - "%1$d сонгогдсон" - + + %1$d-г сонгосон + %1$d-г сонгосон + "%2$d ханын цаасны %1$d нь" "%1$s сонгогдсон" "Устгах" "Миний зураг" "Ханын зураг" "Ханын зургийг тайрах" + + + + + + diff --git a/WallpaperPicker/res/values-mr-rIN/strings.xml b/WallpaperPicker/res/values-mr-rIN/strings.xml index d740fd29e6..3d76d20b48 100644 --- a/WallpaperPicker/res/values-mr-rIN/strings.xml +++ b/WallpaperPicker/res/values-mr-rIN/strings.xml @@ -23,15 +23,20 @@ "प्रतिमा लोड करू शकलो नाही" "वॉलपेपर म्हणून प्रतिमा लोड करू शकलो नाही" "प्रतिमा वॉलपेपर म्हणून सेट करू शकलो नाही" - - "%1$d निवडले" - "%1$d निवडले" - "%1$d निवडले" - + + %1$d निवडला + %1$d निवडले + "%2$d पैकी %1$d वॉलपेपर" "%1$s निवडले" "हटवा" "माझे फोटो" "वॉलपेपर" "वॉलपेपर कापा" + + + + + + diff --git a/WallpaperPicker/res/values-ms-rMY/strings.xml b/WallpaperPicker/res/values-ms-rMY/strings.xml index 759e48cecc..a60ba06d3e 100644 --- a/WallpaperPicker/res/values-ms-rMY/strings.xml +++ b/WallpaperPicker/res/values-ms-rMY/strings.xml @@ -23,15 +23,20 @@ "Tidak dapat memuatkan imej" "Tidak dapat memuatkan imej sebagai kertas dinding" "Tidak dapat menetapkan imej sebagai kertas dinding" - - "%1$d dipilih" - "%1$d dipilih" - "%1$d dipilih" - + + %1$d dipilih + %1$d dipilih + "Kertas dinding %1$d daripada %2$d" "Memilih %1$s" "Padam" "Foto saya" "Kertas dinding" "Pangkas kertas dinding" + + + + + + diff --git a/WallpaperPicker/res/values-my-rMM/strings.xml b/WallpaperPicker/res/values-my-rMM/strings.xml index 5197b98ea3..32d92fae77 100644 --- a/WallpaperPicker/res/values-my-rMM/strings.xml +++ b/WallpaperPicker/res/values-my-rMM/strings.xml @@ -23,15 +23,20 @@ "ပုံရိပ် တင် မရပါ" "ပုံရိပ်အား နောက်ခံအဖြစ် တင် မရပါ" "ပုံရိပ်အား နောက်ခံအဖြစ် တင်၍မရပါ" - - "%1$d ရွေးချယ်ပြီး" - "%1$d ရွေးချယ်ပြီး" - "%1$d ရွေးချယ်ပြီး" - + + %1$d ကို ရွေးချယ်ထားပါသည် + %1$d ကို ရွေးချယ်ထားပါသည် + "နောက်ခံ %1$d မှ %2$d" "ရွေးချယ်ထားသော %1$s" "ဖျက်ပါ" "ကျွန်ုပ်၏ ဓာတ်ပုံများ" "နောက်ခံများ" "နောက်ခံအား ဖြတ်ခြင်း" + + + + + + diff --git a/WallpaperPicker/res/values-nb/strings.xml b/WallpaperPicker/res/values-nb/strings.xml index 8125b53bf0..d9ce2466f5 100644 --- a/WallpaperPicker/res/values-nb/strings.xml +++ b/WallpaperPicker/res/values-nb/strings.xml @@ -23,15 +23,20 @@ "Kunne ikke laste inn bildet" "Kunne ikke laste inn bildet som bakgrunn" "Kunne ikke angi bildet som bakgrunn" - - "%1$d valgt" - "%1$d valgt" - "%1$d valgt" - + + %1$d er valgt + %1$d er valgt + "Bakgrunn %1$d av %2$d" "Valgt %1$s" "Slett" "Mine bilder" "Bakgrunner" "Beskjær bakgrunnen" + + + + + + diff --git a/WallpaperPicker/res/values-ne-rNP/strings.xml b/WallpaperPicker/res/values-ne-rNP/strings.xml index b77a1c5d7b..fca4886d3b 100644 --- a/WallpaperPicker/res/values-ne-rNP/strings.xml +++ b/WallpaperPicker/res/values-ne-rNP/strings.xml @@ -23,15 +23,17 @@ "तस्बिर लोड गर्न सकिएन" "तस्बिरलाई वालपेपरका रूपमा लोड गर्न सकिएन" "छविलाई वालपेपरको रूपमा सेट गर्न सकिएन" - - "%1$d चयन भयो" - "%1$d चयन भयो" - "%1$d चयन भयो" - + + %1$d चयन गरियो + %1$d चयन गरियो + "%2$d को %1$d वालपेपर" "चयन गरिएको %1$s" "मेट्नुहोस्" "मेरा तस्बिरहरू" "वालपेपरहरु" "वालपेपर काँटछाट गर्नुहोस्" + "गृह स्क्रिन" + "लक स्क्रिन" + "गृह स्क्रिन र लक स्क्रिन" diff --git a/WallpaperPicker/res/values-nl/strings.xml b/WallpaperPicker/res/values-nl/strings.xml index dc78305aa3..7246b22d3a 100644 --- a/WallpaperPicker/res/values-nl/strings.xml +++ b/WallpaperPicker/res/values-nl/strings.xml @@ -23,15 +23,20 @@ "Kan afbeelding niet laden" "Kan afbeelding niet laden als achtergrond" "Kan afbeelding niet instellen als achtergrond" - - "%1$d geselecteerd" - "%1$d geselecteerd" - "%1$d geselecteerd" - + + %1$d geselecteerd + %1$d geselecteerd + "Achtergrond %1$d van %2$d" "%1$s is geselecteerd" "Verwijderen" "Mijn foto\'s" "Achtergronden" "Achtergrond bijsnijden" + + + + + + diff --git a/WallpaperPicker/res/values-pa-rIN/strings.xml b/WallpaperPicker/res/values-pa-rIN/strings.xml index e4225e02d4..3532fcb3e9 100644 --- a/WallpaperPicker/res/values-pa-rIN/strings.xml +++ b/WallpaperPicker/res/values-pa-rIN/strings.xml @@ -22,15 +22,21 @@ "ਵਾਲਪੇਪਰ ਸੈਟ ਕਰੋ" "ਚਿੱਤਰ ਲੋਡ ਨਹੀਂ ਕਰ ਸਕਿਆ" "ਵਾਲਪੇਪਰ ਦੇ ਤੌਰ ਤੇ ਚਿੱਤਰ ਲੋਡ ਨਹੀਂ ਕਰ ਸਕਿਆ" - - "%1$d ਚੁਣਿਆ ਗਿਆ" - "%1$d ਚੁਣਿਆ ਗਿਆ" - "%1$d ਚੁਣਿਆ ਗਿਆ" - + "ਵਾਲਪੇਪਰ ਦੇ ਤੌਰ ਤੇ ਚਿੱਤਰ ਸੈਟ ਨਹੀਂ ਕਰ ਸਕਿਆ" + + %1$d ਚੁਣਿਆ ਗਿਆ + %1$d ਚੁਣੇ ਗਏ + "ਵਾਲਪੇਪਰ %2$d ਦਾ %1$d" "%1$s ਚੁਣਿਆ ਗਿਆ" "ਮਿਟਾਓ" "ਮੇਰੀਆਂ ਫੋਟੋਆਂ" "ਵਾਲਪੇਪਰ" "ਵਾਲਪੇਪਰ ਕੱਟੋ" + + + + + + diff --git a/WallpaperPicker/res/values-pl/strings.xml b/WallpaperPicker/res/values-pl/strings.xml index 9693de46c7..98153636ac 100644 --- a/WallpaperPicker/res/values-pl/strings.xml +++ b/WallpaperPicker/res/values-pl/strings.xml @@ -23,15 +23,22 @@ "Nie udało się załadować obrazu" "Nie udało się załadować obrazu jako tapety" "Nie udało się ustawić obrazu jako tapety" - - "Wybranych %1$d" - "Wybrana %1$d" - "Wybrane: %1$d" - + + Wybrano %1$d elementy + Wybrano %1$d elementów + Wybrano %1$d elementu + Wybrano %1$d element + "Tapeta %1$d z %2$d" "Wybrano %1$s" "Usuń" "Moje zdjęcia" "Tapety" "Przytnij tapetę" + + + + + + diff --git a/WallpaperPicker/res/values-pt-rPT/strings.xml b/WallpaperPicker/res/values-pt-rPT/strings.xml index 3c4fa9b731..f64815e4e0 100644 --- a/WallpaperPicker/res/values-pt-rPT/strings.xml +++ b/WallpaperPicker/res/values-pt-rPT/strings.xml @@ -23,15 +23,20 @@ "Não foi possível carregar a imagem" "Não foi possível carregar a imagem como imagem de fundo" "Não foi possível definir a imagem como imagem de fundo" - - "%1$d selecionadas" - "%1$d selecionada" - "%1$d selecionadas" - + + %1$d selecionadas + %1$d selecionada + "Imagem de fundo %1$d de %2$d" "%1$s selecionada" "Eliminar" "As minhas fotos" "Imagens de fundo" "Recortar imagem de fundo" + + + + + + diff --git a/WallpaperPicker/res/values-pt/strings.xml b/WallpaperPicker/res/values-pt/strings.xml index 2520eed3a7..be573ae62c 100644 --- a/WallpaperPicker/res/values-pt/strings.xml +++ b/WallpaperPicker/res/values-pt/strings.xml @@ -23,15 +23,20 @@ "Não foi possível carregar a imagem" "Não foi possível carregar a imagem como plano de fundo" "Não foi possível definir a imagem como plano de fundo" - - "%1$d selecionados" - "%1$d selecionado" - "%1$d selecionados" - + + %1$d selecionados + %1$d selecionados + "Plano de fundo %1$d de %2$d" "%1$s selecionado" "Excluir" "Minhas fotos" "Planos de fundo" "Cortar plano de fundo" + + + + + + diff --git a/WallpaperPicker/res/values-ro/strings.xml b/WallpaperPicker/res/values-ro/strings.xml index f5df3eee22..7594bf75d6 100644 --- a/WallpaperPicker/res/values-ro/strings.xml +++ b/WallpaperPicker/res/values-ro/strings.xml @@ -23,15 +23,21 @@ "Nu s-a putut încărca imaginea" "Nu s-a putut încărca imaginea ca fundal" "Nu s-a putut seta ca imagine de fundal" - - "%1$d selectate" - "%1$d selectată" - "%1$d selectate" - + + %1$d selectate + %1$d selectate + %1$d selectată + "Imaginea de fundal %1$d din %2$d" "S-a selectat %1$s" "Ștergeți" "Fotografiile mele" "Imagini de fundal" "Decupați imaginea de fundal" + + + + + + diff --git a/WallpaperPicker/res/values-ru/strings.xml b/WallpaperPicker/res/values-ru/strings.xml index f8c350a1f8..e8e9972ee1 100644 --- a/WallpaperPicker/res/values-ru/strings.xml +++ b/WallpaperPicker/res/values-ru/strings.xml @@ -23,15 +23,22 @@ "Не удалось загрузить изображение" "Не удалось загрузить изображение" "Не удалось сменить обои" - - "Выбрано: %1$d" - "Выбрано: %1$d" - "Выбрано: %1$d" - + + Выбрано: %1$d + Выбрано: %1$d + Выбрано: %1$d + Выбрано: %1$d + "Обои %1$d из %2$d" "Выбран элемент \"%1$s\"" "Удалить" "Мои фото" "Обои" "Кадрировать обои" + + + + + + diff --git a/WallpaperPicker/res/values-si-rLK/strings.xml b/WallpaperPicker/res/values-si-rLK/strings.xml index 3945bdf89d..ca850891d5 100644 --- a/WallpaperPicker/res/values-si-rLK/strings.xml +++ b/WallpaperPicker/res/values-si-rLK/strings.xml @@ -23,11 +23,10 @@ "පින්තූරය පූරණය කිරීමට නොහැකි විය" "පින්තූරය වෝල්පේපරයක් ලෙස පූරණය කිරීමට නොහැකි විය" "පින්තූරය බිතුපතක් ලෙස සැකසීමට නොහැකි විය" - - "%1$d තෝරා ගන්නා ලදි" - "%1$d තෝරා ගන්නා ලදි" - "%1$d තෝරා ගන්නා ලදි" - + + %1$dක් තෝරා ගන්නා ලදී + %1$dක් තෝරා ගන්නා ලදී + @@ -36,4 +35,7 @@ "මගේ ඡායාරූප" "වෝල්පේපර" "වෝල්පේපරය කප්පාදු කිරීම" + "මුල් පිටු තිරය" + "අගුලු තිරය" + "මුල් පිටු තිරය සහ අගුලු තිරය" diff --git a/WallpaperPicker/res/values-sk/strings.xml b/WallpaperPicker/res/values-sk/strings.xml index fb2c819b27..69aa6f9219 100644 --- a/WallpaperPicker/res/values-sk/strings.xml +++ b/WallpaperPicker/res/values-sk/strings.xml @@ -23,15 +23,22 @@ "Obrázok nie je možné načítať" "Obrázok nie je možné načítať ako tapetu" "Obrázok nie je možné nastaviť ako tapetu" - - "Počet vybratých položiek: %1$d" - "Počet vybratých položiek: %1$d" - "Počet vybratých položiek: %1$d" - + + Počet vybratých položiek: %1$d + Počet vybratých položiek: %1$d + Počet vybratých položiek: %1$d + Počet vybratých položiek: %1$d + "Tapeta %1$d z %2$d" "Vybratá položka %1$s" "Odstrániť" "Moje fotky" "Tapety" "Orezanie tapety" + + + + + + diff --git a/WallpaperPicker/res/values-sl/strings.xml b/WallpaperPicker/res/values-sl/strings.xml index a7ff0891d9..43dea98a0e 100644 --- a/WallpaperPicker/res/values-sl/strings.xml +++ b/WallpaperPicker/res/values-sl/strings.xml @@ -23,15 +23,19 @@ "Slike ni bilo mogoče naložiti" "Slike ni bilo mogoče naložiti kot ozadje" "Slike ni bilo mogoče nastaviti kot ozadje" - - "Št. izbranih: %1$d" - "Št. izbranih: %1$d" - "Št. izbranih: %1$d" - + + %1$d izbrano + %1$d izbrani + %1$d izbrana + %1$d izbranih + "%1$d. ozadje od %2$d" "Izbrano: %1$s" "Izbriši" "Moje fotografije" "Ozadja" "Obrezovanje ozadja" + "Začetni zaslon" + "Zaklenjen zaslon" + "Začetni zaslon in zaklenjen zaslon" diff --git a/WallpaperPicker/res/values-sq-rAL/strings.xml b/WallpaperPicker/res/values-sq-rAL/strings.xml index 8a9983b4bd..c3cac5b1ab 100644 --- a/WallpaperPicker/res/values-sq-rAL/strings.xml +++ b/WallpaperPicker/res/values-sq-rAL/strings.xml @@ -22,15 +22,21 @@ "Cakto imazhin e sfondit" "Nuk mund të ngarkonte imazhin" "Nuk mundi të ngarkonte imazhin si imazh sfondi" - - "Të përzgjedhur: %1$d" - "Të përzgjedhur: %1$d" - "Të përzgjedhur: %1$d" - + "Nuk mundi të vendoste imazhin si imazh sfondi." + + %1$d të zgjedhur + %1$d i zgjedhur + "Imazhi i sfondit: %1$d nga gjithsej %2$d" "%1$s u përzgjodh" "Fshi" "Fotografitë e mia" "Imazhet e sfondit" "Prit imazhin e sfondit" + + + + + + diff --git a/WallpaperPicker/res/values-sr/strings.xml b/WallpaperPicker/res/values-sr/strings.xml index 6154526cda..28dfd920e4 100644 --- a/WallpaperPicker/res/values-sr/strings.xml +++ b/WallpaperPicker/res/values-sr/strings.xml @@ -23,15 +23,21 @@ "Није могуће учитати слику" "Није могуће учитати слику као позадину" "Учитавање слике као позадине није успело" - - "Изабрано је %1$d" - "Изабрана је %1$d" - "Изабраних: %1$d" - + + Изабрана је %1$d ставка + Изабране су %1$d ставке + Изабрано је %1$d ставки + "Позадина %1$d од %2$d" "Изабрана је %1$s" "Избриши" "Моје фотографије" "Позадине" "Опсеци позадину" + + + + + + diff --git a/WallpaperPicker/res/values-sv/strings.xml b/WallpaperPicker/res/values-sv/strings.xml index 38062b9eed..32c0a5a56a 100644 --- a/WallpaperPicker/res/values-sv/strings.xml +++ b/WallpaperPicker/res/values-sv/strings.xml @@ -23,15 +23,20 @@ "Det gick inte att läsa in bilden" "Det gick inte att läsa in bilden som bakgrund" "Det gick inte att ange bilden som bakgrund" - - "%1$d har valts" - "%1$d har valts" - "%1$d har valts" - + + %1$d har valts + %1$d har valts + "Bakgrund %1$d av %2$d" "%1$s har valts" "Ta bort" "Mina foton" "Bakgrunder" "Beskär bakgrund" + + + + + + diff --git a/WallpaperPicker/res/values-sw/strings.xml b/WallpaperPicker/res/values-sw/strings.xml index 729a79a74f..32943215f4 100644 --- a/WallpaperPicker/res/values-sw/strings.xml +++ b/WallpaperPicker/res/values-sw/strings.xml @@ -23,15 +23,20 @@ "Haikuweza kupakia picha" "Haikuweza kupakia picha iwe mandhari" "Haikuweza kuweka picha kuwa mandhari" - - "%1$d zimechaguliwa" - "%1$d zimechaguliwa" - "%1$d zimechaguliwa" - + + %1$d zimechaguliwa + %1$d imechaguliwa + "Mandhari %1$d ya %2$d" "%1$s iliyochaguliwa" "Futa" "Picha zangu" "Mandhari" "Punguza mandhari" + + + + + + diff --git a/WallpaperPicker/res/values-ta-rIN/strings.xml b/WallpaperPicker/res/values-ta-rIN/strings.xml index 69a9d386be..5528072bbf 100644 --- a/WallpaperPicker/res/values-ta-rIN/strings.xml +++ b/WallpaperPicker/res/values-ta-rIN/strings.xml @@ -23,15 +23,20 @@ "படத்தை ஏற்ற முடியவில்லை" "படத்தை வால்பேப்பராக ஏற்ற முடியவில்லை" "படத்தை வால்பேப்பராக அமைக்க முடியவில்லை" - - "%1$d தேர்ந்தெடுக்கப்பட்டன" - "%1$d தேர்ந்தெடுக்கப்பட்டது" - "%1$d தேர்ந்தெடுக்கப்பட்டன" - + + %1$d தேர்ந்தெடுக்கப்பட்டன + %1$d தேர்ந்தெடுக்கப்பட்டது + "வால்பேப்பர் %1$d / %2$d" "%1$s தேர்ந்தெடுக்கப்பட்டது" "நீக்கு" "எனது படங்கள்" "வால்பேப்பர்கள்" "வால்பேப்பரைச் செதுக்கு" + + + + + + diff --git a/WallpaperPicker/res/values-te-rIN/strings.xml b/WallpaperPicker/res/values-te-rIN/strings.xml index 6fb5fa29b1..0c9e9ebdb4 100644 --- a/WallpaperPicker/res/values-te-rIN/strings.xml +++ b/WallpaperPicker/res/values-te-rIN/strings.xml @@ -23,15 +23,20 @@ "చిత్రాన్ని లోడ్ చేయడం సాధ్యపడలేదు" "చిత్రాన్ని వాల్‌పేపర్‌గా లోడ్ చేయడం సాధ్యపడలేదు" "చిత్రాన్ని వాల్‌పేపర్‌గా సెట్ చేయడం సాధ్యపడలేదు" - - "%1$d ఎంచుకోబడింది" - "%1$d ఎంచుకోబడింది" - "%1$d ఎంచుకోబడింది" - + + %1$d ఎంచుకోబడ్డాయి + %1$d ఎంచుకోబడింది + "%2$dలో %1$dవ వాల్‌పేపర్" "%1$s ఎంచుకోబడింది" "తొలగించు" "నా ఫోటోలు" "వాల్‌పేపర్‌లు" "వాల్‌పేపర్‌ను కత్తిరించండి" + + + + + + diff --git a/WallpaperPicker/res/values-th/strings.xml b/WallpaperPicker/res/values-th/strings.xml index c689436060..48aee2a804 100644 --- a/WallpaperPicker/res/values-th/strings.xml +++ b/WallpaperPicker/res/values-th/strings.xml @@ -23,15 +23,20 @@ "ไม่สามารถโหลดรูปภาพ" "ไม่สามารถโหลดรูปภาพเป็นวอลเปเปอร์" "ไม่สามารถตั้งรูปภาพเป็นวอลเปเปอร์" - - "เลือกไว้ %1$d" - "เลือกไว้ %1$d" - "เลือกไว้ %1$d" - + + เลือกไว้ %1$d รายการ + เลือกไว้ %1$d รายการ + "วอลเปเปอร์ %1$d จาก %2$d" "เลือก %1$s แล้ว" "ลบ" "รูปภาพของฉัน" "วอลเปเปอร์" "ครอบตัดวอลเปเปอร์" + + + + + + diff --git a/WallpaperPicker/res/values-tl/strings.xml b/WallpaperPicker/res/values-tl/strings.xml index c760d7f6e3..14bf572363 100644 --- a/WallpaperPicker/res/values-tl/strings.xml +++ b/WallpaperPicker/res/values-tl/strings.xml @@ -23,15 +23,20 @@ "Hindi ma-load ang larawan" "Hindi ma-load ang larawan bilang wallpaper" "Hindi maitakda ang larawan bilang wallpaper" - - "%1$d ang napili" - "%1$d ang napili" - "%1$d ang napili" - + + %1$d ang napili + %1$d ang napili + "Wallpaper %1$d ng %2$d" "Napili ang %1$s" "Tanggalin" "Aking mga larawan" "Mga Wallpaper" "I-crop ang wallpaper" + + + + + + diff --git a/WallpaperPicker/res/values-tr/strings.xml b/WallpaperPicker/res/values-tr/strings.xml index e9dc1d2b29..82c6ef84b6 100644 --- a/WallpaperPicker/res/values-tr/strings.xml +++ b/WallpaperPicker/res/values-tr/strings.xml @@ -23,15 +23,20 @@ "Resim yüklenemedi" "Resim duvar kağıdı olarak yüklenemedi" "Resim, duvar kağıdı olarak ayarlanamadı" - - "%1$d tane seçildi" - "%1$d tane seçildi" - "%1$d tane seçildi" - + + %1$d tane seçildi + %1$d tane seçildi + "%2$d duvar kağıdı arasından duvar kağıdı %1$d" "%1$s seçildi" "Sil" "Fotoğraflarım" "Duvar kağıtları" "Duvar kağıdını kırp" + + + + + + diff --git a/WallpaperPicker/res/values-uk/strings.xml b/WallpaperPicker/res/values-uk/strings.xml index c6669c0c86..b59409a3a9 100644 --- a/WallpaperPicker/res/values-uk/strings.xml +++ b/WallpaperPicker/res/values-uk/strings.xml @@ -23,15 +23,22 @@ "Не вдалося завантажити зображення" "Не вдалося завантажити зображення як фоновий малюнок" "Не вдалося зробити зображення фоновим малюнком" - - "Вибрано %1$d" - "Вибрано %1$d" - "Вибрано %1$d" - + + Вибрано %1$d + Вибрано %1$d + Вибрано %1$d + Вибрано %1$d + "Фоновий малюнок %1$d з %2$d" "Вибрано %1$s" "Видалити" "Мої фото" "Фонові малюнки" "Обрізати фоновий малюнок" + + + + + + diff --git a/WallpaperPicker/res/values-ur-rPK/strings.xml b/WallpaperPicker/res/values-ur-rPK/strings.xml index e240e1a50a..616b36f734 100644 --- a/WallpaperPicker/res/values-ur-rPK/strings.xml +++ b/WallpaperPicker/res/values-ur-rPK/strings.xml @@ -23,15 +23,20 @@ "تصویر کو لوڈ نہیں کیا جا سکا" "تصویر کو وال پیپر کے بطور لوڈ نہیں کیا جا سکا" "تصویر کو بطور وال پیپر سیٹ نہیں کیا جا سکا" - - "‏%1$d کو منتخب کیا گیا" - "‏%1$d کو منتخب کیا گیا" - "‏%1$d کو منتخب کیا گیا" - + + ‏%1$d کا انتخاب ہو گیا + ‏%1$d کا انتخاب ہو گیا + "‏وال پیپر ‎%1$d از ‎%2$d" "%1$s کو منتخب کیا گیا" "حذف کریں" "میری تصاویر" "وال پیپرز" "وال پیپر کو تراشیں" + + + + + + diff --git a/WallpaperPicker/res/values-uz-rUZ/strings.xml b/WallpaperPicker/res/values-uz-rUZ/strings.xml index 5a79981e9d..45c9e98ca6 100644 --- a/WallpaperPicker/res/values-uz-rUZ/strings.xml +++ b/WallpaperPicker/res/values-uz-rUZ/strings.xml @@ -23,15 +23,20 @@ "Rasm yuklanmadi" "Fon rasmi sifatida rasm yuklanmadi" "Rasmni fon rasmi sifatida o‘rnatib bo‘lmadi" - - "%1$d ta tanlandi" - "%1$d ta tanlandi" - "%1$d ta tanlandi" - + + %1$d ta tanlandi + %1$d ta tanlandi + "Fon rasmi %2$ddan %1$d" "%1$s tanlandi" "O‘chirish" "Mening rasmlarim" "Fon rasmlari" "Fon rasmini kesish" + + + + + + diff --git a/WallpaperPicker/res/values-vi/strings.xml b/WallpaperPicker/res/values-vi/strings.xml index a7c636de3a..5aafc060c1 100644 --- a/WallpaperPicker/res/values-vi/strings.xml +++ b/WallpaperPicker/res/values-vi/strings.xml @@ -23,15 +23,20 @@ "Không thể tải hình ảnh" "Không thể tải hình ảnh làm hình nền" "Không thể đặt hình ảnh làm hình nền" - - "Đã chọn %1$d" - "Đã chọn %1$d" - "Đã chọn %1$d" - + + Đã chọn %1$d mục + Đã chọn %1$d mục + "Hình nền %1$d / %2$d" "%1$s được chọn" "Xóa" "Ảnh của tôi" "Hình nền" "Cắt hình nền" + + + + + + diff --git a/WallpaperPicker/res/values-zh-rCN/strings.xml b/WallpaperPicker/res/values-zh-rCN/strings.xml index 4656ec687a..9b9b509cb9 100644 --- a/WallpaperPicker/res/values-zh-rCN/strings.xml +++ b/WallpaperPicker/res/values-zh-rCN/strings.xml @@ -23,15 +23,20 @@ "无法加载图片" "无法加载要设为壁纸的图片" "无法将图片设为壁纸" - - "已选择%1$d项" - "已选择%1$d项" - "已选择%1$d项" - + + 已选择 %1$d 项 + 已选择 %1$d 项 + "第%1$d张壁纸，共%2$d张" "已选择%1$s" "删除" "我的照片" "壁纸" "剪裁壁纸" + + + + + + diff --git a/WallpaperPicker/res/values-zh-rHK/strings.xml b/WallpaperPicker/res/values-zh-rHK/strings.xml index eb9c327347..c3c227143a 100644 --- a/WallpaperPicker/res/values-zh-rHK/strings.xml +++ b/WallpaperPicker/res/values-zh-rHK/strings.xml @@ -23,15 +23,17 @@ "無法載入圖片" "無法載入圖片設為桌布" "無法將圖片設為桌布" - - "已選取 %1$d 張" - "已選取 %1$d 張" - "已選取 %1$d 張" - + + 已選取 %1$d 張 + 已選取 %1$d 張 + "第 %1$d 張桌布，共 %2$d 張" "已選取%1$s" "刪除" "我的相片" "桌布" "裁剪桌布" + "主畫面" + "上鎖畫面" + "主畫面和上鎖畫面" diff --git a/WallpaperPicker/res/values-zh-rTW/strings.xml b/WallpaperPicker/res/values-zh-rTW/strings.xml index fda123c790..b22c6917d5 100644 --- a/WallpaperPicker/res/values-zh-rTW/strings.xml +++ b/WallpaperPicker/res/values-zh-rTW/strings.xml @@ -23,15 +23,20 @@ "無法載入圖片" "無法載入您要設為桌布的圖片" "無法將圖片設為桌布" - - "已選取 %1$d 個" - "已選取 %1$d 個" - "已選取 %1$d 個" - + + 已選取 %1$d 個 + 已選取 %1$d 個 + "第 %1$d 張桌布，共 %2$d 張" "已選取%1$s" "刪除" "我的相片" "桌布" "裁剪桌布" + + + + + + diff --git a/WallpaperPicker/res/values-zu/strings.xml b/WallpaperPicker/res/values-zu/strings.xml index 1a5b95e930..0069293646 100644 --- a/WallpaperPicker/res/values-zu/strings.xml +++ b/WallpaperPicker/res/values-zu/strings.xml @@ -23,15 +23,20 @@ "Ayikwazanga ukulayisha isithombe" "Ayikwazanga ukulayisha isithombe njengesithombe sangemuva" "Ayikwazanga ukusetha isithombe njengesithombe sangemuva" - - "%1$d khethiwe" - "%1$d khethiwe" - "%1$d khethiwe" - + + %1$d okukhethiwe + %1$d okukhethiwe + "Isithombe sangemuva esingu-%1$d kwezingu-%2$d" "I-%1$s ekhethiwe" "Susa" "Izithombe zami" "Izithombe zangemuva" "Nqampuna isithombe sangemuva" + + + + + + diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 1a951f1b7a..b1f85b4635 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -72,10 +72,4 @@ android:visibility="invisible" /> - diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 8bf9d6427c..962b5cea74 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -82,10 +82,4 @@ android:visibility="invisible" /> - diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 2fc62c5008..50daaa9050 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -80,11 +80,4 @@ android:visibility="invisible" /> - - diff --git a/res/layout/launcher_overlay.xml b/res/layout/launcher_overlay.xml deleted file mode 100644 index b35a2d8ae8..0000000000 --- a/res/layout/launcher_overlay.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - diff --git a/res/layout/launcher_overlay_example.xml b/res/layout/launcher_overlay_example.xml deleted file mode 100644 index 7d92d4f0dc..0000000000 --- a/res/layout/launcher_overlay_example.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 6ea6f4af9a..f9e1cfff54 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -71,6 +71,7 @@ "Legstukke" "Muurpapiere" "Instellings" + "Gedeaktiveer deur jou administrateur" "Laat draai toe" "Onbekend" "Verwyder" diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index ad9c7f942b..8bf17f7437 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -71,6 +71,7 @@ "ፍርግሞች" "የግድግዳ ወረቀቶች" "ቅንብሮች" + "በእርስዎ አስተዳዳሪ የተሰናከለ" "ማሽከርከርን ይፍቀዱ" "የማይታወቅ" "አስወግድ" diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 9d2c42b401..ba4def2773 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -71,6 +71,7 @@ "الأدوات" "الخلفيات" "الإعدادات" + "عطَّل المشرف هذه الميزة" "السماح بالتدوير" "غير معروفة" "إزالة" diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml index 52561152f2..476f2ab132 100644 --- a/res/values-az-rAZ/strings.xml +++ b/res/values-az-rAZ/strings.xml @@ -71,6 +71,7 @@ "Vidcet" "Divar kağızları" "Ayarlar" + "Admininiz tərəfindən deaktiv edilib" "Fırlatmağa icazə verin" "Naməlum" "Yığışdır" diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml new file mode 100644 index 0000000000..d2168c2f27 --- /dev/null +++ b/res/values-b+sr+Latn/strings.xml @@ -0,0 +1,107 @@ + + + + + "Launcher3" + + "Work" + "Aplikacija nije instalirana." + "Aplikacija nije dostupna" + "Preuzeta aplikacija je onemogućena u Bezbednom režimu" + "Vidžeti su onemogućeni u Bezbednom režimu" + "Dodirnite i zadržite da biste izabrali vidžet." + "Dvaput dodirnite i zadržite da biste izabrali vidžet ili koristite prilagođene radnje." + "%1$d×%2$d" + "Pretražite aplikacije..." + "Aplikacije se učitavaju..." + "Nije pronađena nijedna aplikacija za „%1$s“" + "Idi na aplikaciju %1$s" + "Nema više prostora na ovom početnom ekranu." + "Nema više prostora na traci Omiljeno" + "Aplikacije" + "Početna" + "Ukloni" + "Deinstaliraj" + "Informacije o aplikaciji" + "instaliranje prečica" + "Dozvoljava aplikaciji da dodaje prečice bez intervencije korisnika." + "čitanje podešavanja i prečica na početnom ekranu" + "Dozvoljava aplikaciji da čita podešavanja i prečice na početnom ekranu." + "upisivanje podešavanja i prečica na početnom ekranu" + "Dozvoljava aplikaciji da menja podešavanja i prečice na početnom ekranu." + "%1$s nema dozvolu za upućivanje telefonskih poziva" + "Problem pri učitavanju vidžeta" + "Podešavanje" + "Ovo je sistemska aplikacija i ne može da se deinstalira." + "Neimenovani direktorijum" + "%1$d. stranica od %2$d" + "%1$d. početni ekran od %2$d" + "Nova stranica početnog ekrana" + "Dobro došli" + "Kopirajte ikone aplikacija" + "Uvesti ikone i direktorijume sa starih početnih ekrana?" + "KOPIRAJTE IKONE" + "POČNITE ISPOČETKA" + "Pozadine, vidžeti i podešavanja" + "Dodirnite i zadržite pozadinu da biste prilagodili" + "VAŽI" + "Direktorijum je otvoren, %1$d puta %2$d" + "Dodirnite da biste zatvorili direktorijum" + "Dodirnite da biste sačuvali promenu imena" + "Direktorijum je zatvoren" + "Direktorijum je preimenovan u %1$s" + "Direktorijum: %1$s" + "Vidžeti" + "Pozadine" + "Podešavanja" + "Administrator je onemogućio" + "Dozvoli rotaciju" + "Nepoznato" + "Ukloni" + "Pretraži" + "Ova aplikacija nije instalirana" + "Aplikacija za ovu ikonu nije instalirana. Možete da je uklonite ili da potražite aplikaciju i instalirate je ručno." + "%1$s se preuzima, završeno je %2$s" + "%1$s čeka na instaliranje" + "Dodaj na početni ekran" + "Premesti stavku ovde" + "Stavka je dodata na početni ekran" + "Stavka je uklonjena" + "Premesti stavku" + "Premesti u red %1$s i kolonu %2$s" + "Premesti na %1$s. poziciju" + "Premesti na %1$s. poziciju u omiljenim" + "Stavka je premeštena" + "Dodaj u direktorijum: %1$s" + "Dodaj u direktorijum u kome je %1$s" + "Stavka je dodata u direktorijum" + "Napravite direktorijum sa: %1$s" + "Direktorijum je napravljen" + "Premesti na početni ekran" + "Pomeri ekran ulevo" + "Pomeri ekran udesno" + "Ekran je pomeren" + "Promeni veličinu" + "Povećaj širinu" + "Povećaj visinu" + "Smanji širinu" + "Smanji visinu" + "Veličina vidžeta je promenjena na širinu %1$s i visinu %2$s" + diff --git a/res/values-be-rBY/strings.xml b/res/values-be-rBY/strings.xml new file mode 100644 index 0000000000..47fbf8c067 --- /dev/null +++ b/res/values-be-rBY/strings.xml @@ -0,0 +1,107 @@ + + + + + "Launcher3" + + "Працоўная" + "Праграма не ўсталявана." + "Праграма недаступная" + "Спампаваная праграма адключана ў Бяспечным рэжыме" + "Віджэты адключаны ў Бяспечным рэжыме" + "Дакраніцеся і ўтрымлiвайце віджэт, каб выбр. яго." + "Дакраніцеся двойчы і ўтрымлівайце, каб выбраць віджэт або выкарыстоўваць карыстальніцкія дзеянні." + "%1$d × %2$d" + "Пошук у Праграмах..." + "Ідзе загрузка праграм…" + "Праграм, якія адпавядаюць запыту \"%1$s\", не знойдзена" + "Перайсці да %1$s" + "На гэтым Галоўным экране больш няма месца." + "У латку \"Абранае\" больш няма месца" + "Праграмы" + "Галоўная" + "Выдаліць" + "Выдаліць" + "Звесткі пра праграму" + "усталёўваць ярлыкі" + "Дазваляе праграмам дадаваць ярлыкі без умяшання карыстальніка." + "счытваць налады і ярлыкі на Галоўнай старонцы" + "Дазваляе праграме счытваць налады і ярлыкі на Галоўнай старонцы." + "запісваць налады і ярлыкі на галоўнай старонцы" + "Дазваляе праграме змяняць налады і ярлыкі на Галоўнай старонцы." + "%1$s не мае дазволу на здзяйсненне тэлефонных званкоў" + "Праблема загрузкі віджэта" + "Наладжванне" + "Гэта сістэмная праграма, яе нельга выдаліць." + "Папка без назвы" + "Старонка %1$d з %2$d" + "Галоўны экран %1$d з %2$d" + "Новая старонка галоўнага экрана" + "Вітаем" + "Скапір. значкі сваіх праграм" + "Імпартаваць значкі і папкі з вашых старых Галоўных экранаў?" + "СКАПІРАВАЦЬ ЗНАЧКІ" + "ПАЧАЦЬ НАНАВА" + "Шпалеры, віджэты і налады" + "Дакраніцеся да любога месца ў фоне экрана і ўтрым. яго, каб дапасаваць" + "ЗРАЗУМЕЛА" + "Папка адкрыта, %1$d на %2$d" + "Дакраніцеся, каб закрыць папку" + "Дакраніцеся, каб захаваць новую назву" + "Папка закрыта" + "Папка перайменавана ў %1$s" + "Папка: %1$s" + "Віджэты" + "Шпалеры" + "Налады" + "Адключаная адміністратарам" + "Дазволіць паварот" + "Невядома" + "Выдаліць" + "Шукаць" + "Гэта праграма не ўсталявана" + "Праграма для гэтага значка не ўсталявана. Вы можаце выдаліць яе або выканаць пошук і ўсталяваць яе ўручную." + "Ідзе спампоўка %1$s, %2$s завершана" + "%1$s чакае ўсталёўкі" + "Дадаць на Галоўны экран" + "Перамясціць элемент сюды" + "Элемент дададзены на галоўны экран" + "Элемент выдалены" + "Перамясціць элемент" + "Перамясціць у радок %1$s слупок %2$s" + "Перамясціць у пазіцыю %1$s" + "Перамясціць у абранае, у пазіцыю %1$s" + "Элемент перамешчаны" + "Дадаць у папку: %1$s" + "Дадаць у папку з %1$s" + "Элемент дададзены ў папку" + "Стварыць папку з: %1$s" + "Папка створана" + "Перамясціць на Галоўны экран" + "Перамясціць экран налева" + "Перамясціць экран направа" + "Экран перамешчаны" + "Змяніць памер" + "Павялічыць шырыню" + "Павялічыць вышыню" + "Паменшыць шырыню" + "Паменшыць вышыню" + "Памеры віджэта зменены на: шырыня %1$s, вышыня %2$s" + diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 9c96cd8eb0..5de4747036 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -71,6 +71,7 @@ "Приспособления" "Тапети" "Настройки" + "Деактивирано от администратора ви" "Разрешаване на завъртането" "Няма информация" "Премахване" diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml index 5a81ed482d..8a7f517222 100644 --- a/res/values-bn-rBD/strings.xml +++ b/res/values-bn-rBD/strings.xml @@ -55,9 +55,9 @@ "%2$dটির %1$d নম্বর হোম স্ক্রীন" "নতুন হোম স্ক্রীনের পৃষ্ঠা" "স্বাগতম" - "আপনার অ্যাপ্লিকেশান আইকনগুলি অনুলিপি করুন" + "আপনার অ্যাপ্লিকেশান আইকনগুলি কপি করুন" "আপনার পুরানো হোম স্ক্রীন থেকে আইকন এবং ফোল্ডারগুলি আমদানি করবেন?" - "আইকনগুলি অনুলিপি করুন" + "আইকনগুলি কপি করুন" "নতুন করে শুরু করুন" "ওয়ালপেপার, উইজেট এবং সেটিংস" "কাস্টমাইজ করার জন্য পটভূমি স্পর্শ করে ধরে থাকুন" @@ -71,6 +71,7 @@ "উইজেটগুলি" "ওয়ালপেপারগুলি" "সেটিংস" + "আপনার প্রশাসক দ্বারা অক্ষম করা হয়েছে" "ঘূর্ণনের অনুমতি দিন" "অজানা" "সরান" diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml new file mode 100644 index 0000000000..f25548a44e --- /dev/null +++ b/res/values-bs-rBA/strings.xml @@ -0,0 +1,107 @@ + + + + + "Launcher3" + + "Posao" + "Aplikacija nije instalirana." + "Aplikacija nije dostupna" + "Preuzeta aplikacija je onemogućena u sigurnom načinu rada" + "Vidžeti su onemogućeni u sigurnom načinu rada." + "Dodirnite & i držite da biste uzeli dodatak." + "Dvaput dodirnite & i držite da biste uzeli vidžet ili koristite prilagođene radnje." + "%1$d × %2$d" + "Pretraži aplikacije" + "Aplikacije se učitavaju…" + "Nije pronađena nijedna aplikacija koja odgovara upitu \"%1$s\"" + "Idite na uslugu %1$s" + "Na ovom početnom ekranu nema više prostora." + "Nema više prostora u ladici Favoriti" + "Aplikacije" + "Tipka za početak" + "Ukloni" + "Ukloni" + "Informacije o aplikaciji" + "instaliraj prečice" + "Dopušta aplikaciji dodavanje prečica bez posredovanja korisnika." + "čitaj postavke na početnom ekranu i prečice" + "Dopušta aplikaciji čitanje postavki i prečica na početnom ekranu." + "zapisuj postavke na početnom ekranu i prečice" + "Dopušta aplikaciji promjenu postavki i prečica na početnom ekranu." + "%1$s nema dozvolu da uspostavlja telefonske pozive" + "Problem pri učitavanju dodatka" + "Postavljanje" + "Ovo je sistemska aplikacija i ne može se deinstalirati." + "Neimenovana fascikla" + "Strana %1$d od %2$d" + "Početni ekran %1$d od %2$d" + "Nova stranica početnog ekrana" + "Dobrodošli" + "Kopirajte ikone aplikacije" + "Uvoz ikone i foldera sa starih početnih ekrana?" + "KOPIRAJ IKONE" + "POČNITE ISPOČETKA" + "Pozadine, vidžeti, & amp; podešavanja" + "Dodirnite & i držite pozadinu za prilagođavanje" + "JASNO MI JE" + "Fascikla je otvorena, (š) %1$d (v) %2$d" + "Dodirnite da biste zatvorili fasciklu" + "Dodirnite da biste sačuvali promjenu imena" + "Fascikla je zatvorena" + "Ime fascikle je promijenjeno u %1$s" + "Fascikla: %1$s" + "Dodaci" + "Pozadine" + "Postavke" + "Onemogućio vaš administrator" + "Dopusti rotaciju" + "Nepoznato" + "Ukloni" + "Traži" + "Ova aplikacija nije instalirana" + "Aplikacija za ovu ikonu nije instalirana. Možete je ukloniti ili potražiti aplikaciju i ručno je instalirati." + "%1$s se preuzima, završeno %2$s" + "%1$s čeka da se instalira" + "Dodaj na početni ekran" + "Premjesti stavku ovdje" + "Stavka je dodana na Početni ekran." + "Stavka je uklonjena" + "Premjesti stavku" + "Pomjeri stavku u red %1$s kolonu %2$s" + "Pomjeri stavku na poziciju %1$s" + "Pomjeri stavku na poziciju %1$s među favoritima" + "Stavka je premještena" + "Dodaj u folder: %1$s" + "Dodaj u folder sa aplikacijom %1$s" + "Stavka je dodana u folder" + "Kreirajte folder sa stavkom: %1$s" + "Folder je kreiran" + "Pomjeri na početni ekran" + "Pomjeri ekran ulijevo" + "Pomjeri ekran udesno" + "Ekran je pomjeren" + "Promijeni veličinu" + "Povećaj širinu" + "Povećaj visinu" + "Smanji širinu" + "Smanji visinu" + "Veličina vidžeta je promijenjena na širinu %1$s visinu %2$s" + diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 05932a95e1..0777e64266 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -71,6 +71,7 @@ "Widgets" "Fons de pantalla" "Configuració" + "Desactivada per l\'administrador" "Permet la rotació" "Desconegut" "Suprimeix" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 373ae83403..baffa1ba41 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -71,6 +71,7 @@ "Widgety" "Tapety" "Nastavení" + "Zakázáno administrátorem" "Povolit otáčení" "Neznámé" "Odstranit" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 3654b72079..13d0873206 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -71,6 +71,7 @@ "Widgets" "Baggrunde" "Indstillinger" + "Deaktiveret af din administrator" "Tillad rotation" "Ukendt" "Fjern" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index a375ecd2e4..9b66be3785 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -71,6 +71,7 @@ "Widgets" "Hintergründe" "Einstellungen" + "Von deinem Administrator deaktiviert" "Drehung zulassen" "Unbekannt" "Entfernen" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 12a315771e..5a1ffc7213 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -71,6 +71,7 @@ "Γραφικά στοιχεία" "Ταπετσαρίες" "Ρυθμίσεις" + "Απενεργοποιήθηκε από τον διαχειριστή σας" "Να επιτρέπεται η περιστροφή" "Άγνωστο" "Κατάργηση" diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index f8873a5742..dff24f8d3c 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -71,6 +71,7 @@ "Widgets" "Wallpapers" "Settings" + "Disabled by your admin" "Allow rotation" "Unknown" "Remove" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index f8873a5742..dff24f8d3c 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -71,6 +71,7 @@ "Widgets" "Wallpapers" "Settings" + "Disabled by your admin" "Allow rotation" "Unknown" "Remove" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index f8873a5742..dff24f8d3c 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -71,6 +71,7 @@ "Widgets" "Wallpapers" "Settings" + "Disabled by your admin" "Allow rotation" "Unknown" "Remove" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index cc58b46d9c..104cae606e 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -71,6 +71,7 @@ "Widgets" "Fondos de pantalla" "Configuración" + "El administrador inhabilitó esta función" "Permitir la rotación" "Desconocido" "Eliminar" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index c9c68545ff..5256dda1f1 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -71,6 +71,7 @@ "Widgets" "Fondos de pantalla" "Ajustes" + "Inhabilitada por el administrador" "Permitir rotación" "Desconocido" "Eliminar" diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml index 053791d520..b9540a516c 100644 --- a/res/values-et-rEE/strings.xml +++ b/res/values-et-rEE/strings.xml @@ -71,6 +71,7 @@ "Vidinad" "Taustapildid" "Seaded" + "Keelas administraator" "Luba pööramine" "Teadmata" "Eemalda" diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml index c85466c43d..8201dd8f98 100644 --- a/res/values-eu-rES/strings.xml +++ b/res/values-eu-rES/strings.xml @@ -71,6 +71,7 @@ "Widgetak" "Horma-paperak" "Ezarpenak" + "Administratzaileak desgaitu du" "Baimendu biratzeko aukera" "Ezezaguna" "Kendu" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 85a379bfe3..73413dc3ee 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -71,6 +71,7 @@ "ابزارک‌ها" "کاغذدیواری‌ها" "تنظیمات" + "توسط سرپرست سیستم غیرفعال شده است" "چرخش مجاز است" "نامشخص" "حذف" diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index c27310b66a..52a47c791c 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -71,6 +71,7 @@ "Widgetit" "Taustakuvat" "Asetukset" + "Järjestelmänvalvoja on poistanut toiminnon käytöstä." "Salli kierto" "Tuntematon" "Poista" diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index bb0f1a01c1..77b11f11f3 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -71,6 +71,7 @@ "Widgets" "Fonds d\'écran" "Paramètres" + "Cette fonction est désactivée par votre administrateur" "Permettre la rotation" "Inconnu" "Supprimer" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index f189c636f0..b9f90bc4b9 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -71,6 +71,7 @@ "Widgets" "Fonds d\'écran" "Paramètres" + "Désactivé par votre administrateur" "Autoriser la rotation" "Inconnu" "Supprimer" diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml index ad25e84984..91e1ac3481 100644 --- a/res/values-gl-rES/strings.xml +++ b/res/values-gl-rES/strings.xml @@ -71,6 +71,7 @@ "Widgets" "Fondos de pantalla" "Configuración" + "Función desactivada polo administrador" "Permitir xiro" "Descoñecido" "Eliminar" diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml index 1cd6768306..51ebdce2e7 100644 --- a/res/values-gu-rIN/strings.xml +++ b/res/values-gu-rIN/strings.xml @@ -71,6 +71,7 @@ "વિજેટ્સ" "વૉલપેપર્સ" "સેટિંગ્સ" + "તમારા વ્યવસ્થાપક દ્વારા અક્ષમ કરેલ" "પરિભ્રમણને મંજૂરી આપો" "અજાણ્યો" "દૂર કરો" diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index d2de54c19b..5d10d3ae44 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -71,6 +71,7 @@ "शॉर्टकट" "वॉलपेपर" "सेटिंग" + "आपके व्यवस्थापक द्वारा अक्षम" "रोटेशन की अनुमति दें" "अज्ञात" "निकालें" diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 427e5c8f9d..cdae4eda0a 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -71,6 +71,7 @@ "Widgeti" "Pozadine" "Postavke" + "Onemogućio administrator" "Dopusti rotaciju" "Nepoznato" "Ukloni" diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index b9a5b6135b..400a426283 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -71,6 +71,7 @@ "Modulok" "Háttérképek" "Beállítások" + "A rendszergazda letiltotta" "Elforgatás engedélyezése" "Ismeretlen" "Eltávolítás" diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml index 74d98d6d47..79bc3304d9 100644 --- a/res/values-hy-rAM/strings.xml +++ b/res/values-hy-rAM/strings.xml @@ -71,6 +71,7 @@ "Վիջեթներ" "Պաստառներ" "Կարգավորումներ" + "Անջատվել է ձեր ադմինիստրատորի կողմից" "Թույլ տալ պարբերական կրկնությունը" "Անհայտ է" "Հեռացնել" diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 1dda24ba8c..a48c56fcd5 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -71,6 +71,7 @@ "Widget" "Wallpaper" "Setelan" + "Dinonaktifkan oleh admin" "Izinkan putaran" "Tidak dikenal" "Buang" diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml index fd6977c3bb..5e2a07a02a 100644 --- a/res/values-is-rIS/strings.xml +++ b/res/values-is-rIS/strings.xml @@ -71,6 +71,7 @@ "Græjur" "Veggfóður" "Stillingar" + "Gert óvirkt af kerfisstjóra" "Leyfa snúning" "Óþekkt" "Fjarlægja" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index a01bc9db84..f41fcc795e 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -71,6 +71,7 @@ "Widget" "Sfondi" "Impostazioni" + "Disattivata dall\'amministratore" "Consenti rotazione" "Sconosciuto" "Rimuovi" diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 137800e708..8d0dc2d1c0 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -71,6 +71,7 @@ "רכיבי ווידג\'ט" "טפטים" "הגדרות" + "הושבת על ידי מנהל המערכת שלך" "אפשרות סיבוב" "לא ידוע" "הסר" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index e3c3194c7c..69ae46e522 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -71,6 +71,7 @@ "ウィジェット" "壁紙" "設定" + "管理者により無効にされています" "回転を許可" "不明" "削除" diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index 288f0ba86b..ea7ee7442a 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -71,6 +71,7 @@ "ვიჯეტები" "ფონები" "პარამეტრები" + "გათიშულია თქვენი ადმინისტრატორის მიერ" "როტაციის დაშვება" "უცნობი" "ამოშლა" diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml index b633790d23..4b41ac941a 100644 --- a/res/values-kk-rKZ/strings.xml +++ b/res/values-kk-rKZ/strings.xml @@ -71,6 +71,7 @@ "Виджеттер" "Артқы фондар" "Параметрлер" + "Әкімші өшірді" "Айналуға рұқсат ету" "Белгісіз" "Алып тастау" diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml index 3cf2599736..f49135b6c7 100644 --- a/res/values-km-rKH/strings.xml +++ b/res/values-km-rKH/strings.xml @@ -71,6 +71,7 @@ "ធាតុ​ក្រាហ្វិក" "ផ្ទាំង​រូបភាព" "ការកំណត់" + "បានបិទដំណើរការដោយអ្នកគ្រប់គ្រងរបស់អ្នក" "អនុញ្ញាតឲ្យបង្វិល" "មិន​ស្គាល់" "លុបចេញ" diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml index 8766d7176d..48729d4f03 100644 --- a/res/values-kn-rIN/strings.xml +++ b/res/values-kn-rIN/strings.xml @@ -71,6 +71,7 @@ "ವಿಜೆಟ್‌ಗಳು" "ವಾಲ್‌ಪೇಪರ್‌ಗಳು" "ಸೆಟ್ಟಿಂಗ್‌ಗಳು" + "ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದ್ದಾರೆ" "ತಿರುಗಿಸುವಿಕೆಯನ್ನು ಅನುಮತಿಸಿ" "ಅಜ್ಞಾತ" "ತೆಗೆದುಹಾಕಿ" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index be5b506f3c..aa5719fc9e 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -71,6 +71,7 @@ "위젯" "배경화면" "설정" + "관리자가 사용 중지함" "회전 허용" "알 수 없음" "삭제" diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml index 0d7cb486b1..5d4c8a35b1 100644 --- a/res/values-ky-rKG/strings.xml +++ b/res/values-ky-rKG/strings.xml @@ -71,6 +71,7 @@ "Виджеттер" "Тушкагаздар" "Тууралоолор" + "Администраторуңуз өчүрүп койгон" "Айлантууга уруксат берүү" "Белгисиз" "Алып салуу" diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml index 8ed9c263e9..e93a7e648a 100644 --- a/res/values-lo-rLA/strings.xml +++ b/res/values-lo-rLA/strings.xml @@ -71,6 +71,7 @@ "ວິດເຈັດ" "ພາບພື້ນຫຼັງ" "ການຕັ້ງຄ່າ" + "ຖືກປິດການນຳໃຊ້ໂດຍຜູ້ເບິ່ງແຍງລະບົບຂອງທ່ານ" "ອະ​ນຸ​ຍາດ​ການ​ໝຸນ" "​ບໍ່​ຮູ້​ຈັກ" "ລຶບ​" diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index f20751a558..f9a1a096f5 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -71,6 +71,7 @@ "Valdikliai" "Ekrano fonai" "Nustatymai" + "Išjungė administratorius" "Leisti kaitaliojimą" "Nežinoma" "Pašalinti" diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 7e76374506..d9b59ada62 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -71,6 +71,7 @@ "Logrīki" "Fona tapetes" "Iestatījumi" + "Atspējojis administrators" "Rotācijas atļauja" "Nezināma" "Noņemt" diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml index 73a9d95394..a1bf843282 100644 --- a/res/values-mk-rMK/strings.xml +++ b/res/values-mk-rMK/strings.xml @@ -71,6 +71,7 @@ "Виџети" "Тапети" "Поставки" + "Оневозможено од администраторот" "Дозволи ротација" "Непознато" "Отстрани" diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml index 1169be2c4f..09a5fc71fb 100644 --- a/res/values-ml-rIN/strings.xml +++ b/res/values-ml-rIN/strings.xml @@ -71,6 +71,7 @@ "വിജറ്റുകൾ" "വാൾപേപ്പറുകൾ" "ക്രമീകരണങ്ങൾ" + "അഡ്മിൻ പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നു" "തിരിക്കൽ അനുവദിക്കുക" "അജ്ഞാതം" "നീക്കംചെയ്യുക" diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml index 46f46fada5..c4bef0b328 100644 --- a/res/values-mn-rMN/strings.xml +++ b/res/values-mn-rMN/strings.xml @@ -71,6 +71,7 @@ "Виджет" "Ханын зураг" "Тохиргоо" + "Таны админ идэвхгүй болгосон" "Эргүүлэхийг зөвшөөрөх" "Тодорхойгүй" "Устгах" diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml index 5d29197601..e9e561f042 100644 --- a/res/values-mr-rIN/strings.xml +++ b/res/values-mr-rIN/strings.xml @@ -71,6 +71,7 @@ "विजेट" "वॉलपेपर" "सेटिंग्ज" + "आपल्या प्रशासकाने अक्षम केले" "फिरविण्‍यास अनुमती द्या" "अज्ञात" "काढा" diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml index 5da433184a..423cba400d 100644 --- a/res/values-ms-rMY/strings.xml +++ b/res/values-ms-rMY/strings.xml @@ -71,6 +71,7 @@ "Widget" "Kertas dinding" "Tetapan" + "Dilumpuhkan oleh pentadbir anda" "Benarkan putaran" "Tidak diketahui" "Alih keluar" diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml index 0264c98df8..fade6b8f0a 100644 --- a/res/values-my-rMM/strings.xml +++ b/res/values-my-rMM/strings.xml @@ -71,6 +71,7 @@ "ဝဒ်ဂျက်များ" "နောက်ခံများ" "အပြင်အဆင်များ" + "သင့်စီမံခန့်ခွဲသူက ပိတ်လိုက်ပါသည်" "လှည့်ရန် ခွင့်ပြုမည်" "မသိရ" "ဖယ်ရှားရန်" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 7b5f3b6f49..934a5d0c21 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -71,6 +71,7 @@ "Moduler" "Bakgrunner" "Innstillinger" + "Administratoren har slått av funksjonen" "Tillat rotasjon" "Ukjent" "Fjern" diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml index 2abf0050cc..f4f46d804e 100644 --- a/res/values-ne-rNP/strings.xml +++ b/res/values-ne-rNP/strings.xml @@ -71,6 +71,7 @@ "विजेटहरू" "वालपेपरहरु" "सेटिंङहरू" + "तपाईँको प्रशासकद्वारा असक्षम गरिएको" "परिक्रमणलाई अनुमति दिनुहोस्" "अज्ञात" "हटाउनुहोस्" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index a55aebf8d3..58ab411234 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -40,7 +40,7 @@ "Verwijderen" "Deïnstalleren" "App-info" - "Snelkoppelingen instellen" + "Snelle links instellen" "Een app toestaan snelkoppelingen toe te voegen zonder tussenkomst van de gebruiker." "instellingen en snelkoppelingen op de startpagina lezen" "De app toestaan de instellingen en snelkoppelingen op de startpagina te lezen." @@ -71,6 +71,7 @@ "Widgets" "Achtergronden" "Instellingen" + "Uitgeschakeld door je beheerder" "Draaien toestaan" "Onbekend" "Verwijderen" diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml index 6f5acff584..1b3243b4bc 100644 --- a/res/values-pa-rIN/strings.xml +++ b/res/values-pa-rIN/strings.xml @@ -71,6 +71,7 @@ "ਵਿਜੇਟਸ" "ਵਾਲਪੇਪਰ" "ਸੈਟਿੰਗਾਂ" + "ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਦੁਆਰਾ ਅਯੋਗ ਬਣਾਈ ਗਈ" "ਰੋਟੇਸ਼ਨ ਦੀ ਆਗਿਆ ਦਿਓ" "ਅਗਿਆਤ" "ਹਟਾਓ" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index ab70265537..43e4947398 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -71,6 +71,7 @@ "Widżety" "Tapety" "Ustawienia" + "Funkcja wyłączona przez administratora" "Zezwól na obrót" "Brak informacji" "Usuń" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 8a469ac7fe..633800302a 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -71,6 +71,7 @@ "Widgets" "Imagens de fundo" "Definições" + "Desativada pelo administrador" "Permitir rotação" "Desconhecido" "Remover" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index d9fbdef587..a8562a4952 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -60,7 +60,7 @@ "COPIAR ÍCONES" "COMEÇAR DO ZERO" "Plano de fundo, widgets e configurações" - "Toque e mantenha pressionado o segundo plano para personalizar" + "Toque no segundo plano e mantenha pressionado para personalizar" "ENTENDI" "Pasta aberta, %1$d por %2$d" "Toque para fechar a pasta" @@ -71,6 +71,7 @@ "Widgets" "Planos de fundo" "Configurações" + "Desativado pelo administrador" "Permitir rotação" "Desconhecido" "Remover" diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 8c715f8bfe..bc8b0abf6f 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -71,6 +71,7 @@ "Widgeturi" "Imagini de fundal" "Setări" + "Dezactivată de administrator" "Permiteți rotirea" "Necunoscut" "Eliminați" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index b4ddae7e74..4a2cb61d85 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -71,6 +71,7 @@ "Виджеты" "Обои" "Настройки" + "Функция отключена администратором" "Разрешить автоповорот" "Неизвестно" "Удалить" diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml index 1fd7df05f6..a072ceee2c 100644 --- a/res/values-si-rLK/strings.xml +++ b/res/values-si-rLK/strings.xml @@ -71,6 +71,7 @@ "විජට්" "වෝල්පේපර" "සැකසීම්" + "ඔබගේ පරිපාලක විසින් අබල කරන ලදී" "කරකැවීමට ඉඩ දෙන්න" "නොදනී" "ඉවත් කරන්න" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 66772c7775..5fb421ab3e 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -71,6 +71,7 @@ "Miniaplikácie" "Tapety" "Nastavenia" + "Zakázané vaším správcom" "Povoliť otáčanie" "Neznáme" "Odstrániť" diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index d5e1e4f4ec..57a89c7b9f 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -71,6 +71,7 @@ "Pripomočki" "Ozadja" "Nastavitve" + "Onemogočil skrbnik." "Omogočanje zasuka" "Neznano" "Odstrani" diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml index 62621705d4..a530ff9f14 100644 --- a/res/values-sq-rAL/strings.xml +++ b/res/values-sq-rAL/strings.xml @@ -71,6 +71,7 @@ "Miniaplikacionet" "Imazhet e sfondit" "Cilësimet" + "Çaktivizuar nga administratori" "Lejo rotacionin" "I panjohur" "Hiq" diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index f19390924a..cc3d6a2ead 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -71,6 +71,7 @@ "Виџети" "Позадине" "Подешавања" + "Администратор је онемогућио" "Дозволи ротацију" "Непознато" "Уклони" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 10f5ce42a0..9eb52997c8 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -71,6 +71,7 @@ "Widgetar" "Bakgrunder" "Inställningar" + "Inaktiverat av administratören" "Tillåt rotering" "Okänt" "Ta bort" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 2abe8244cb..12954f4d44 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -73,6 +73,7 @@ "Wijeti" "Mandhari" "Mipangilio" + "Imezimwa na msimamizi wako" "Ruhusu kuzungusha" "Yasiyojulikana" "Ondoa" diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml index 3990286984..ef1fee467f 100644 --- a/res/values-ta-rIN/strings.xml +++ b/res/values-ta-rIN/strings.xml @@ -71,6 +71,7 @@ "ஷார்ட்கட்ஸ்" "வால்பேப்பர்கள்" "அமைப்பு" + "உங்கள் நிர்வாகி முடக்கியுள்ளார்" "சுழற்ற அனுமதி" "தெரியாதது" "அகற்று" diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml index 997e1981d7..c3a8cd45b8 100644 --- a/res/values-te-rIN/strings.xml +++ b/res/values-te-rIN/strings.xml @@ -71,6 +71,7 @@ "విడ్జెట్‌లు" "వాల్‌పేపర్‌లు" "సెట్టింగ్‌లు" + "మీ నిర్వాహకులు నిలిపివేసారు" "భ్రమణాన్ని అనుమతించండి" "తెలియదు" "తీసివేయి" diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index b90599ef18..ead28d68ee 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -71,6 +71,7 @@ "วิดเจ็ต" "วอลเปเปอร์" "การตั้งค่า" + "ปิดใช้โดยผู้ดูแลระบบ" "อนุญาตให้ใช้การหมุน" "ไม่รู้จัก" "ลบ" diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 7da7b13783..91e04fb4ea 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -71,6 +71,7 @@ "Mga Widget" "Mga Wallpaper" "Mga Setting" + "Na-disable ng iyong admin" "Payagan ang pag-rotate" "Hindi kilala" "Alisin" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 07db876873..fc4a69f62e 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -71,6 +71,7 @@ "Widget\'lar" "Duvar Kağıtları" "Ayarlar" + "Yöneticiniz tarafından devre dışı bırakıldı" "Döndürmeye izin ver" "Bilinmiyor" "Kaldır" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 66f2542bbc..9607099382 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -71,6 +71,7 @@ "Віджети" "Фонові малюнки" "Налаштування" + "Вимкнув адміністратор" "Дозволити обертання" "Невідомо" "Видалити" diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml index b3d4c29ad7..e7ac4b3fdd 100644 --- a/res/values-ur-rPK/strings.xml +++ b/res/values-ur-rPK/strings.xml @@ -71,6 +71,7 @@ "ویجیٹس" "وال پیپرز" "ترتیبات" + "آپ کے منتظم کی طرف سے غیر فعال کر دیا گیا" "گردش کی اجازت دیں" "نامعلوم" "ہٹائیں" diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml index 23f82d8f59..fd71c417c1 100644 --- a/res/values-uz-rUZ/strings.xml +++ b/res/values-uz-rUZ/strings.xml @@ -38,7 +38,7 @@ "Ilovalar" "Uy" "Olib tashlash" - "O‘chirish" + "O‘chirib tashlash" "Ilova haqida" "yorliqlar yaratish" "Ilovalarga foydalanuvchidan so‘ramasdan yorliqlar qo‘shishga ruxsat beradi." @@ -71,6 +71,7 @@ "Vidjetlar" "Fon rasmlari" "Sozlamalar" + "Administrator tomonidan o‘chirilgan" "Aylanishga ruxsat berish" "Noma’lum" "O‘chirish" diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 1ecc92e739..40947bdaf0 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -71,6 +71,7 @@ "Tiện ích con" "Hình nền" "Cài đặt" + "Bị tắt bởi quản trị viên của bạn" "Cho phép xoay" "Không xác định" "Xóa" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 93a7fa7ad3..e333ecbd27 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -71,6 +71,7 @@ "小部件" "壁纸" "设置" + "已被您的管理员停用" "允许旋转" "未知" "移除" diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 41679b586e..b65630ef77 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -71,6 +71,7 @@ "小工具" "桌布" "設定" + "已由您的管理員停用" "允許旋轉" "不明" "移除" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index bc3be0c7fe..1c954fd73d 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -71,6 +71,7 @@ "小工具" "桌布" "設定" + "已由您的管理員停用" "允許輪播" "不明" "移除" diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index a1dec74867..af80b6cb5a 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -71,6 +71,7 @@ "Amawijethi" "Izithombe zangemuva" "Izilungiselelo" + "Kukhutshazwe umlawuli wakho" "Vumela ukuphenduka" "Akwaziwa" "Susa" diff --git a/res/values/strings.xml b/res/values/strings.xml index 2838a22f0a..630e3cd980 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -170,6 +170,8 @@ Wallpapers Settings + + Disabled by your admin diff --git a/src/com/android/launcher3/DragLayer.java b/src/com/android/launcher3/DragLayer.java index ad9063c25a..9886c3fef1 100644 --- a/src/com/android/launcher3/DragLayer.java +++ b/src/com/android/launcher3/DragLayer.java @@ -95,8 +95,6 @@ public class DragLayer extends InsettableFrameLayout { private Drawable mLeftHoverDrawableActive; private Drawable mRightHoverDrawableActive; - private boolean mBlockTouches = false; - /** * Used to create a new DragLayer from XML. * @@ -166,19 +164,11 @@ public class DragLayer extends InsettableFrameLayout { return false; } - public void setBlockTouch(boolean block) { - mBlockTouches = block; - } - private boolean handleTouchDown(MotionEvent ev, boolean intercept) { Rect hitRect = new Rect(); int x = (int) ev.getX(); int y = (int) ev.getY(); - if (mBlockTouches) { - return true; - } - for (AppWidgetResizeFrame child: mResizeFrames) { child.getHitRect(hitRect); if (hitRect.contains(x, y)) { @@ -343,10 +333,6 @@ public class DragLayer extends InsettableFrameLayout { int x = (int) ev.getX(); int y = (int) ev.getY(); - if (mBlockTouches) { - return true; - } - if (action == MotionEvent.ACTION_DOWN) { if (handleTouchDown(ev, false)) { return true; diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 471c324fe4..b43d9659b7 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -208,8 +208,26 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList }); mFolderName.setOnFocusChangeListener(this); - // We disable action mode for now since it messes up the view on phones - mFolderName.setCustomSelectionActionModeCallback(mActionModeCallback); + if (!Utilities.ATLEAST_MARSHMALLOW) { + // We disable action mode in older OSes where floating selection menu is not yet + // available. + mFolderName.setCustomSelectionActionModeCallback(new ActionMode.Callback() { + public boolean onActionItemClicked(ActionMode mode, MenuItem item) { + return false; + } + + public boolean onCreateActionMode(ActionMode mode, Menu menu) { + return false; + } + + public void onDestroyActionMode(ActionMode mode) { + } + + public boolean onPrepareActionMode(ActionMode mode, Menu menu) { + return false; + } + }); + } mFolderName.setOnEditorActionListener(this); mFolderName.setSelectAllOnFocus(true); mFolderName.setInputType(mFolderName.getInputType() | @@ -224,23 +242,6 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList mFooterHeight = mFooter.getMeasuredHeight(); } - private ActionMode.Callback mActionModeCallback = new ActionMode.Callback() { - public boolean onActionItemClicked(ActionMode mode, MenuItem item) { - return false; - } - - public boolean onCreateActionMode(ActionMode mode, Menu menu) { - return false; - } - - public void onDestroyActionMode(ActionMode mode) { - } - - public boolean onPrepareActionMode(ActionMode mode, Menu menu) { - return false; - } - }; - public void onClick(View v) { Object tag = v.getTag(); if (tag instanceof ShortcutInfo) { diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index ff120f7fd1..91b747729a 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -216,10 +216,6 @@ public class Launcher extends Activity private boolean mIsSafeModeEnabled; - LauncherOverlayCallbacks mLauncherOverlayCallbacks = new LauncherOverlayCallbacksImpl(); - LauncherOverlay mLauncherOverlay; - InsettableFrameLayout mLauncherOverlayContainer; - static final int APPWIDGET_HOST_ID = 1024; public static final int EXIT_SPRINGLOADED_MODE_SHORT_TIMEOUT = 300; private static final int ON_ACTIVITY_RESULT_ANIMATION_DELAY = 500; @@ -501,13 +497,6 @@ public class Launcher extends Activity if (mLauncherCallbacks != null) { mLauncherCallbacks.onCreate(savedInstanceState); - if (mLauncherCallbacks.hasLauncherOverlay()) { - ViewStub stub = (ViewStub) findViewById(R.id.launcher_overlay_stub); - mLauncherOverlayContainer = (InsettableFrameLayout) stub.inflate(); - mLauncherOverlay = mLauncherCallbacks.setLauncherOverlayView( - mLauncherOverlayContainer, mLauncherOverlayCallbacks); - mWorkspace.setLauncherOverlay(mLauncherOverlay); - } } if (shouldShowIntroScreen()) { @@ -537,6 +526,16 @@ public class Launcher extends Activity } } + /** + * Call this after onCreate to set or clear overlay. + */ + public void setLauncherOverlay(LauncherOverlay overlay) { + if (overlay != null) { + overlay.setOverlayCallbacks(new LauncherOverlayCallbacksImpl()); + } + mWorkspace.setLauncherOverlay(overlay); + } + public boolean setLauncherCallbacks(LauncherCallbacks callbacks) { mLauncherCallbacks = callbacks; mLauncherCallbacks.setLauncherSearchCallback(new Launcher.LauncherSearchCallbacks() { @@ -889,8 +888,7 @@ public class Launcher extends Activity * @return the new screen, or screenId if it exists */ private long ensurePendingDropLayoutExists(long screenId) { - CellLayout dropLayout = - (CellLayout) mWorkspace.getScreenWithId(screenId); + CellLayout dropLayout = mWorkspace.getScreenWithId(screenId); if (dropLayout == null) { // it's possible that the add screen was removed because it was // empty and a re-bind occurred @@ -939,9 +937,6 @@ public class Launcher extends Activity protected void onStop() { super.onStop(); FirstFrameAnimatorHelper.setIsVisible(false); - if (Utilities.isNycOrAbove()) { - mAppWidgetHost.stopListening(); - } if (mLauncherCallbacks != null) { mLauncherCallbacks.onStop(); @@ -952,9 +947,6 @@ public class Launcher extends Activity protected void onStart() { super.onStart(); FirstFrameAnimatorHelper.setIsVisible(true); - if (Utilities.isNycOrAbove()) { - mAppWidgetHost.startListening(); - } if (mLauncherCallbacks != null) { mLauncherCallbacks.onStart(); @@ -1131,18 +1123,13 @@ public class Launcher extends Activity * Scroll progress, between 0 and 100, when the user scrolls beyond the leftmost * screen (or in the case of RTL, the rightmost screen). */ - public void onScrollChange(int progress, boolean rtl); + public void onScrollChange(float progress, boolean rtl); /** - * Screen has stopped scrolling + * Called when the launcher is ready to use the overlay + * @param callbacks A set of callbacks provided by Launcher in relation to the overlay */ - public void onScrollSettled(); - - /** - * This method can be called by the Launcher in order to force the LauncherOverlay - * to exit fully immersive mode. - */ - public void forceExitFullImmersion(); + public void setOverlayCallbacks(LauncherOverlayCallbacks callbacks); } public interface LauncherSearchCallbacks { @@ -1158,50 +1145,15 @@ public class Launcher extends Activity } public interface LauncherOverlayCallbacks { - /** - * This method indicates whether a call to {@link #enterFullImmersion()} will succeed, - * however it doesn't modify any state within the launcher. - */ - public boolean canEnterFullImmersion(); - - /** - * Should be called to tell Launcher that the LauncherOverlay will take over interaction, - * eg. by occupying the full screen and handling all touch events. - * - * @return true if Launcher allows the LauncherOverlay to become fully immersive. In this - * case, Launcher will modify any necessary state and assumes the overlay is - * handling all interaction. If false, the LauncherOverlay should cancel any - * - */ - public boolean enterFullImmersion(); - - /** - * Must be called when exiting fully immersive mode. Indicates to Launcher that it has - * full control over UI and state. - */ - public void exitFullImmersion(); + public void onScrollChanged(float progress); } class LauncherOverlayCallbacksImpl implements LauncherOverlayCallbacks { - @Override - public boolean canEnterFullImmersion() { - return mState == State.WORKSPACE; - } - - @Override - public boolean enterFullImmersion() { - if (mState == State.WORKSPACE) { - // When fully immersed, disregard any touches which fall through. - mDragLayer.setBlockTouch(true); - return true; + public void onScrollChanged(float progress) { + if (mWorkspace != null) { + mWorkspace.onOverlayScrollChanged(progress); } - return false; - } - - @Override - public void exitFullImmersion() { - mDragLayer.setBlockTouch(false); } } @@ -1384,8 +1336,9 @@ public class Launcher extends Activity mWorkspace.setPageSwitchListener(this); mPageIndicators = mDragLayer.findViewById(R.id.page_indicator); - mLauncherView.setSystemUiVisibility( - View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION); + mLauncherView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_LAYOUT_STABLE); mWorkspaceBackgroundDrawable = getResources().getDrawable(R.drawable.workspace_bg); // Setup the drag layer @@ -1700,6 +1653,10 @@ public class Launcher extends Activity FirstFrameAnimatorHelper.initializeDrawListener(getWindow().getDecorView()); mAttached = true; mVisible = true; + + if (mLauncherCallbacks != null) { + mLauncherCallbacks.onAttachedToWindow(); + } } @Override @@ -1712,6 +1669,10 @@ public class Launcher extends Activity mAttached = false; } updateAutoAdvanceState(); + + if (mLauncherCallbacks != null) { + mLauncherCallbacks.onDetachedFromWindow(); + } } public void onWindowVisibilityChanged(int visibility) { @@ -1977,6 +1938,15 @@ public class Launcher extends Activity @Override protected void onSaveInstanceState(Bundle outState) { + // Catches the case where our activity is created and immediately destroyed and our views + // are not yet fully bound. In this case, we can't trust the state of our activity and + // instead save our previous state (which hasn't yet been consumed / applied, a fact we + // know as it's not null) + if (isWorkspaceLoading() && mSavedState != null) { + outState.putAll(mSavedState); + return; + } + if (mWorkspace.getChildCount() > 0) { outState.putInt(RUNTIME_STATE_CURRENT_SCREEN, mWorkspace.getCurrentPageOffsetFromCustomContent()); @@ -2815,6 +2785,11 @@ public class Launcher extends Activity * on the home screen. */ protected void onClickWallpaperPicker(View v) { + if (!Utilities.isWallapaperAllowed(this)) { + Toast.makeText(this, R.string.msg_disabled_by_admin, Toast.LENGTH_SHORT).show(); + return; + } + if (LOGD) Log.d(TAG, "onClickWallpaperPicker"); int pageScroll = mWorkspace.getScrollForPage(mWorkspace.getPageNearestToCenterOfScreen()); float offset = mWorkspace.mWallpaperOffset.wallpaperOffsetForScroll(pageScroll); @@ -3117,10 +3092,6 @@ public class Launcher extends Activity } oa.setDuration(getResources().getInteger(R.integer.config_folderExpandDuration)); oa.start(); - if (Utilities.isPowerSaverOn(this)) { - // Animations are disabled in battery saver mode, so just skip to the end state. - oa.end(); - } } private void shrinkAndFadeInFolderIcon(final FolderIcon fi, boolean animate) { @@ -4640,9 +4611,6 @@ public class Launcher extends Activity if (introScreen != null) { mDragLayer.showOverlayView(introScreen); } - if (mLauncherOverlayContainer != null) { - mLauncherOverlayContainer.setVisibility(View.INVISIBLE); - } } public void dismissIntroScreen() { @@ -4654,17 +4622,11 @@ public class Launcher extends Activity @Override public void run() { mDragLayer.dismissOverlayView(); - if (mLauncherOverlayContainer != null) { - mLauncherOverlayContainer.setVisibility(View.VISIBLE); - } showFirstRunClings(); } }, ACTIVITY_START_DELAY); } else { mDragLayer.dismissOverlayView(); - if (mLauncherOverlayContainer != null) { - mLauncherOverlayContainer.setVisibility(View.VISIBLE); - } showFirstRunClings(); } changeWallpaperVisiblity(true); diff --git a/src/com/android/launcher3/LauncherAppWidgetHost.java b/src/com/android/launcher3/LauncherAppWidgetHost.java index 1510558f19..8c23ff30d7 100644 --- a/src/com/android/launcher3/LauncherAppWidgetHost.java +++ b/src/com/android/launcher3/LauncherAppWidgetHost.java @@ -82,6 +82,12 @@ public class LauncherAppWidgetHost extends AppWidgetHost { } } + @Override + public void stopListening() { + super.stopListening(); + clearViews(); + } + public void addProviderChangeListener(Runnable callback) { mProviderChangeListeners.add(callback); } diff --git a/src/com/android/launcher3/LauncherAppWidgetHostView.java b/src/com/android/launcher3/LauncherAppWidgetHostView.java index 418525758a..0271089891 100644 --- a/src/com/android/launcher3/LauncherAppWidgetHostView.java +++ b/src/com/android/launcher3/LauncherAppWidgetHostView.java @@ -251,7 +251,7 @@ public class LauncherAppWidgetHostView extends AppWidgetHostView implements Touc @Override public void requestChildFocus(View child, View focused) { super.requestChildFocus(child, focused); - dispatchChildFocus(focused != null); + dispatchChildFocus(mChildrenFocused && focused != null); if (focused != null) { focused.setFocusableInTouchMode(false); } diff --git a/src/com/android/launcher3/LauncherCallbacks.java b/src/com/android/launcher3/LauncherCallbacks.java index 772fbf358f..069deb4fd5 100644 --- a/src/com/android/launcher3/LauncherCallbacks.java +++ b/src/com/android/launcher3/LauncherCallbacks.java @@ -43,6 +43,8 @@ public interface LauncherCallbacks { public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults); public void onWindowFocusChanged(boolean hasFocus); + public void onAttachedToWindow(); + public void onDetachedFromWindow(); public boolean onPrepareOptionsMenu(Menu menu); public void dump(String prefix, FileDescriptor fd, PrintWriter w, String[] args); public void onHomeIntent(); @@ -69,18 +71,11 @@ public interface LauncherCallbacks { public void onInteractionBegin(); public void onInteractionEnd(); - /* - * Extension points for replacing the search experience - */ - @Deprecated - public boolean forceDisableVoiceButtonProxy(); public boolean providesSearch(); public boolean startSearch(String initialQuery, boolean selectInitialQuery, Bundle appSearchData, Rect sourceBounds); @Deprecated public boolean startSearchFromAllApps(String query); - @Deprecated - public void startVoice(); public boolean hasCustomContentToLeft(); public void populateCustomContentContainer(); public View getQsbBar(); @@ -95,8 +90,6 @@ public interface LauncherCallbacks { public View getIntroScreen(); public boolean shouldMoveToDefaultScreenOnHomeIntent(); public boolean hasSettings(); - @Deprecated - public ComponentName getWallpaperPickerComponent(); public boolean overrideWallpaperDimensions(); public boolean isLauncherPreinstalled(); public AllAppsSearchBarController getAllAppsSearchBarController(); @@ -105,24 +98,6 @@ public interface LauncherCallbacks { /** Must return one of {@link #SEARCH_BAR_HEIGHT_NORMAL} or {@link #SEARCH_BAR_HEIGHT_TALL} */ public int getSearchBarHeight(); - /** - * Returning true will immediately result in a call to {@link #setLauncherOverlayView(ViewGroup, - * com.android.launcher3.Launcher.LauncherOverlayCallbacks)}. - * - * @return true if this launcher extension will provide an overlay - */ - public boolean hasLauncherOverlay(); - - /** - * Handshake to establish an overlay relationship - * - * @param container Full screen overlay ViewGroup into which custom views can be placed. - * @param callbacks A set of callbacks provided by Launcher in relation to the overlay - * @return an interface used to make requests and notify the Launcher in relation to the overlay - */ - public Launcher.LauncherOverlay setLauncherOverlayView(InsettableFrameLayout container, - Launcher.LauncherOverlayCallbacks callbacks); - /** * Sets the callbacks to allow reacting the actions of search overlays of the launcher. * diff --git a/src/com/android/launcher3/LogAccelerateInterpolator.java b/src/com/android/launcher3/LogAccelerateInterpolator.java index c3bbfa5364..519d391304 100644 --- a/src/com/android/launcher3/LogAccelerateInterpolator.java +++ b/src/com/android/launcher3/LogAccelerateInterpolator.java @@ -20,6 +20,8 @@ public class LogAccelerateInterpolator implements TimeInterpolator { @Override public float getInterpolation(float t) { - return 1 - computeLog(1 - t, mBase, mDrift) * mLogScale; + // Due to rounding issues, the interpolation doesn't quite reach 1 even though it should. + // To account for this, we short-circuit to return 1 if the input is 1. + return Float.compare(t, 1f) == 0 ? 1f : 1 - computeLog(1 - t, mBase, mDrift) * mLogScale; } } diff --git a/src/com/android/launcher3/LogDecelerateInterpolator.java b/src/com/android/launcher3/LogDecelerateInterpolator.java index 4c5f6f08c4..7d9528280f 100644 --- a/src/com/android/launcher3/LogDecelerateInterpolator.java +++ b/src/com/android/launcher3/LogDecelerateInterpolator.java @@ -21,6 +21,8 @@ public class LogDecelerateInterpolator implements TimeInterpolator { @Override public float getInterpolation(float t) { - return computeLog(t, mBase, mDrift) * mLogScale; + // Due to rounding issues, the interpolation doesn't quite reach 1 even though it should. + // To account for this, we short-circuit to return 1 if the input is 1. + return Float.compare(t, 1f) == 0 ? 1f : computeLog(t, mBase, mDrift) * mLogScale; } } diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 2dcff35b5e..b0e46f9bf9 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -156,7 +156,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc protected boolean mIsPageMoving = false; - private boolean mWasInOverscroll = false; + protected boolean mWasInOverscroll = false; // Page Indicator @Thunk int mPageIndicatorViewId; @@ -551,9 +551,13 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc super.setOnLongClickListener(l); } + protected int getUnboundedScrollX() { + return getScrollX(); + } + @Override public void scrollBy(int x, int y) { - scrollTo(getScrollX() + x, getScrollY() + y); + scrollTo(getUnboundedScrollX() + x, getScrollY() + y); } @Override @@ -1051,16 +1055,16 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc } protected void getVisiblePages(int[] range) { - final int pageCount = getChildCount(); + final int count = getChildCount(); range[0] = -1; range[1] = -1; - if (pageCount > 0) { + if (count > 0) { final int visibleLeft = -getLeft(); final int visibleRight = visibleLeft + getViewportWidth(); + final Matrix pageShiftMatrix = getPageShiftMatrix(); int curScreen = 0; - int count = getChildCount(); for (int i = 0; i < count; i++) { View currPage = getPageAt(i); @@ -1069,7 +1073,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc sTmpRectF.right = currPage.getMeasuredWidth(); currPage.getMatrix().mapRect(sTmpRectF); sTmpRectF.offset(currPage.getLeft() - getScrollX(), 0); - getMatrix().mapRect(sTmpRectF); + pageShiftMatrix.mapRect(sTmpRectF); if (sTmpRectF.left > visibleRight || sTmpRectF.right < visibleLeft) { if (range[0] == -1) { @@ -1092,6 +1096,10 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc } } + protected Matrix getPageShiftMatrix() { + return getMatrix(); + } + protected boolean shouldDrawChild(View child) { return child.getVisibility() == VISIBLE; } @@ -2008,7 +2016,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc int halfScreenSize = getViewportWidth() / 2; final int newX = getScrollForPage(whichPage); - int delta = newX - getScrollX(); + int delta = newX - getUnboundedScrollX(); int duration = 0; if (Math.abs(velocity) < mMinFlingVelocity) { @@ -2058,7 +2066,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc whichPage = validateNewPage(whichPage); int newX = getScrollForPage(whichPage); - final int delta = newX - getScrollX(); + final int delta = newX - getUnboundedScrollX(); snapToPage(whichPage, delta, duration, immediate, interpolator); } @@ -2090,7 +2098,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc mScroller.setInterpolator(mDefaultInterpolator); } - mScroller.startScroll(getScrollX(), 0, delta, 0, duration); + mScroller.startScroll(getUnboundedScrollX(), 0, delta, 0, duration); updatePageIndicator(); diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index 271e581f01..9fdcd33f97 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -19,6 +19,7 @@ package com.android.launcher3; import android.annotation.TargetApi; import android.app.Activity; import android.app.SearchManager; +import android.app.WallpaperManager; import android.appwidget.AppWidgetManager; import android.appwidget.AppWidgetProviderInfo; import android.content.ActivityNotFoundException; @@ -45,6 +46,7 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.PaintDrawable; import android.os.Build; +import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.os.PowerManager; import android.os.Process; @@ -821,6 +823,17 @@ public final class Utilities { return ATLEAST_LOLLIPOP && powerManager.isPowerSaveMode(); } + public static boolean isWallapaperAllowed(Context context) { + if (isNycOrAbove()) { + try { + WallpaperManager wm = context.getSystemService(WallpaperManager.class); + return (Boolean) wm.getClass().getDeclaredMethod("isWallpaperSettingAllowed") + .invoke(wm); + } catch (Exception e) { } + } + return true; + } + /** * An extension of {@link BitmapDrawable} which returns the bitmap pixel size as intrinsic size. * This allows the badging to be done based on the action bitmap size rather than diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index bf33ccf79f..4eb4d45452 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -55,6 +55,7 @@ import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.view.accessibility.AccessibilityManager; +import android.view.animation.AccelerateInterpolator; import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; import android.widget.TextView; @@ -172,6 +173,7 @@ public class Workspace extends PagedView @Thunk float[] mDragViewVisualCenter = new float[2]; private float[] mTempCellLayoutCenterCoordinates = new float[2]; private Matrix mTempInverseMatrix = new Matrix(); + private Matrix mTempMatrix = new Matrix(); private SpringLoadedDragController mSpringLoadedDragController; private float mSpringLoadedShrinkFactor; @@ -275,8 +277,11 @@ public class Workspace extends PagedView LauncherOverlay mLauncherOverlay; boolean mScrollInteractionBegan; boolean mStartedSendingScrollEvents; - boolean mShouldSendPageSettled; - int mLastOverlaySroll = 0; + float mLastOverlaySroll = 0; + // Total over scrollX in the overlay direction. + private int mUnboundedScrollX; + // Total over scrollX in the overlay direction. + private float mOverlayTranslation; // Handles workspace state transitions private WorkspaceStateTransitionAnimation mStateTransitionAnimation; @@ -1232,11 +1237,6 @@ public class Workspace extends PagedView stripEmptyScreens(); mStripScreensOnPageStopMoving = false; } - - if (mShouldSendPageSettled) { - mLauncherOverlay.onScrollSettled(); - mShouldSendPageSettled = false; - } } protected void onScrollInteractionBegin() { @@ -1255,6 +1255,47 @@ public class Workspace extends PagedView public void setLauncherOverlay(LauncherOverlay overlay) { mLauncherOverlay = overlay; + // A new overlay has been set. Reset event tracking + mStartedSendingScrollEvents = false; + onOverlayScrollChanged(0); + } + + @Override + protected int getUnboundedScrollX() { + if (isScrollingOverlay()) { + return mUnboundedScrollX; + } + + return super.getUnboundedScrollX(); + } + + private boolean isScrollingOverlay() { + return mLauncherOverlay != null && + ((mIsRtl && mUnboundedScrollX > mMaxScrollX) || (!mIsRtl && mUnboundedScrollX < 0)); + } + + @Override + protected void snapToDestination() { + // If we're overscrolling the overlay, we make sure to immediately reset the PagedView + // to it's baseline position instead of letting the overscroll settle. The overlay handles + // it's own settling, and every gesture to the overlay should be self-contained and start + // from 0, so we zero it out here. + if (isScrollingOverlay()) { + int finalScroll = mIsRtl ? mMaxScrollX : 0; + + // We reset mWasInOverscroll so that PagedView doesn't zero out the overscroll + // interaction when we call scrollTo. + mWasInOverscroll = false; + scrollTo(finalScroll, getScrollY()); + } else { + super.snapToDestination(); + } + } + + @Override + public void scrollTo(int x, int y) { + mUnboundedScrollX = x; + super.scrollTo(x, y); } @Override @@ -1272,15 +1313,10 @@ public class Workspace extends PagedView if (!mStartedSendingScrollEvents && mScrollInteractionBegan) { mStartedSendingScrollEvents = true; mLauncherOverlay.onScrollInteractionBegin(); - mShouldSendPageSettled = true; } - int screenSize = getViewportWidth(); - float f = (amount / screenSize); - int progress = (int) Math.abs((f * 100)); - - mLastOverlaySroll = progress; - mLauncherOverlay.onScrollChange(progress, mIsRtl); + mLastOverlaySroll = Math.abs(amount / getViewportWidth()); + mLauncherOverlay.onScrollChange(mLastOverlaySroll, mIsRtl); } else if (shouldOverScroll) { dampedOverScroll(amount); } @@ -1290,6 +1326,62 @@ public class Workspace extends PagedView } } + private final Interpolator mAlphaInterpolator = new DecelerateInterpolator(3f); + + /** + * The overlay scroll is being controlled locally, just update our overlay effect + */ + public void onOverlayScrollChanged(float scroll) { + float offset = 0f; + float slip = 0f; + + scroll = Math.max(scroll - offset, 0); + scroll = Math.min(1, scroll / (1 - offset)); + + float alpha = 1 - mAlphaInterpolator.getInterpolation(scroll); + float transX = mLauncher.getDragLayer().getMeasuredWidth() * scroll; + transX *= 1 - slip; + + if (mIsRtl) { + transX = -transX; + } + mOverlayTranslation = transX; + + // TODO(adamcohen): figure out a final effect here. We may need to recommend + // different effects based on device performance. On at least one relatively high-end + // device I've tried, translating the launcher causes things to get quite laggy. + setTranslationAndAlpha(mLauncher.getSearchDropTargetBar(), transX, alpha); + setTranslationAndAlpha(getPageIndicator(), transX, alpha); + setTranslationAndAlpha(getChildAt(getCurrentPage()), transX, alpha); + setTranslationAndAlpha(mLauncher.getHotseat(), transX, alpha); + + // When the animation finishes, reset all pages, just in case we missed a page. + if (transX == 0) { + for (int i = getChildCount() - 1; i >= 0; i--) { + setTranslationAndAlpha(getChildAt(i), 0, alpha); + } + } + } + + @Override + protected Matrix getPageShiftMatrix() { + if (Float.compare(mOverlayTranslation, 0) != 0) { + // The pages are translated by mOverlayTranslation. incorporate that in the + // visible page calculation by shifting everything back by that same amount. + mTempMatrix.set(getMatrix()); + mTempMatrix.postTranslate(-mOverlayTranslation, 0); + return mTempMatrix; + } + return super.getPageShiftMatrix(); + } + + private void setTranslationAndAlpha(View v, float transX, float alpha) { + if (v != null) { + v.setTranslationX(transX); + v.setAlpha(alpha); + } + } + @Override protected void getEdgeVerticalPostion(int[] pos) { View child = getChildAt(getPageCount() - 1); diff --git a/src/com/android/launcher3/testing/LauncherExtension.java b/src/com/android/launcher3/testing/LauncherExtension.java index 1bb57874e3..475762f74b 100644 --- a/src/com/android/launcher3/testing/LauncherExtension.java +++ b/src/com/android/launcher3/testing/LauncherExtension.java @@ -1,24 +1,16 @@ package com.android.launcher3.testing; -import android.animation.Animator; -import android.animation.AnimatorListenerAdapter; -import android.animation.ObjectAnimator; -import android.content.ComponentName; import android.content.Intent; import android.graphics.Color; import android.graphics.Rect; import android.os.Bundle; import android.view.Menu; import android.view.View; -import android.view.ViewGroup; import android.widget.FrameLayout; import com.android.launcher3.AppInfo; -import com.android.launcher3.InsettableFrameLayout; import com.android.launcher3.Launcher; -import com.android.launcher3.LauncherAnimUtils; import com.android.launcher3.LauncherCallbacks; -import com.android.launcher3.R; import com.android.launcher3.allapps.AllAppsSearchBarController; import com.android.launcher3.util.ComponentKey; @@ -42,8 +34,6 @@ public class LauncherExtension extends Launcher { public class LauncherExtensionCallbacks implements LauncherCallbacks { - LauncherExtensionOverlay mLauncherOverlay = new LauncherExtensionOverlay(); - @Override public void preOnCreate() { } @@ -116,10 +106,6 @@ public class LauncherExtension extends Launcher { @Override public boolean handleBackPressed() { - if (mLauncherOverlay.isOverlayPanelShowing()) { - mLauncherOverlay.hideOverlayPanel(); - return true; - } return false; } @@ -187,14 +173,9 @@ public class LauncherExtension extends Launcher { public void onInteractionEnd() { } - @Override - public boolean forceDisableVoiceButtonProxy() { - return false; - } - @Override public boolean providesSearch() { - return true; + return false; } @Override @@ -208,10 +189,6 @@ public class LauncherExtension extends Launcher { return false; } - @Override - public void startVoice() { - } - CustomContentCallbacks mCustomContentCallbacks = new CustomContentCallbacks() { // Custom content is completely shown. {@code fromResume} indicates whether this was caused @@ -249,7 +226,7 @@ public class LauncherExtension extends Launcher { @Override public View getQsbBar() { - return mLauncherOverlay.getSearchBox(); + return null; } @Override @@ -287,11 +264,6 @@ public class LauncherExtension extends Launcher { return false; } - @Override - public ComponentName getWallpaperPickerComponent() { - return null; - } - @Override public boolean overrideWallpaperDimensions() { return false; @@ -317,114 +289,17 @@ public class LauncherExtension extends Launcher { return false; } - @Override - public boolean hasLauncherOverlay() { - return false; - } - - @Override - public LauncherOverlay setLauncherOverlayView(InsettableFrameLayout container, - LauncherOverlayCallbacks callbacks) { - - mLauncherOverlay.setOverlayCallbacks(callbacks); - mLauncherOverlay.setOverlayContainer(container); - - return mLauncherOverlay; - } - @Override public void setLauncherSearchCallback(Object callbacks) { // Do nothing } - class LauncherExtensionOverlay implements LauncherOverlay { - LauncherOverlayCallbacks mLauncherOverlayCallbacks; - ViewGroup mOverlayView; - View mSearchBox; - View mSearchOverlay; - boolean mShowOverlayFeedback; - int mProgress; - boolean mOverlayPanelShowing; + @Override + public void onAttachedToWindow() { + } - @Override - public void onScrollInteractionBegin() { - if (mLauncherOverlayCallbacks.canEnterFullImmersion()) { - mShowOverlayFeedback = true; - updatePanelOffset(0); - mSearchOverlay.setVisibility(View.VISIBLE); - mSearchOverlay.setLayerType(View.LAYER_TYPE_HARDWARE, null); - } - } - - @Override - public void onScrollChange(int progress, boolean rtl) { - mProgress = progress; - if (mShowOverlayFeedback) { - updatePanelOffset(progress); - } - } - - private void updatePanelOffset(int progress) { - int panelWidth = mSearchOverlay.getMeasuredWidth(); - int offset = (int) ((progress / 100f) * panelWidth); - mSearchOverlay.setTranslationX(- panelWidth + offset); - } - - @Override - public void onScrollInteractionEnd() { - if (mProgress > 25 && mLauncherOverlayCallbacks.enterFullImmersion()) { - ObjectAnimator oa = LauncherAnimUtils.ofFloat(mSearchOverlay, "translationX", 0); - oa.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator arg0) { - mSearchOverlay.setLayerType(View.LAYER_TYPE_NONE, null); - } - }); - oa.start(); - mOverlayPanelShowing = true; - mShowOverlayFeedback = false; - } - } - - @Override - public void onScrollSettled() { - if (mShowOverlayFeedback) { - mSearchOverlay.setVisibility(View.INVISIBLE); - mSearchOverlay.setLayerType(View.LAYER_TYPE_NONE, null); - } - mShowOverlayFeedback = false; - mProgress = 0; - } - - public void hideOverlayPanel() { - mLauncherOverlayCallbacks.exitFullImmersion(); - mSearchOverlay.setVisibility(View.INVISIBLE); - mOverlayPanelShowing = false; - } - - public boolean isOverlayPanelShowing() { - return mOverlayPanelShowing; - } - - @Override - public void forceExitFullImmersion() { - hideOverlayPanel(); - } - - public void setOverlayContainer(InsettableFrameLayout container) { - mOverlayView = (ViewGroup) getLayoutInflater().inflate( - R.layout.launcher_overlay_example, container); - mSearchOverlay = mOverlayView.findViewById(R.id.search_overlay); - mSearchBox = mOverlayView.findViewById(R.id.search_box); - } - - public View getSearchBox() { - return mSearchBox; - } - - public void setOverlayCallbacks(LauncherOverlayCallbacks callbacks) { - mLauncherOverlayCallbacks = callbacks; - } + @Override + public void onDetachedFromWindow() { }; } } diff --git a/src/com/android/launcher3/util/PackageManagerHelper.java b/src/com/android/launcher3/util/PackageManagerHelper.java index d0345727fb..08e8e869d5 100644 --- a/src/com/android/launcher3/util/PackageManagerHelper.java +++ b/src/com/android/launcher3/util/PackageManagerHelper.java @@ -19,6 +19,8 @@ package com.android.launcher3.util; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; +import com.android.launcher3.Utilities; + /** * Utility methods using package manager */ @@ -57,6 +59,13 @@ public class PackageManagerHelper { } public static boolean isAppSuspended(ApplicationInfo info) { - return (info.flags & FLAG_SUSPENDED) != 0; + // The value of FLAG_SUSPENDED was reused by a hidden constant + // ApplicationInfo.FLAG_PRIVILEGED prior to N, so only check for suspended flag on N + // or later. + if (Utilities.isNycOrAbove()) { + return (info.flags & FLAG_SUSPENDED) != 0; + } else { + return false; + } } }