From a90d17b4116476e343ce404c141170f28b6ed62c Mon Sep 17 00:00:00 2001 From: Vadim Tryshev Date: Wed, 29 Aug 2018 11:54:49 -0700 Subject: [PATCH 1/6] Removing tryGetAllApps There were plans to use it from platform tests, but this turned to be unnecessary. Bug: 110103162 Test: compiling Change-Id: I39bf3f4cff57018bec87dcb3e8dfee522121d85b --- .../tapl/LauncherInstrumentation.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index 09bf403aa1..63da892434 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -30,7 +30,6 @@ import android.provider.Settings; import android.view.accessibility.AccessibilityEvent; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.test.uiautomator.By; import androidx.test.uiautomator.BySelector; import androidx.test.uiautomator.UiDevice; @@ -272,19 +271,6 @@ public final class LauncherInstrumentation { return new AllAppsFromOverview(this); } - /** - * Gets the All Apps object if the current state is showing the all apps panel opened by swiping - * from workspace. Returns null if launcher is not in that state. Please don't call this method - * if App Apps was opened by swiping up from Overview, as it won't fail and will return an - * incorrect object. - * - * @return All Aps object or null. - */ - @Nullable - public AllApps tryGetAllApps() { - return tryGetLauncherObject(APPS_RES_ID) != null ? getAllApps() : null; - } - private void waitUntilGone(String resId) { assertTrue("Unexpected launcher object visible: " + resId, mDevice.wait(Until.gone(getLauncherObjectSelector(resId)), @@ -305,11 +291,6 @@ public final class LauncherInstrumentation { return object; } - @Nullable - private UiObject2 tryGetLauncherObject(String resName) { - return mDevice.findObject(getLauncherObjectSelector(resName)); - } - @NonNull UiObject2 waitForObjectInContainer(UiObject2 container, String resName) { final UiObject2 object = container.wait( From 6da0c5d4335a9d478c0956d422aea6c1368879ff Mon Sep 17 00:00:00 2001 From: Shibin George Date: Mon, 3 Sep 2018 20:10:09 +0530 Subject: [PATCH 2/6] Launcher3Go should override Launcher3QuickStep Now that Launcher3QuickStep is the default launcher, Launcher3Go should override Launcher3QuickStep as well else Go targets will have both Launcher3Go and Launcher3QuickStep apks installed in system image. Also, Launcher3QuickStepGo should override Launcher3QuickStep. BUG: 113564404 Test: With this, on Go targets where Launcher3Go is included in PRODUCT_PACKAGES, only one apk i.e. Launcher3Go will be present in /system/priv-app. Change-Id: I84d2e3c23c5acdced70d028e9518e04834577049 From eba751830033e5032def07c37ebb2db556d7ea5c Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 4 Sep 2018 16:12:35 -0700 Subject: [PATCH 3/6] Import translations. DO NOT MERGE Change-Id: I29ab435c62c400facc55e8aeee7c1849e39a29b3 Auto-generated-cl: translation import --- quickstep/res/values-ro/strings.xml | 2 +- res/values-es/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/quickstep/res/values-ro/strings.xml b/quickstep/res/values-ro/strings.xml index 032d886fb1..0c201ba7e5 100644 --- a/quickstep/res/values-ro/strings.xml +++ b/quickstep/res/values-ro/strings.xml @@ -19,7 +19,7 @@ - "Ecran divizat" + "Ecran împărțit" "Fixați" "Recente" "Niciun element recent" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 0829533282..f8b81ea437 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -80,7 +80,7 @@ "Widgets" "Fondos de pantalla" "Ajustes de la pantalla de inicio" - "Inhabilitada por el administrador" + "Inhabilitado por el administrador" "Permitir rotación de la pantalla de inicio" "Al girar el teléfono" "Burbujas de notificación" From 07f81e00f3d7ab3064f025db8925034071ef2c75 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 4 Sep 2018 16:15:46 -0700 Subject: [PATCH 4/6] Import translations. DO NOT MERGE Change-Id: I55f66fb29371969630a7c86c2f47bc8f1d6e9f0b Auto-generated-cl: translation import --- quickstep/res/values-ro/strings.xml | 2 +- res/values-af/strings.xml | 2 ++ res/values-am/strings.xml | 2 ++ res/values-ar/strings.xml | 2 ++ res/values-as/strings.xml | 2 ++ res/values-az/strings.xml | 2 ++ res/values-b+sr+Latn/strings.xml | 2 ++ res/values-be/strings.xml | 2 ++ res/values-bg/strings.xml | 2 ++ res/values-bn/strings.xml | 2 ++ res/values-bs/strings.xml | 2 ++ res/values-ca/strings.xml | 2 ++ res/values-cs/strings.xml | 2 ++ res/values-da/strings.xml | 2 ++ res/values-de/strings.xml | 2 ++ res/values-el/strings.xml | 2 ++ res/values-en-rAU/strings.xml | 2 ++ res/values-en-rGB/strings.xml | 2 ++ res/values-en-rIN/strings.xml | 2 ++ res/values-es-rUS/strings.xml | 2 ++ res/values-es/strings.xml | 4 +++- res/values-et/strings.xml | 2 ++ res/values-eu/strings.xml | 2 ++ res/values-fa/strings.xml | 2 ++ res/values-fi/strings.xml | 2 ++ res/values-fr-rCA/strings.xml | 2 ++ res/values-fr/strings.xml | 2 ++ res/values-gl/strings.xml | 2 ++ res/values-gu/strings.xml | 2 ++ res/values-hi/strings.xml | 2 ++ res/values-hr/strings.xml | 2 ++ res/values-hu/strings.xml | 2 ++ res/values-hy/strings.xml | 2 ++ res/values-in/strings.xml | 2 ++ res/values-is/strings.xml | 2 ++ res/values-it/strings.xml | 2 ++ res/values-iw/strings.xml | 2 ++ res/values-ja/strings.xml | 2 ++ res/values-ka/strings.xml | 2 ++ res/values-kk/strings.xml | 2 ++ res/values-km/strings.xml | 2 ++ res/values-kn/strings.xml | 2 ++ res/values-ko/strings.xml | 2 ++ res/values-ky/strings.xml | 2 ++ res/values-lo/strings.xml | 2 ++ res/values-lt/strings.xml | 2 ++ res/values-lv/strings.xml | 2 ++ res/values-mk/strings.xml | 2 ++ res/values-ml/strings.xml | 2 ++ res/values-mn/strings.xml | 2 ++ res/values-mr/strings.xml | 2 ++ res/values-ms/strings.xml | 2 ++ res/values-my/strings.xml | 2 ++ res/values-nb/strings.xml | 2 ++ res/values-ne/strings.xml | 2 ++ res/values-nl/strings.xml | 2 ++ res/values-or/strings.xml | 2 ++ res/values-pa/strings.xml | 2 ++ res/values-pl/strings.xml | 2 ++ res/values-pt-rPT/strings.xml | 2 ++ res/values-pt/strings.xml | 2 ++ res/values-ro/strings.xml | 2 ++ res/values-ru/strings.xml | 2 ++ res/values-si/strings.xml | 2 ++ res/values-sk/strings.xml | 2 ++ res/values-sl/strings.xml | 2 ++ res/values-sq/strings.xml | 2 ++ res/values-sr/strings.xml | 2 ++ res/values-sv/strings.xml | 2 ++ res/values-sw/strings.xml | 2 ++ res/values-ta/strings.xml | 2 ++ res/values-te/strings.xml | 2 ++ res/values-th/strings.xml | 2 ++ res/values-tl/strings.xml | 2 ++ res/values-tr/strings.xml | 2 ++ res/values-uk/strings.xml | 2 ++ res/values-ur/strings.xml | 2 ++ res/values-uz/strings.xml | 2 ++ res/values-vi/strings.xml | 2 ++ res/values-zh-rCN/strings.xml | 2 ++ res/values-zh-rHK/strings.xml | 2 ++ res/values-zh-rTW/strings.xml | 2 ++ res/values-zu/strings.xml | 2 ++ 83 files changed, 166 insertions(+), 2 deletions(-) diff --git a/quickstep/res/values-ro/strings.xml b/quickstep/res/values-ro/strings.xml index 032d886fb1..0c201ba7e5 100644 --- a/quickstep/res/values-ro/strings.xml +++ b/quickstep/res/values-ro/strings.xml @@ -19,7 +19,7 @@ - "Ecran divizat" + "Ecran împărțit" "Fixați" "Recente" "Niciun element recent" diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 35539e3608..88d6cca422 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -114,6 +114,8 @@ "Skuif item hierheen" "Item is by tuisskerm gevoeg" "Item is verwyder" + + "Skuif item" "Skuif na ry %1$s kolom %2$s" "Skuif na posisie %1$s" diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index 921fbd9162..57999ca190 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -114,6 +114,8 @@ "ንጥልን ወደዚህ ውሰድ" "ወደ መነሻ ማያ ገጽ ንጥል ታክሏል" "ንጥል ነገር ተንቀሳቅሷል" + + "ንጥልን አንቀሳቅስ" "ወደ ረድፍ %1$s ዓምድ %2$s አንቀሳቅስ" "ወደ አቀማመጥ %1$s አንቀሳቅስ" diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index ecf32d4f77..1af7712c51 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -118,6 +118,8 @@ "نقل العنصر إلى هنا" "تمت إضافة العنصر إلى الشاشة الرئيسية" "تم حذف العنصر" + + "نقل العنصر" "نقل إلى الصف %1$s العمود %2$s" "نقل إلى الموضع %1$s" diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml index b8e71a14bc..cd02fbf03b 100644 --- a/res/values-as/strings.xml +++ b/res/values-as/strings.xml @@ -114,6 +114,8 @@ "বস্তুটো ইয়ালৈ স্থানান্তৰ কৰক" "বস্তুটো গৃহ স্ক্ৰীণত যোগ কৰা হ\'ল" "বস্তুটো আঁতৰোৱা হ\'ল" + + "বস্তু স্থানান্তৰ কৰক" "শাৰী %1$s স্তম্ভ %2$sলৈ স্থানান্তৰিত কৰক" "পছন্দৰ অৱস্থান %1$sলৈ স্থানান্তৰিত কৰক" diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml index 3b36f37b25..b7740a6936 100644 --- a/res/values-az/strings.xml +++ b/res/values-az/strings.xml @@ -114,6 +114,8 @@ "Elementi bura köçürün" "Element əsas ekrana əlavə edildi" "Element silindi" + + "Elementi köçürün" "Sıra %1$s sütun %2$s köçürün" "%1$s mövqeyinə köçürün" diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml index 3fb8bf50c5..e1fc374eb8 100644 --- a/res/values-b+sr+Latn/strings.xml +++ b/res/values-b+sr+Latn/strings.xml @@ -115,6 +115,8 @@ "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" diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml index 59a8f1fa2b..d05a23dfe8 100644 --- a/res/values-be/strings.xml +++ b/res/values-be/strings.xml @@ -116,6 +116,8 @@ "Перамясціць элемент сюды" "Элемент дададзены на галоўны экран" "Элемент выдалены" + + "Перамясціць элемент" "Перамясціць у радок %1$s слупок %2$s" "Перамясціць у пазіцыю %1$s" diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 47825f6bd0..24bc9ad9d7 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -114,6 +114,8 @@ "Преместване на елемента тук" "Елементът е добавен към началния екран" "Елементът е премахнат" + + "Преместване на елемента" "Преместване към ред %1$s, колона %2$s" "Преместване към позиция %1$s" diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml index 8fb906f8e4..26be89679e 100644 --- a/res/values-bn/strings.xml +++ b/res/values-bn/strings.xml @@ -114,6 +114,8 @@ "এখানে আইটেম সরান" "হোম স্ক্রীনে আইটেম যোগ করা হয়েছে" "আইটেম সরানো হয়েছে" + + "আইটেম সরান" "সারি %1$s কলাম %2$s এ সরান" "অবস্থানে সরান %1$s" diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml index 848176df02..c7afb2cb5b 100644 --- a/res/values-bs/strings.xml +++ b/res/values-bs/strings.xml @@ -115,6 +115,8 @@ "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" diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 27f9c3132a..0cf3fdd78e 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -114,6 +114,8 @@ "Mou l\'element aquí" "S\'ha afegit l\'element a la pantalla d\'inici" "S\'ha suprimit l\'element" + + "Desplaça l\'element" "Desplaça l\'element a la fila %1$s i la columna %2$s" "Desplaça l\'element a la posició %1$s" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 48adf44be5..72c40049ed 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -116,6 +116,8 @@ "Přesunout položku sem" "Položka byla přidána na plochu" "Položka byla odstraněna" + + "Přesunout položku" "Přesunout na řádek %1$s do sloupce %2$s" "Přesunout na pozici %1$s" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index d141ad9ff9..0c48790030 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -114,6 +114,8 @@ "Flyt elementet hertil" "Elementet er føjet til startskærmen" "Elementet er fjernet" + + "Flyt element" "Flyt til række %1$s, kolonne %2$s" "Flyt til position %1$s" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index c309a55689..fcaa4b3b0d 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -114,6 +114,8 @@ "Element hierhin verschieben" "Element zum Startbildschirm hinzugefügt" "Element entfernt" + + "Element verschieben" "In Zeile %1$s, Spalte %2$s verschoben" "Auf Position %1$s verschoben" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 3208fcbd10..78b2e42580 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -114,6 +114,8 @@ "Μετακίνηση στοιχείου εδώ" "Το στοιχείο προστέθηκε στην αρχική οθόνη" "Το στοιχείο καταργήθηκε" + + "Μετακίνηση στοιχείου" "Μετακίνηση στη σειρά %1$s, στήλη %2$s" "Μετακίνηση στη θέση %1$s" diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index 245ee43580..1f2b204397 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -114,6 +114,8 @@ "Move item here" "Item added to home screen" "Item removed" + + "Move item" "Move to row %1$s column %2$s" "Move to position %1$s" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 245ee43580..1f2b204397 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -114,6 +114,8 @@ "Move item here" "Item added to home screen" "Item removed" + + "Move item" "Move to row %1$s column %2$s" "Move to position %1$s" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index 245ee43580..1f2b204397 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -114,6 +114,8 @@ "Move item here" "Item added to home screen" "Item removed" + + "Move item" "Move to row %1$s column %2$s" "Move to position %1$s" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 368e4ba633..c04f516bbd 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -114,6 +114,8 @@ "Mover elemento aquí" "Se agregó el elemento a la pantalla principal." "Se eliminó el elemento." + + "Mover elemento" "Mover a fila %1$s, columna %2$s" "Mover a la posición número %1$s" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 0829533282..2de65168c9 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -80,7 +80,7 @@ "Widgets" "Fondos de pantalla" "Ajustes de la pantalla de inicio" - "Inhabilitada por el administrador" + "Inhabilitado por el administrador" "Permitir rotación de la pantalla de inicio" "Al girar el teléfono" "Burbujas de notificación" @@ -114,6 +114,8 @@ "Mover elemento aquí" "Elemento añadido a la pantalla de inicio" "Elemento eliminado" + + "Mover elemento" "Mover a la fila %1$s, columna %2$s" "Mover a la posición número %1$s" diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index 1e5caa6427..bb7774c46b 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -114,6 +114,8 @@ "Teisalda üksus siia" "Üksus lisati avaekraanile" "Üksus eemaldati" + + "Teisalda üksus" "Teisaldamine %1$s. rea %2$s. veergu" "Teisaldamine %1$s. positsioonile" diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index b69228a294..da60517c3f 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -114,6 +114,8 @@ "Ekarri elementua hona" "Gehitu da elementua hasierako pantailan" "Kendu da elementua" + + "Mugitu elementua" "Eraman %1$s. errenkadara, %2$s. zutabera" "Eraman %1$s. postura" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index aa06188f21..72f173455a 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -114,6 +114,8 @@ "انتقال مورد به اینجا" "مورد به صفحه اصلی اضافه شد" "مورد حذف شد" + + "انتقال مورد" "انتقال به سطر %1$s ستون %2$s" "انتقال به موقعیت %1$s" diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 4b361ac3c4..546d7e38a5 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -114,6 +114,8 @@ "Siirrä kohde tänne" "Kohde lisättiin aloitusnäytölle." "Kohde poistettiin." + + "Siirrä kohde" "Siirrä rivin %1$s sarakkeeseen %2$s." "Siirrä kohtaan %1$s." diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 29b003e081..a1d3677f9b 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -114,6 +114,8 @@ "Déplacer l\'élément ici" "Élément ajouté à l\'écran d\'accueil" "Élément supprimé" + + "Déplacer l\'élément" "Déplacer vers rangée %1$s colonne %2$s" "Déplacer vers la position %1$s" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index d47ab427ca..63a53e1a64 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -114,6 +114,8 @@ "Déplacer l\'élément ici" "L\'élément a bien été ajouté à l\'écran d\'accueil." "L\'élément a bien été supprimé." + + "Déplacer l\'élément" "Déplacer vers la ligne %1$s, colonne %2$s" "Déplacer vers la position %1$s" diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index b94d693511..d77db89d91 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -114,6 +114,8 @@ "Mover elemento aquí" "Engadiuse o elemento á pantalla de inicio" "Eliminouse o elemento" + + "Mover elemento" "Mover á fila %1$s columna %2$s" "Mover á posición %1$s" diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml index d4f6bbb8c8..6b1406dc4b 100644 --- a/res/values-gu/strings.xml +++ b/res/values-gu/strings.xml @@ -114,6 +114,8 @@ "આઇટમ અહીં ખસેડો" "હોમ સ્ક્રીનમાં આઇટમ ઉમેરી" "આઇટમ દૂર કરી" + + "આઇટમ ખસેડો" "%1$s પંક્તિ %2$s કૉલમ પર ખસેડો" "%1$s સ્થિતિ પર ખસેડો" diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index ee8e6e3fe4..0dbf75bfe8 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -114,6 +114,8 @@ "आइटम यहां ले जाएं" "होम स्क्रीन में आइटम जोड़ा गया" "आइटम निकाला गया" + + "आइटम ले जाएं" "पंक्ति %1$s स्तंभ %2$s पर ले जाएं" "%1$s स्थिति पर ले जाएं" diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index ea340d68a7..88918a661d 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -115,6 +115,8 @@ "Premjesti stavku ovdje" "Stavka je dodana na početni zaslon" "Stavka je uklonjena" + + "Premještanje stavke" "Premještanje u redak %1$s, stupac %2$s" "Premještanje na položaj %1$s" diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 7b8738186e..2f469e5fc4 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -114,6 +114,8 @@ "Elem áthelyezése ide" "Elem hozzáadva a kezdőképernyőhöz" "Elem eltávolítva" + + "Elem mozgatása" "Áthelyezés ide: %1$s. sor, %2$s. oszlop" "Áthelyezés a(z) %1$s. pozícióba" diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml index 2b4a38bd7b..54366d48ee 100644 --- a/res/values-hy/strings.xml +++ b/res/values-hy/strings.xml @@ -114,6 +114,8 @@ "Տեղափոխել տարրն այստեղ" "Տարրն ավելացվեց հիմնական էկրանին" "Տարրը հեռացվեց" + + "Տեղափոխել տարրը" "Տեղափոխել տող %1$s սյունակ %2$s" "Տեղափոխել դիրք %1$s" diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 78ffc96845..b55f920db3 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -114,6 +114,8 @@ "Pindahkan item ke sini" "Item ditambahkan ke layar utama" "Item dihapus" + + "Pindahkan item" "Pindahkan ke baris %1$s kolom %2$s" "PIndahkan ke posisi %1$s" diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml index 04842e4f4b..89c9f44bb0 100644 --- a/res/values-is/strings.xml +++ b/res/values-is/strings.xml @@ -114,6 +114,8 @@ "Færa atriði hingað" "Atriði bætt á heimaskjáinn" "Atriði fjarlægt" + + "Færa atriði" "Færa í línu %1$s, dálk %2$s" "Færa í stöðu %1$s" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 28a8f93564..d259eefa21 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -114,6 +114,8 @@ "Sposta elemento qui" "Elemento aggiunto alla schermata Home" "Elemento rimosso" + + "Sposta elemento" "Sposta a riga %1$s, colonna %2$s" "Sposta nella posizione %1$s" diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index d4302c66c3..254256fc9e 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -116,6 +116,8 @@ "העבר את הפריט לכאן" "הפריט הועבר אל מסך דף הבית" "הפריט הוסר" + + "העבר את הפריט" "העבר אל שורה %1$s עמודה %2$s" "העבר אל מיקום %1$s" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 2598d1839e..b296f63fd9 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -114,6 +114,8 @@ "アイテムをここに移動" "アイテムをホーム画面に追加しました" "アイテムを削除しました" + + "アイテムを移動" "行%1$s、列%2$sに移動" "位置%1$sに移動" diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml index 3bdbab7423..33120cd79d 100644 --- a/res/values-ka/strings.xml +++ b/res/values-ka/strings.xml @@ -114,6 +114,8 @@ "ერთეულის გადაადგილება აქ" "ერთეული დაემატა მთავარ ეკრანს" "ერთეული წაიშალა" + + "ერთეულის გადაადგილება" "გადატანა რიგში %1$s სვეტში %2$s" "გადატანა %1$s პოზიციაზე" diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml index 98afcccfe0..102a30d9f1 100644 --- a/res/values-kk/strings.xml +++ b/res/values-kk/strings.xml @@ -114,6 +114,8 @@ "Элементті мұнда жылжыту" "Элемент негізгі экранға қосылды" "Элемент жойылды" + + "Элементті жылжыту" "%1$s-жол, %2$s-бағанға жылжыту" "%1$s-орынға жылжыту" diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml index ba8d775a62..35d28c736b 100644 --- a/res/values-km/strings.xml +++ b/res/values-km/strings.xml @@ -114,6 +114,8 @@ "ផ្លាស់ធាតុមកទីនេះ" "ធាតុដែលត្រូវបានបន្ថែមទៅអេក្រង់ដើម" "ធាតុដែលបានដកចេញ" + + "ផ្លាស់ទីធាតុ" "ផ្លាស់ទីទៅជួរដេកទី %1$s ជួរឈរទី %2$s" "ផ្លាស់ទីទៅទីតាំង %1$s" diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml index 5182fd29a2..0622fc2515 100644 --- a/res/values-kn/strings.xml +++ b/res/values-kn/strings.xml @@ -114,6 +114,8 @@ "ಐಟಂ ಇಲ್ಲಿಗೆ ಸರಿಸಿ" "ಮುಖಪುಟ ಪರದೆಗೆ ಐಟಂ ಸೇರಿಸಲಾಗಿದೆ" "ಐಟಂ ತೆಗೆದುಹಾಕಲಾಗಿದೆ" + + "ಐಟಂ ಸರಿಸಿ" "%1$s ಸಾಲು %2$s ಕಾಲಮ್‌ಗೆ ಸರಿಸಿ" "%1$s ಸ್ಥಾನಕ್ಕೆ ಸರಿಸಿ" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 5e68b1733e..096fe5c204 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -114,6 +114,8 @@ "여기에 항목을 이동" "홈 화면에 항목 추가됨" "항목 삭제됨" + + "항목 이동" "%1$s%2$s열로 이동" "%1$s번 위치로 이동" diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml index da7813e741..1574266e1d 100644 --- a/res/values-ky/strings.xml +++ b/res/values-ky/strings.xml @@ -114,6 +114,8 @@ "Бул нерсени бул жерге жылдыруу" "Башкы экранга кошулду" "Жоюлду" + + "Муну жылдыруу" "%1$s катарга %2$s тилкеге жылдыруу" "%1$s орунга жылдыруу" diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml index d0d127f996..504760567d 100644 --- a/res/values-lo/strings.xml +++ b/res/values-lo/strings.xml @@ -114,6 +114,8 @@ "Move item here" "ເພີ່ມ​ລາຍ​ການ​ໃສ່​ໜ້າ​ຈໍ​ຫຼັກ​ແລ້ວ" "ເອົາ​ລາຍ​ການ​ອອກ​ໄປ​ແລ້ວ" + + "ຍ້າຍ​ລາຍ​ການ" "ຍ້າຍ​ໄປ​ໃສ່​ແຖວ %1$s ຖັນ %2$s" "ຍ້າຍ​ໄປ​ໃສ່​ຕຳ​ແໜ່ງ %1$s" diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index c323fd838f..56f04396e3 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -116,6 +116,8 @@ "Perkelti elementą čia" "Elementas pridėtas prie pagrindinio ekrano" "Elementas perkeltas" + + "Perkelti elementą" "Perkelti į %1$s eilutę, %2$s stulpelį" "Perkelti į %1$s poziciją" diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index be03811c9a..68e2a59288 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -115,6 +115,8 @@ "Pārvietot vienumu šeit" "Vienums pievienots sākuma ekrānam" "Vienums noņemts" + + "Pārvietot vienumu" "Pārvietot uz %1$s. rindu, %2$s. kolonnu" "Pārvietot uz %1$s. pozīciju" diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml index e5dd02776b..e62537a6d3 100644 --- a/res/values-mk/strings.xml +++ b/res/values-mk/strings.xml @@ -114,6 +114,8 @@ "Премести ја ставката овде" "Ставката е додадена на почетниот екран" "Ставката е отстранета" + + "Премести ја ставката" "Премести во ред %1$s колона %2$s" "Премести на место %1$s" diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml index ed3bde6c32..f5551e3ec5 100644 --- a/res/values-ml/strings.xml +++ b/res/values-ml/strings.xml @@ -114,6 +114,8 @@ "ഇനം ഇവിടേക്ക് നീക്കുക" "ഹോം സ്‌ക്രീനിൽ ഇനം ചേർത്തു" "ഇനം നീക്കംചെയ്‌തു" + + "ഇനം നീക്കുക" "വരി %1$s നിര %2$s-ലേക്ക് നീക്കുക" "%1$s-ലേക്ക് നീക്കുക" diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml index 9fbb1e51e4..7ef849d97a 100644 --- a/res/values-mn/strings.xml +++ b/res/values-mn/strings.xml @@ -114,6 +114,8 @@ "Энд байршуулах" "Нүүр дэлгэцэнд нэмсэн зүйл" "Арилгасан зүйл" + + "Зөөх" "%1$s мөр %2$s баганад зөөх" "Байршил %1$s-д зөөх" diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml index a297e06491..ca36483881 100644 --- a/res/values-mr/strings.xml +++ b/res/values-mr/strings.xml @@ -114,6 +114,8 @@ "आयटम येथे हलवा" "आयटम मुख्य स्क्रीनवर जोडला" "आयटम काढला" + + "आयटम हलवा" "पंक्ति %1$s स्तंभ %2$s मध्ये हलवा" "%1$s स्थानावर हलवा" diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 71047fbc50..b5de4f4101 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -114,6 +114,8 @@ "Alihkan item ke sini" "Item ditambahkan pada skrin utama" "Item dialih keluar" + + "Alihkan Item" "Alihkan ke baris %1$s lajur %2$s" "Alihkan ke kedudukan %1$s" diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml index 6c261853a4..ce71d5c040 100644 --- a/res/values-my/strings.xml +++ b/res/values-my/strings.xml @@ -114,6 +114,8 @@ "၎င်းအား ဤသို့ ရွှေ့ပါ" "ပင်မ ဖန်မျက်နှာပြင်သို့ ထည့်ပြီး၏" "၎င်းအား ဖယ်ရှားပြီး၏" + + "၎င်းအား ရွှေ့ပါ" "အတန်း %1$s အတိုင် %2$s သို့ ရွှေ့ပါ" "%1$s သို့ နေရာရွှေ့ပါ" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 67a912b08a..9798bb167f 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -114,6 +114,8 @@ "Flytt elementet hit" "Elementet er lagt til på startskjermen" "Elementet er fjernet" + + "Flytt elementet" "Flytt til rad %1$s, kolonne %2$s" "Flytt til posisjon %1$s" diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index 139ac59289..65641977ff 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -114,6 +114,8 @@ "वस्तु यहाँ सार्नुहोस्" "वस्तु गृह स्क्रिनमा थपियो" "वस्तु हटाइयो" + + "वस्तु सार्नुहोस्" "पङ्क्ति %1$s स्तम्भ %2$s मा सार्नुहोस्" "स्थिति %1$s मा सार्नुहोस्" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 64f4d7912b..0225ef6317 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -114,6 +114,8 @@ "Item hier naartoe verplaatsen" "Item toegevoegd aan startscherm" "Item verwijderd" + + "Item verplaatsen" "Verplaatsen naar rij %1$s, kolom %2$s" "Verplaatsen naar positie %1$s" diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml index cb1cea988b..9b6867a052 100644 --- a/res/values-or/strings.xml +++ b/res/values-or/strings.xml @@ -114,6 +114,8 @@ "ଆଇଟମ୍‌କୁ ଏଠାକୁ ଘୁଞ୍ଚାନ୍ତୁ" "ହୋମ୍‌ ସ୍କ୍ରୀନରେ ଆଇଟମ୍‌ ଯୋଡ଼ାଗଲା" "ଆଇଟମ୍‌ ବାହାର କରାଗଲା" + + "ଆଇଟମ୍‌ ଘୁଞ୍ଚାନ୍ତୁ" "ଧାଡ଼ି %1$s ସ୍ତମ୍ଭ %2$sକୁ ନିଅନ୍ତୁ" "%1$s ସ୍ଥିତିକୁ ନିଅନ୍ତୁ" diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index 1ca7cc8e4f..c38e56a76f 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -114,6 +114,8 @@ "ਆਈਟਮ ਨੂੰ ਇੱਥੇ ਮੂਵ ਕਰੋ" "ਆਈਟਮ ਨੂੰ ਹੋਮ ਸਕ੍ਰੀਨ ਵਿੱਚ ਜੋੜਿਆ ਗਿਆ" "ਅਈਟਮ ਹਟਾਈ ਗਈ" + + "ਆਈਟਮ ਨੂੰ ਮੂਵ ਕਰੋ" "ਕਤਾਰ %1$s ਕਾਲਮ %2$s ਵਿੱਚ ਮੂਵ ਕਰੋ" "ਸਥਿਤੀ %1$s ਵਿੱਚ ਮੂਵ ਕਰੋ" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 776f39dce4..69e6a54141 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -116,6 +116,8 @@ "Przenieś element tutaj" "Element został dodany do ekranu głównego" "Element został usunięty" + + "Przenieś element" "Przenieś do wiersza %1$s w kolumnie %2$s" "Przenieś do pozycji %1$s" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 40105915ce..919a01ad08 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -114,6 +114,8 @@ "Mover o item para aqui" "Item adicionado ao ecrã principal" "Item removido" + + "Mover item" "Mover para a linha %1$s, coluna %2$s" "Mover para a posição %1$s" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 6238e7aefc..874f1e0241 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -114,6 +114,8 @@ "Mover item para cá" "Item adicionado à tela inicial" "Item removido" + + "Mover item" "Mover para a linha %1$s, coluna %2$s" "Mover para a posição %1$s" diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index fb5fb96232..5b4a3e3a47 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -115,6 +115,8 @@ "Mutați elementul aici" "Element adăugat pe ecranul de pornire" "Element eliminat" + + "Mutați elementul" "Mutați pe rândul %1$s, coloana %2$s" "Mutați pe poziția %1$s" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index dd70521a8f..70550f56fc 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -116,6 +116,8 @@ "Переместить элемент сюда" "Элемент добавлен на главный экран" "Элемент удален" + + "Переместить элемент" "Переместить в ячейку %1$s %2$s" "Переместить в позицию %1$s" diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml index ee6112488c..fae5dacae4 100644 --- a/res/values-si/strings.xml +++ b/res/values-si/strings.xml @@ -114,6 +114,8 @@ "මෙතනට අයිතමය ගෙන එන්න" "අයිතමය මුල් තිරය වෙත එකතු කරන ලදි" "අයිතමය ඉවත් කරන ලදි" + + "අයිතමය ගෙනයන්න" "පේළිය %1$s තීරුව %2$s වෙත ගෙන යන්න" "%1$s ස්ථානය වෙත ගෙන යන්න" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 649aecc8a8..c9d8855c13 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -116,6 +116,8 @@ "Presunúť položku sem" "Položka bola pridaná na plochu" "Položka bola odstránená" + + "Presunúť položku" "Presunúť do stĺpca %2$s v riadku %1$s" "Presunúť na %1$s. miesto" diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index aa3bc4fc57..610713c93c 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -116,6 +116,8 @@ "Premik elementa sem" "Element je bil dodan na začetni zaslon" "Element je bil odstranjen" + + "Premik elementa" "Premik v %1$s. vrstico %2$s. stolpca" "Premk na mesto št. %1$s" diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml index 8cf0a8198f..323e223f76 100644 --- a/res/values-sq/strings.xml +++ b/res/values-sq/strings.xml @@ -114,6 +114,8 @@ "Zhvendose artikullin këtu" "Artikulli u shtua tek ekrani bazë" "Artikulli u hoq" + + "Zhvendose artikullin" "Zhvendos te rreshti %1$s, kolona %2$s" "Zhvendos te pozicioni %1$s" diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 42522a579b..6f453491b2 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -115,6 +115,8 @@ "Премести ставку овде" "Ставка је додата на почетни екран" "Ставка је уклоњена" + + "Премести ставку" "Премести у ред %1$s и колону %2$s" "Премести на %1$s. позицију" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 957a4cb2d4..2c3212359e 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -114,6 +114,8 @@ "Flytta objekt hit" "Objektet har lagts till på startskärmen" "Objektet har tagits bort" + + "Flytta objekt" "Flytta till rad %1$s, kolumn %2$s" "Flytta till plats %1$s" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index faa40a71c2..e11f3e6679 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -116,6 +116,8 @@ "Hamishia kipengee hapa" "Kipengee kimeongezwa kwenye skrini ya kwanza" "Kipengee kimeondolewa" + + "Hamisha kipengee" "Hamishia safu mlalo %1$s safu wima %2$s" "Hamishia nafasi ya %1$s" diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml index fedb0fd371..253e3afb50 100644 --- a/res/values-ta/strings.xml +++ b/res/values-ta/strings.xml @@ -114,6 +114,8 @@ "இங்கு நகர்த்து" "முகப்புத் திரையில் சேர்க்கப்பட்டது" "அகற்றப்பட்டது" + + "நகர்த்து" "%1$s வரிசை, %2$s நெடுவரிசைக்கு நகர்த்து" "நிலை %1$sக்கு நகர்த்து" diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml index 3cc97612e8..31501133ee 100644 --- a/res/values-te/strings.xml +++ b/res/values-te/strings.xml @@ -114,6 +114,8 @@ "అంశాన్ని ఇక్కడికి తరలించు" "అంశం హోమ్‌స్క్రీన్‌కి జోడించబడింది" "అంశం తీసివేయబడింది" + + "అంశాన్ని తరలించు" "అడ్డు వరుస %1$s నిలువు వరుస %2$sకి తరలించు" "%1$sవ స్థానానికి తరలించు" diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 2da32de6fd..be4794eb3f 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -114,6 +114,8 @@ "ย้ายรายการมาที่นี่" "เพิ่มรายการไปยังหน้าจอหลักแล้ว" "นำออกรายการออกแล้ว" + + "ย้ายรายการ" "ย้ายไปที่แถว %1$s คอลัมน์ %2$s" "ย้ายไปยังตำแหน่ง %1$s" diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 68d52591f0..0a0707dc4f 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -114,6 +114,8 @@ "Ilipat ang item dito" "Naidagdag sa home screen ang item" "Naalis na ang item" + + "Ilipat ang item" "Ilipat sa row %1$s column %2$s" "Ilipat sa posisyon %1$s" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index af121f237f..df0524bae2 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -114,6 +114,8 @@ "Öğeyi buraya taşı" "Öğe ana ekrana eklendi" "Öğe kaldırıldı" + + "Öğeyi taşı" "%1$s. satır %2$s. sütuna taşı" "%1$s. sıraya taşı" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 305c9aaef7..2b1dc47039 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -116,6 +116,8 @@ "Перемістити елемент сюди" "Елемент додано на головний екран" "Елемент вилучено" + + "Перемістити елемент" "Перемістити в рядок %1$s, стовпець %2$s" "Перемістити на %1$s місце" diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml index c06c943ab8..424ef431ba 100644 --- a/res/values-ur/strings.xml +++ b/res/values-ur/strings.xml @@ -114,6 +114,8 @@ "آئٹم یہاں منتقل کریں" "آئٹم کو ہوم اسکرین میں شامل کر دیا گیا" "آئٹم ہٹا دیا گیا" + + "آئٹم منتقل کریں" "قطار %1$s کالم %2$s میں منتقل کریں" "پوزیشن %1$s میں منتقل کریں" diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml index 287ec09f76..9ff1c36437 100644 --- a/res/values-uz/strings.xml +++ b/res/values-uz/strings.xml @@ -114,6 +114,8 @@ "Obyektni bu yerga ko‘chirish" "Obyekt bosh ekranga qo‘shildi" "Obyekt o‘chirib tashlandi" + + "Obyektni ko‘chirib o‘tkazish" "%1$s %2$s katakka ko‘chirib o‘tkazish" "%1$s-joyga ko‘chirib o‘tkazish" diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 06278f5cf7..d9b0ef1678 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -114,6 +114,8 @@ "Di chuyển mục vào đây" "Đã thêm mục vào màn hình chính" "Đã xóa mục" + + "Di chuyển mục" "Di chuyển đến hàng %1$s cột %2$s" "Di chuyển tới vị trí %1$s" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 640aa0e2f0..a237c041c7 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -114,6 +114,8 @@ "将项目移至此处" "已将项目添加到主屏幕" "项目已移除" + + "移动项目" "移至第 %1$s 行第 %2$s 列" "移至第 %1$s 个位置" diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 2677b21295..bda6008e44 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -114,6 +114,8 @@ "移動項目至這裡" "已將項目加入至主畫面" "項目已移除" + + "移動項目" "移動至第 %1$s 行第 %2$s 列" "移動至位置 %1$s" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 4d37cdd20a..3eeb52057f 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -114,6 +114,8 @@ "將項目移至這裡" "已將項目新增到主畫面" "已移除項目" + + "移動項目" "移至第 %1$s 列第 %2$s 欄" "移至位置 %1$s" diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 8e3e5abc60..75beaea1fb 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -114,6 +114,8 @@ "Hambisa into lapha" "Into ingezwe kusikrini sasekhaya" "Into isusiwe" + + "Hambisa into" "Hambisa kurowu engu-%1$s ikholomu engu-%2$s" "Hambisa kusimo esingu-%1$s" From da4fcfea631c19707131581382be5328b2148692 Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Wed, 5 Sep 2018 09:57:59 -0700 Subject: [PATCH 5/6] Move tapl build rule to Android.bp Bug: 113683301 Test: make Launcher3Tests Change-Id: I9f279bb80f3f399a2271ed8ee94445afbebacb2e --- Android.bp | 29 +++++++++++++++++++++++++++ tests/Android.mk | 51 ++++++++++++++++++++++++++++-------------------- 2 files changed, 59 insertions(+), 21 deletions(-) create mode 100644 Android.bp diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000000..ae54307855 --- /dev/null +++ b/Android.bp @@ -0,0 +1,29 @@ +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +android_library { + name: "launcher-aosp-tapl", + static_libs: [ + "androidx.annotation_annotation", + "androidx-test", + "androidx.test.uiautomator_uiautomator", + "SystemUISharedLib", + ], + srcs: [ + "tests/tapl/**/*.java", + "quickstep/src/com/android/quickstep/SwipeUpSetting.java", + "src/com/android/launcher3/TestProtocol.java", + ], + platform_apis: true, +} diff --git a/tests/Android.mk b/tests/Android.mk index 80b690fb83..7cba33ac39 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -14,26 +14,6 @@ # LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests -LOCAL_STATIC_JAVA_LIBRARIES := \ - androidx-test \ - androidx.test.uiautomator_uiautomator \ - mockito-target-minus-junit4 \ - launcher-aosp-tapl - -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest-common.xml - -LOCAL_SDK_VERSION := 28 -LOCAL_MIN_SDK_VERSION := 21 - -LOCAL_PACKAGE_NAME := Launcher3Tests - -LOCAL_INSTRUMENTATION_FOR := Launcher3 - -include $(BUILD_PACKAGE) # # Build rule for Tapl library. @@ -50,6 +30,35 @@ LOCAL_SRC_FILES := $(call all-java-files-under, tapl) \ ../src/com/android/launcher3/TestProtocol.java LOCAL_SDK_VERSION := current -LOCAL_MODULE := launcher-aosp-tapl +LOCAL_MODULE := ub-launcher-aosp-tapl include $(BUILD_STATIC_JAVA_LIBRARY) + +# +# Build rule for Launcher3Tests +# +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := tests +LOCAL_STATIC_JAVA_LIBRARIES := \ + androidx-test \ + androidx.test.uiautomator_uiautomator \ + mockito-target-minus-junit4 + +ifneq (,$(wildcard frameworks/base)) + LOCAL_PRIVATE_PLATFORM_APIS := true + LOCAL_STATIC_JAVA_LIBRARIES += launcher-aosp-tapl +else + LOCAL_SDK_VERSION := 28 + LOCAL_MIN_SDK_VERSION := 21 + LOCAL_STATIC_JAVA_LIBRARIES += ub-launcher-aosp-tapl +endif + +LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest-common.xml + +LOCAL_PACKAGE_NAME := Launcher3Tests + +LOCAL_INSTRUMENTATION_FOR := Launcher3 + +include $(BUILD_PACKAGE) From d2b09cd4b9ea4e47cc65ae28234807d170976c74 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 5 Sep 2018 10:59:45 -0700 Subject: [PATCH 6/6] Import translations. DO NOT MERGE Change-Id: Ia58f8abb38e258504ee5d103d70ecf0e4bf5d5d4 Auto-generated-cl: translation import --- quickstep/res/values-ro/strings.xml | 2 +- res/values-es/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/quickstep/res/values-ro/strings.xml b/quickstep/res/values-ro/strings.xml index 032d886fb1..0c201ba7e5 100644 --- a/quickstep/res/values-ro/strings.xml +++ b/quickstep/res/values-ro/strings.xml @@ -19,7 +19,7 @@ - "Ecran divizat" + "Ecran împărțit" "Fixați" "Recente" "Niciun element recent" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 0829533282..f8b81ea437 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -80,7 +80,7 @@ "Widgets" "Fondos de pantalla" "Ajustes de la pantalla de inicio" - "Inhabilitada por el administrador" + "Inhabilitado por el administrador" "Permitir rotación de la pantalla de inicio" "Al girar el teléfono" "Burbujas de notificación"