From ae8462afb5f4f3df0dcf31b708bce7ddd909ae37 Mon Sep 17 00:00:00 2001 From: Samuel Fufa Date: Wed, 7 Jul 2021 18:20:53 -0500 Subject: [PATCH 01/13] Update work fab radius to match height Bug: 192666217 Test: presubmit Change-Id: I948cab4ce5477eed68480daf70570851d9715006 --- res/drawable/work_card.xml | 2 +- res/values/dimens.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/res/drawable/work_card.xml b/res/drawable/work_card.xml index 7048955b74..4a66cacd72 100644 --- a/res/drawable/work_card.xml +++ b/res/drawable/work_card.xml @@ -19,6 +19,6 @@ xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" android:shape="rectangle"> - + diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 2a2cf89459..97feae2a59 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -120,13 +120,14 @@ 56dp - 24dp + 28dp 24dp 32dp 16dp 20dp 16sp 16dp + 28dp 32dp 16dp From 73202ec6b3f0d506da25e5bfa1a1fc79ef6c62a4 Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Thu, 8 Jul 2021 15:25:29 +0100 Subject: [PATCH 02/13] Add logs for debugging TaplTestQuickStep.testOverviewActions on cf_foldables - The failure is not reproducible locally, thus requires adding logs and check ATP result Bug: 193125090 Test: Manual Change-Id: I3d2d37a43d4b89885214b72e48f45a9b6bc63f61 --- .../android/quickstep/views/RecentsView.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 0103acf92a..897dfbec6d 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -82,6 +82,7 @@ import android.text.StaticLayout; import android.text.TextPaint; import android.util.AttributeSet; import android.util.FloatProperty; +import android.util.Log; import android.util.SparseBooleanArray; import android.view.Gravity; import android.view.HapticFeedbackConstants; @@ -128,8 +129,8 @@ import com.android.launcher3.util.DynamicResource; import com.android.launcher3.util.IntSet; import com.android.launcher3.util.MultiValueAlpha; import com.android.launcher3.util.ResourceBasedOverride.Overrides; -import com.android.launcher3.util.SplitConfigurationOptions; import com.android.launcher3.util.RunnableList; +import com.android.launcher3.util.SplitConfigurationOptions; import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption; import com.android.launcher3.util.Themes; import com.android.launcher3.util.TranslateEdgeEffect; @@ -988,6 +989,7 @@ public abstract class RecentsView 0) { setSwipeDownShouldLaunchApp(true); @@ -1159,6 +1164,7 @@ public abstract class RecentsView 0) { mFocusedTaskId = getTaskViewAt(0).getTaskId(); + Log.d("b/193125090", "applyLoadPlan - mFocusedTaskId: " + mFocusedTaskId); } updateTaskSize(); @@ -1475,14 +1481,22 @@ public abstract class RecentsView Date: Thu, 8 Jul 2021 15:48:51 +0100 Subject: [PATCH 03/13] Restricts the width of pin widget dialog to 89% on large screen devices Test: manual Fix: 193116981 Change-Id: I6ff8920a3698e6c11729b01a140a6942268f67cc --- .../launcher3/widget/AddItemWidgetsBottomSheet.java | 10 ++++++++++ src/com/android/launcher3/widget/BaseWidgetSheet.java | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/widget/AddItemWidgetsBottomSheet.java b/src/com/android/launcher3/widget/AddItemWidgetsBottomSheet.java index 1cc7f53bf9..13245390fa 100644 --- a/src/com/android/launcher3/widget/AddItemWidgetsBottomSheet.java +++ b/src/com/android/launcher3/widget/AddItemWidgetsBottomSheet.java @@ -18,6 +18,7 @@ package com.android.launcher3.widget; import static com.android.launcher3.Utilities.ATLEAST_R; import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN; +import static com.android.launcher3.widget.BaseWidgetSheet.MAX_WIDTH_SCALE_FOR_LARGER_SCREEN; import android.animation.PropertyValuesHolder; import android.annotation.SuppressLint; @@ -93,6 +94,15 @@ public class AddItemWidgetsBottomSheet extends AbstractSlideInView * The maximum scale, [0, 1], of the device screen width that the widgets picker can consume * on large screen devices. */ - protected static final float MAX_WIDTH_SCALE_FOR_LARGER_SCREEN = 0.8f; + protected static final float MAX_WIDTH_SCALE_FOR_LARGER_SCREEN = 0.89f; protected static final String KEY_WIDGETS_EDUCATION_TIP_SEEN = "launcher.widgets_education_tip_seen"; From 3b8d6cfda2b15494c393d3070a9420a7f74586d8 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 8 Jul 2021 15:14:54 +0000 Subject: [PATCH 04/13] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I549f22555e9238bd4b47112e6076a1cba6e67a9a --- go/quickstep/res/values-af/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-am/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-ar/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-as/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-az/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-b+sr+Latn/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-be/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-bg/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-bn/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-bs/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-ca/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-cs/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-da/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-de/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-el/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-en-rAU/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-en-rCA/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-en-rGB/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-en-rIN/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-en-rXC/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-es-rUS/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-es/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-et/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-eu/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-fa/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-fi/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-fr-rCA/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-fr/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-gl/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-gu/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-hi/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-hr/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-hu/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-hy/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-in/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-is/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-it/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-iw/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-ja/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-ka/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-kk/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-km/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-kn/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-ko/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-ky/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-lo/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-lt/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-lv/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-mk/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-ml/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-mn/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-mr/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-ms/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-my/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-nb/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-ne/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-nl/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-or/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-pa/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-pl/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-pt-rPT/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-pt/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-ro/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-ru/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-si/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-sk/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-sl/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-sq/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-sr/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-sv/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-sw/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-ta/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-te/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-th/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-tl/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-tr/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-uk/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-ur/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-uz/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-vi/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-zh-rCN/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-zh-rHK/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-zh-rTW/strings.xml | 20 +++++++++++++++++-- go/quickstep/res/values-zu/strings.xml | 20 +++++++++++++++++-- 84 files changed, 1512 insertions(+), 168 deletions(-) diff --git a/go/quickstep/res/values-af/strings.xml b/go/quickstep/res/values-af/strings.xml index 36b38b0657..722cdda8e8 100644 --- a/go/quickstep/res/values-af/strings.xml +++ b/go/quickstep/res/values-af/strings.xml @@ -5,8 +5,24 @@ "Luister" "Vertaal" "Lens" + + + + + + "Vertaal of luister na teks op skerm" "Inligting soos teks op jou skerm, webadresse en skermskote kan met Google gedeel word.\n\nGaan na ""Instellings > Programme > Verstekprogramme > Digitale Assistent-program"" om te verander watter inligting jy deel." - "KANSELLEER" - "HET DIT" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-am/strings.xml b/go/quickstep/res/values-am/strings.xml index 7fab663fbf..ecf3d4876b 100644 --- a/go/quickstep/res/values-am/strings.xml +++ b/go/quickstep/res/values-am/strings.xml @@ -5,8 +5,24 @@ "ያዳምጡ" "ተርጉም" "ሌንስ" + + + + + + "በማያ ገጹ ላይ ጽሑፍን ይተረጉሙ ወይም ያዳምጡ" "እንደ በማያ ገጽዎ ላይ ያለ ጽሑፍ፣ የድር አድራሻዎች እና ቅጽበታዊ ገጽ እይታዎች ያሉ መረጃዎች ለGoogle ሊጋሩ ይችላሉ።\n\nምን መረጃ እንደሚያጋሩ ለመቀየር ወደ ""ቅንብሮች > መተግበሪያዎች > ነባሪ መተግበሪያዎች > ዲጂታል ረዳት መተግበሪያ"" ይሂዱ።" - "ይቅር" - "ገባኝ" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-ar/strings.xml b/go/quickstep/res/values-ar/strings.xml index 7ea0ed051a..3f6e369e16 100644 --- a/go/quickstep/res/values-ar/strings.xml +++ b/go/quickstep/res/values-ar/strings.xml @@ -5,8 +5,24 @@ "استماع" "‏ترجمة Google" "‏عدسة Google" + + + + + + "ترجمة النص الظاهر على الشاشة أو الاستماع إليه" "‏قد تتم مشاركة معلومات مثل النص الظاهر على الشاشة وعناوين الويب ولقطات الشاشة مع Google.\n\nلتغيير المعلومات التي تتم مشاركتها، انتقِل إلى ""الإعدادات > التطبيقات > التطبيقات التلقائية > تطبيق المساعد الرقمي""." - "إلغاء" - "حسنًا" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-as/strings.xml b/go/quickstep/res/values-as/strings.xml index d5d234cb46..8940077193 100644 --- a/go/quickstep/res/values-as/strings.xml +++ b/go/quickstep/res/values-as/strings.xml @@ -5,8 +5,24 @@ "শুনক" "অনুবাদ কৰক" "লেন্স" + + + + + + "স্ক্ৰীনত থকা পাঠ অনুবাদ কৰক অথবা শুনক" "আপোনাৰ স্ক্ৰীনত থকা পাঠ, ৱেব ঠিকনা আৰু স্ক্ৰীনশ্বটৰ দৰে তথ্য Googleৰ সৈতে হয়তো শ্বেয়াৰ কৰা হ’ব।\n\nআপুনি কোনসমুহ তথ্য শ্বেয়াৰ কৰিব সেয়া সলনি কৰিবলৈ, ""ছেটিং > এপ্‌ > ডিফ’ল্ট এপ্‌ > ডিজিটেল সহায়ক এপ""লৈ যাওক।" - "বাতিল কৰক" - "বুজি পালোঁ" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-az/strings.xml b/go/quickstep/res/values-az/strings.xml index 6fd0dd2cfb..1914c3b6e3 100644 --- a/go/quickstep/res/values-az/strings.xml +++ b/go/quickstep/res/values-az/strings.xml @@ -5,8 +5,24 @@ "Dinləyin" "Tərcümə" "Linza" + + + + + + "Ekrandakı mətni tərcümə edin və ya dinləyin" "Ekrandakı mətn, veb ünvanlar və ekran görüntüləri kimi məlumatlar Google ilə paylaşıla bilər.\n\nHansı məlumatların paylaşılmasını dəyişmək üçün ""Ayarlar > Tətbiqlər > Defolt tətbiqlər > Rəqəmsal assistent tətbiqi"" bölməsinə keçin." - "LƏĞV EDİN" - "ANLADIM" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-b+sr+Latn/strings.xml b/go/quickstep/res/values-b+sr+Latn/strings.xml index de76cca89d..fc574c8676 100644 --- a/go/quickstep/res/values-b+sr+Latn/strings.xml +++ b/go/quickstep/res/values-b+sr+Latn/strings.xml @@ -5,8 +5,24 @@ "Pusti" "Prevedi" "Objektiv" + + + + + + "Prevodite ili slušajte tekst na ekranu" "Informacije poput teksta na ekranu, veb-adresa i snimaka ekrana mogu da se dele sa Google-om.\n\nDa biste promenili informacije koje delite, idite u ""Podešavanja > Aplikacije > Podrazumevane aplikacije > Aplikacija digitalnog pomoćnika""." - "OTKAŽI" - "VAŽI" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-be/strings.xml b/go/quickstep/res/values-be/strings.xml index 9d8220356b..e7bfec61de 100644 --- a/go/quickstep/res/values-be/strings.xml +++ b/go/quickstep/res/values-be/strings.xml @@ -5,8 +5,24 @@ "Праслухаць" "Перакласці" "Аб\'ектыў" + + + + + + "Перакласці ці праслухаць тэкст на экране" "Такая інфармацыя з вашага экрана, як тэксты, вэб-адрасы і здымкі экрана, можа абагульвацца з Google.\n\nКаб змяніць тып інфармацыі для абагульвання, адкрыйце ""Налады > Праграмы > Стандартныя праграмы > Лічбавы памочнік""." - "СКАСАВАЦЬ" - "ЗРАЗУМЕЛА" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-bg/strings.xml b/go/quickstep/res/values-bg/strings.xml index 0408fbafc1..6b2a5f2e2e 100644 --- a/go/quickstep/res/values-bg/strings.xml +++ b/go/quickstep/res/values-bg/strings.xml @@ -5,8 +5,24 @@ "Слушане" "Превод" "Обектив" + + + + + + "Превеждане или четене на текста на екрана" "Определена информация може да бъде споделена с Google, като например текстът на екрана ви, уеб адресите и екранните снимки.\n\nЗа да промените информацията, която споделяте, отворете ""„Настройки“ > „Приложения“ > „Приложения по подразбиране“ > „Приложение за дигитален асистент“""." - "ОТКАЗ" - "РАЗБРАХ" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-bn/strings.xml b/go/quickstep/res/values-bn/strings.xml index 5b4fd34068..f690668fef 100644 --- a/go/quickstep/res/values-bn/strings.xml +++ b/go/quickstep/res/values-bn/strings.xml @@ -5,8 +5,24 @@ "শুনুন" "অনুবাদ করুন" "লেন্স" + + + + + + "অনুবাদ করুন বা স্ক্রিনে দেখানো টেক্সট শুনুন" "আপনার স্ক্রিনে থাকা তথ্য যেমন ওয়েব ঠিকানা এবং স্ক্রিনশট Google-এর সাথে শেয়ার করা হতে পারে।\n\nকোন কোন তথ্য শেয়ার করবেন তা বেছে নিতে, ""সেটিংস > অ্যাপ > ডিফল্ট অ্যাপ > ডিজিটাল অ্যাসিস্ট্যান্ট অ্যাপ"" বিকল্পগুলি বেছে নিন।" - "বাতিল করুন" - "বুঝেছি" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-bs/strings.xml b/go/quickstep/res/values-bs/strings.xml index f83521e9fc..88b4a21d28 100644 --- a/go/quickstep/res/values-bs/strings.xml +++ b/go/quickstep/res/values-bs/strings.xml @@ -5,8 +5,24 @@ "Poslušajte" "Prevedi" "Objektiv" + + + + + + "Prevedite ili slušajte tekst na ekranu" "Informacije kao što su tekst na ekranu, web adrese i snimci ekrana mogu se dijeliti s Googleom.\n\nDa promijenite koje informacije dijelite, idite u ""Postavke > Aplikacije > Zadane aplikacije > Aplikacija digitalnog asistenta""." - "OTKAŽI" - "RAZUMIJEM" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-ca/strings.xml b/go/quickstep/res/values-ca/strings.xml index 3320b06c0e..cb633d7969 100644 --- a/go/quickstep/res/values-ca/strings.xml +++ b/go/quickstep/res/values-ca/strings.xml @@ -5,8 +5,24 @@ "Escolta" "Tradueix" "Lens" + + + + + + "Tradueix o escolta el text en pantalla" "És possible que determinada informació es comparteixi amb Google, com ara el text en pantalla, les adreces web i les captures de pantalla.\n\nPer canviar quina informació comparteixes, ves a ""Configuració > Aplicacions > Aplicacions predeterminades > Aplicació de l\'assistent digital""." - "CANCEL·LA" - "ENTESOS" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-cs/strings.xml b/go/quickstep/res/values-cs/strings.xml index 310727eeb3..9f6906068f 100644 --- a/go/quickstep/res/values-cs/strings.xml +++ b/go/quickstep/res/values-cs/strings.xml @@ -5,8 +5,24 @@ "Poslechnout" "Přeložit" "Lens" + + + + + + "Překládejte nebo poslouchejte text na obrazovce" "S Googlem mohou být sdílena data, jako je text na obrazovce, webové adresy a snímky obrazovky.\n\nSdílená data můžete upřesnit v ""Nastavení > Aplikace > Výchozí aplikace > Aplikace digitálního asistenta""." - "ZRUŠIT" - "ROZUMÍM" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-da/strings.xml b/go/quickstep/res/values-da/strings.xml index 16b8fbbfeb..973c32014d 100644 --- a/go/quickstep/res/values-da/strings.xml +++ b/go/quickstep/res/values-da/strings.xml @@ -5,8 +5,24 @@ "Lyt" "Oversæt" "Lens" + + + + + + "Oversæt eller hør tekst på skærmen" "Oplysninger såsom tekst på din skærm, webadresser og screenshots deles muligvis med Google.\n\nHvis du vil ændre, hvilke oplysninger du deler, kan du gå til ""Indstillinger > Apps > Standardapps > App for digital assistent""." - "ANNULLER" - "OK" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-de/strings.xml b/go/quickstep/res/values-de/strings.xml index f29879e4b4..8a8fd4ab55 100644 --- a/go/quickstep/res/values-de/strings.xml +++ b/go/quickstep/res/values-de/strings.xml @@ -5,8 +5,24 @@ "Anhören" "Übersetzen" "Lens" + + + + + + "Text auf dem Bildschirm übersetzen oder anhören" "Informationen, wie Text auf deinem Bildschirm, Webadressen und Screenshots, werden möglicherweise an Google weitergegeben.\n\nWenn du ändern möchtest, welche Informationen weitergegeben werden, gehe zu ""Einstellungen > Apps > Standard-Apps > App für digitalen Assistenten""." - "ABBRECHEN" - "OK" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-el/strings.xml b/go/quickstep/res/values-el/strings.xml index 59cae3de6b..25072bfddb 100644 --- a/go/quickstep/res/values-el/strings.xml +++ b/go/quickstep/res/values-el/strings.xml @@ -5,8 +5,24 @@ "Ακρόαση" "Μετάφραση" "Lens" + + + + + + "Μετάφραση ή ακρόαση του κειμένου στην οθόνη" "Πληροφορίες όπως είναι το κείμενο στην οθόνη, οι διευθύνσεις ιστού και τα στιγμιότυπα οθόνης, ενδέχεται να κοινοποιηθούν στην Google.\n\nΓια να αλλάξετε τις πληροφορίες που κοινοποιείτε, μεταβείτε στις ""Ρυθμίσεις > Εφαρμογές > Προεπιλεγμένες εφαρμογές > Εφαρμογή ψηφιακού βοηθού""." - "ΑΚΥΡΩΣΗ" - "ΟΚ" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-en-rAU/strings.xml b/go/quickstep/res/values-en-rAU/strings.xml index 54b1330686..3108295e84 100644 --- a/go/quickstep/res/values-en-rAU/strings.xml +++ b/go/quickstep/res/values-en-rAU/strings.xml @@ -5,8 +5,24 @@ "Listen" "Translate" "Lens" + + + + + + "Translate or listen to text on screen" "Information such as text on your screen, web addresses and screenshots may be shared with Google.\n\nTo change what information you share, go to ""Settings > Apps > Default apps > Digital assistant app""." - "CANCEL" - "OK" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-en-rCA/strings.xml b/go/quickstep/res/values-en-rCA/strings.xml index 54b1330686..3108295e84 100644 --- a/go/quickstep/res/values-en-rCA/strings.xml +++ b/go/quickstep/res/values-en-rCA/strings.xml @@ -5,8 +5,24 @@ "Listen" "Translate" "Lens" + + + + + + "Translate or listen to text on screen" "Information such as text on your screen, web addresses and screenshots may be shared with Google.\n\nTo change what information you share, go to ""Settings > Apps > Default apps > Digital assistant app""." - "CANCEL" - "OK" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-en-rGB/strings.xml b/go/quickstep/res/values-en-rGB/strings.xml index 54b1330686..3108295e84 100644 --- a/go/quickstep/res/values-en-rGB/strings.xml +++ b/go/quickstep/res/values-en-rGB/strings.xml @@ -5,8 +5,24 @@ "Listen" "Translate" "Lens" + + + + + + "Translate or listen to text on screen" "Information such as text on your screen, web addresses and screenshots may be shared with Google.\n\nTo change what information you share, go to ""Settings > Apps > Default apps > Digital assistant app""." - "CANCEL" - "OK" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-en-rIN/strings.xml b/go/quickstep/res/values-en-rIN/strings.xml index 54b1330686..3108295e84 100644 --- a/go/quickstep/res/values-en-rIN/strings.xml +++ b/go/quickstep/res/values-en-rIN/strings.xml @@ -5,8 +5,24 @@ "Listen" "Translate" "Lens" + + + + + + "Translate or listen to text on screen" "Information such as text on your screen, web addresses and screenshots may be shared with Google.\n\nTo change what information you share, go to ""Settings > Apps > Default apps > Digital assistant app""." - "CANCEL" - "OK" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-en-rXC/strings.xml b/go/quickstep/res/values-en-rXC/strings.xml index cac376e761..54eb30dda8 100644 --- a/go/quickstep/res/values-en-rXC/strings.xml +++ b/go/quickstep/res/values-en-rXC/strings.xml @@ -5,8 +5,24 @@ "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‏‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎Listen‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎Translate‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‏‎‎‎‏‏‎‎‏‏‎‎‏‎‎‎‎Lens‎‏‎‎‏‎" + + + + + + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎Translate or listen to text on screen‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‏‎‏‎‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‏‎‏‎‏‎‎‏‎Information such as text on your screen, web addresses, and screenshots may be shared with Google.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To change what information you share, go to ‎‏‎‎‏‏‎""‎‏‎‎‏‏‏‎Settings > Apps > Default apps > Digital assistant app‎‏‎‎‏‏‎""‎‏‎‎‏‏‏‎.‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‎CANCEL‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‏‏‎‎‏‏‏‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‏‏‎‏‏‎‎‏‎‎‏‎‏‎‏‏‎‏‎‎GOT IT‎‏‎‎‏‎" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-es-rUS/strings.xml b/go/quickstep/res/values-es-rUS/strings.xml index 475366282c..e9762ddf11 100644 --- a/go/quickstep/res/values-es-rUS/strings.xml +++ b/go/quickstep/res/values-es-rUS/strings.xml @@ -5,8 +5,24 @@ "Escuchar" "Traducir" "Lens" + + + + + + "Traduce o escucha el texto que aparece en la pantalla" "Es posible que se comparta información con Google, como el texto de la pantalla, direcciones web y capturas de pantalla.\n\nPara cambiar la información que se comparte, ve a ""Configuración > Apps > Apps predeterminadas > App de asistente digital""." - "CANCELAR" - "ENTENDIDO" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-es/strings.xml b/go/quickstep/res/values-es/strings.xml index fe227d46e0..2ca750ea2e 100644 --- a/go/quickstep/res/values-es/strings.xml +++ b/go/quickstep/res/values-es/strings.xml @@ -5,8 +5,24 @@ "Escuchar" "Traducir" "Lens" + + + + + + "Traduce o escucha texto que haya en pantalla" "Se puede compartir con Google cierta información, como el texto que aparece en pantalla, direcciones web o capturas de pantalla.\n\nPara cambiar la información que compartes, ve a ""Ajustes > Aplicaciones > Aplicaciones predeterminadas > Asistente digital""." - "CANCELAR" - "ENTENDIDO" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-et/strings.xml b/go/quickstep/res/values-et/strings.xml index 40f9f15f77..5bab725a24 100644 --- a/go/quickstep/res/values-et/strings.xml +++ b/go/quickstep/res/values-et/strings.xml @@ -5,8 +5,24 @@ "Kuula" "Tõlge" "Lens" + + + + + + "Ekraanil oleva teksti tõlkimine või kuulamine" "Teavet, nagu teie ekraanil olev tekst, veebiaadressid ja ekraanipildid, võidakse jagada Google\'iga.\n\nKui soovite muuta, millist teavet jagate, avage ""Seaded > Rakendused > Vaikerakendused > Digitaalse assistendi rakendus""." - "LOOBU" - "SELGE" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-eu/strings.xml b/go/quickstep/res/values-eu/strings.xml index 8a71fd91b6..e4e456bc0d 100644 --- a/go/quickstep/res/values-eu/strings.xml +++ b/go/quickstep/res/values-eu/strings.xml @@ -5,8 +5,24 @@ "Entzun" "Itzuli" "Lens" + + + + + + "Itzuli edo entzun pantailako testua" "Agian pantailako testua, web-helbideak, pantaila-argazkiak eta antzeko informazioa partekatuko duzu Google-rekin.\n\nPartekatzen duzun informazioa aldatzeko, joan hona: ""Ezarpenak > Aplikazioak > Aplikazio lehenetsiak > Laguntzaile digitalaren aplikazioa""." - "UTZI" - "ADOS" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-fa/strings.xml b/go/quickstep/res/values-fa/strings.xml index d07c57eaa3..6e960775fa 100644 --- a/go/quickstep/res/values-fa/strings.xml +++ b/go/quickstep/res/values-fa/strings.xml @@ -5,8 +5,24 @@ "گوش دادن" "ترجمه" "لنز" + + + + + + "ترجمه نوشتار روی صفحه‌نمایش یا گوش دادن به آن" "‏ممکن است اطلاعاتی مثل نوشتار روی صفحه‌نمایش، نشانی‌های وب، و نماگرفت‌ها با Google هم‌رسانی شود.\n\nبرای تغییر اطلاعاتی که هم‌رسانی می‌کنید، به ""تنظیمات < برنامه‌ها < برنامه‌های پیش‌فرض < برنامه دستیار دیجیتال"" بروید." - "لغو" - "متوجه شدم" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-fi/strings.xml b/go/quickstep/res/values-fi/strings.xml index f7b8d785f8..51a4474de9 100644 --- a/go/quickstep/res/values-fi/strings.xml +++ b/go/quickstep/res/values-fi/strings.xml @@ -5,8 +5,24 @@ "Kuuntele" "Käännä" "Lens" + + + + + + "Käännä tai kuuntele näytöllä oleva teksti" "Googlelle saatetaan jakaa näytöllä olevaa tekstiä, verkko-osoitteita, kuvakaappauksia ja muita tietoja.\n\nVoit valita jaettavat tiedot valitsemalla ""Asetukset > Sovellukset > Oletussovellukset > Digiavustajasovellus""." - "PERU" - "SELVÄ" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-fr-rCA/strings.xml b/go/quickstep/res/values-fr-rCA/strings.xml index 2ccf503c1f..5ffded5fee 100644 --- a/go/quickstep/res/values-fr-rCA/strings.xml +++ b/go/quickstep/res/values-fr-rCA/strings.xml @@ -5,8 +5,24 @@ "Écouter" "Traduire" "Lentille" + + + + + + "Traduire ou écouter le texte à l\'écran" "Des renseignements comme du texte sur votre écran, des adresses Web et des captures d\'écran peuvent être partagés avec Google.\n\nPour modifier les renseignements que vous partagez, accédez à ""Paramètres > Applications > Applications par défaut > Application d\'assistant numérique""." - "ANNULER" - "OK" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-fr/strings.xml b/go/quickstep/res/values-fr/strings.xml index 88160323f0..62007f0297 100644 --- a/go/quickstep/res/values-fr/strings.xml +++ b/go/quickstep/res/values-fr/strings.xml @@ -5,8 +5,24 @@ "Écouter" "Traduire" "Lens" + + + + + + "Traduire ou écouter le texte à l\'écran" "Des informations comme le texte sur votre écran, des adresses Web et des captures d\'écran peuvent être partagées avec Google.\n\nPour modifier les types d\'informations que vous partagez, accédez à ""Paramètres > Applis > Applis par défaut > Appli d\'assistant numérique""." - "ANNULER" - "OK" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-gl/strings.xml b/go/quickstep/res/values-gl/strings.xml index 6946cde504..e7d9d79292 100644 --- a/go/quickstep/res/values-gl/strings.xml +++ b/go/quickstep/res/values-gl/strings.xml @@ -5,8 +5,24 @@ "Escoitar" "Traducir" "Lens" + + + + + + "Traducir ou escoitar o texto que aparece na pantalla" "É posible que se comparta con Google información como o texto que aparece na pantalla, os enderezos web e as capturas de pantalla.\n\nPara cambiar os datos que se comparten, vai a ""Configuración > Aplicacións > Aplicacións predeterminadas > Aplicación de asistente dixital""." - "CANCELAR" - "ENTENDIDO" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-gu/strings.xml b/go/quickstep/res/values-gu/strings.xml index 13815aa2d1..d8839fc3b7 100644 --- a/go/quickstep/res/values-gu/strings.xml +++ b/go/quickstep/res/values-gu/strings.xml @@ -5,8 +5,24 @@ "સાંભળો" "અનુવાદ કરો" "Lens" + + + + + + "સ્ક્રીન પરની ટેક્સ્ટનો અનુવાદ કરો અથવા સાંભળો" "તમારી સ્ક્રીન પરની ટેક્સ્ટ, વેબ ઍડ્રેસ અને સ્ક્રીનશૉટ જેવી માહિતી Google સાથે શેર કરવામાં આવી શકે છે.\n\nતમે શેર કરતા હો તેવી માહિતીમાં ફેરફાર કરવા માટે, ""સેટિંગ > ઍપ > ડિફૉલ્ટ ઍપ > ડિજિટલ Assistant ઍપ"" પર જાઓ." - "રદ કરો" - "સમજાઈ ગયું" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-hi/strings.xml b/go/quickstep/res/values-hi/strings.xml index 361a546437..4cc6236300 100644 --- a/go/quickstep/res/values-hi/strings.xml +++ b/go/quickstep/res/values-hi/strings.xml @@ -5,8 +5,24 @@ "सुनें" "अनुवाद करें" "Google Lens" + + + + + + "स्क्रीन पर मौजूद टेक्स्ट का अनुवाद पाएं या उसे सुनें" "आपकी स्क्रीन पर मौजूद टेक्स्ट, वेब पते, और स्क्रीनशॉट जैसी जानकारी Google के साथ शेयर की जा सकती है.\n\nआप Google के साथ किस जानकारी को शेयर करते हैं, इसे कंट्रोल करने के लिए ""सेटिंग > ऐप्लिकेशन > डिफ़ॉल्ट ऐप्लिकेशन > डिजिटल असिस्टेंट ऐप्लिकेशन"" पर जाएं." - "रद्द करें" - "ठीक है" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-hr/strings.xml b/go/quickstep/res/values-hr/strings.xml index b8f94c62ce..dbe026691a 100644 --- a/go/quickstep/res/values-hr/strings.xml +++ b/go/quickstep/res/values-hr/strings.xml @@ -5,8 +5,24 @@ "Slušajte" "Prevedi" "Objektiv" + + + + + + "Prevedite ili slušajte tekst na zaslonu" "Informacije kao što su tekst na vašem zaslonu, web-adrese i snimke zaslona mogu se dijeliti s Googleom.\n\nDa biste promijenili informacije koje dijelite, otvorite ""Postavke > Aplikacije > Zadane aplikacije > Aplikacija digitalnog asistenta""." - "ODUSTANI" - "SHVAĆAM" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-hu/strings.xml b/go/quickstep/res/values-hu/strings.xml index bb2127c7e5..3606f9c64f 100644 --- a/go/quickstep/res/values-hu/strings.xml +++ b/go/quickstep/res/values-hu/strings.xml @@ -5,8 +5,24 @@ "Lejátszás" "Fordítás" "Lens" + + + + + + "Képernyőn megjelenő szöveg fordítása és hallgatása" "Előfordulhat, hogy a rendszer megoszt bizonyos adatokat (például képernyőn megjelenő szöveget, internetcímeket és képernyőképeket) a Google-lal.\n\nHa módosítani szeretné, hogy milyen adatokat oszt meg, lépjen a ""Beállítások és alkalmazások; Alapértelmezett alkalmazások; Digitális asszisztens app"" menüpontra." - "MÉGSE" - "ÉRTEM" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-hy/strings.xml b/go/quickstep/res/values-hy/strings.xml index 6ea56014ae..6cee921608 100644 --- a/go/quickstep/res/values-hy/strings.xml +++ b/go/quickstep/res/values-hy/strings.xml @@ -5,8 +5,24 @@ "Լսել" "Թարգմանել" "Տեսապակի" + + + + + + "Էկրանի տեքստի թարգմանություն կամ ունկնդրում" "Որոշակի տեղեկություններ (օր․՝ էկրանի տեքստը, վեբ հասցեները և սքրինշոթները) կարող են ուղարկվել Google-ին։\n\nՏեղեկությունները, որոնցով դուք կիսվում եք, կարող եք փոխել՝ անցնելով ""Կարգավորումներ > Հավելվածներ > Կանխադրված հավելվածներ > Թվային օգնականի հավելված""։" - "ՉԵՂԱՐԿԵԼ" - "ԵՂԱՎ" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-in/strings.xml b/go/quickstep/res/values-in/strings.xml index e84494493e..74bbbd7d05 100644 --- a/go/quickstep/res/values-in/strings.xml +++ b/go/quickstep/res/values-in/strings.xml @@ -5,8 +5,24 @@ "Dengarkan" "Terjemahkan" "Lens" + + + + + + "Terjemahkan atau dengarkan teks di layar" "Informasi seperti teks di layar, alamat web, dan screenshot dapat dibagikan ke Google.\n\nUntuk mengubah informasi yang Anda bagikan, buka ""Setelan > Aplikasi > Aplikasi default > Aplikasi asisten digital""." - "BATAL" - "OKE" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-is/strings.xml b/go/quickstep/res/values-is/strings.xml index 1b74853b91..ce27dbbc13 100644 --- a/go/quickstep/res/values-is/strings.xml +++ b/go/quickstep/res/values-is/strings.xml @@ -5,8 +5,24 @@ "Hlusta" "Þýða" "Linsa" + + + + + + "Þýða eða hlusta á texta á skjánum" "Mögulegt er að upplýsingum á borð við texta á skjánum, vefslóðum og skjámyndum verði deilt með Google.\n\nTil að breyta því hvaða upplýsingum þú deilir skaltu opna ""Stillingar > Forrit > Sjálfgefin forrit > Forrit stafræns hjálpara""." - "HÆTTA VIÐ" - "ÉG SKIL" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-it/strings.xml b/go/quickstep/res/values-it/strings.xml index 8a475607d4..3f19491b4d 100644 --- a/go/quickstep/res/values-it/strings.xml +++ b/go/quickstep/res/values-it/strings.xml @@ -5,8 +5,24 @@ "Ascolta" "Traduttore" "Lens" + + + + + + "Traduci o ascolta il testo sullo schermo" "Alcune informazioni, come il testo sullo schermo, gli indirizzi web e gli screenshot, potrebbero essere condivise con Google.\n\nPer modificare quali informazioni condividere, vai a ""Impostazioni > App > App predefinite > App assistente digitale""." - "ANNULLA" - "OK" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-iw/strings.xml b/go/quickstep/res/values-iw/strings.xml index 7c419ede70..8166a37483 100644 --- a/go/quickstep/res/values-iw/strings.xml +++ b/go/quickstep/res/values-iw/strings.xml @@ -5,8 +5,24 @@ "האזנה" "תרגום" "Lens" + + + + + + "תרגום טקסט שמוצג במסך או האזנה לו" "‏ייתכן שישותף עם Google מידע כגון טקסט שמוצג במסך, כתובות אינטרנט וצילומי מסך.\n\nכדי לקבוע איזה מידע ישותף, יש לעבור אל ""הגדרות > אפליקציות &gt אפליקציות ברירת מחדל > אפליקציית עוזר דיגיטלי""." - "ביטול" - "הבנתי" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-ja/strings.xml b/go/quickstep/res/values-ja/strings.xml index 06066027dc..bc428b110e 100644 --- a/go/quickstep/res/values-ja/strings.xml +++ b/go/quickstep/res/values-ja/strings.xml @@ -5,8 +5,24 @@ "聴く" "翻訳" "レンズ" + + + + + + "画面上のテキストを翻訳または聞く" "画面上のテキスト、ウェブアドレス、スクリーンショットなどの情報が Google と共有される場合があります。\n\n共有される情報を変更するには、""[設定] > [アプリ] > [デフォルトのアプリ] > [デジタル アシスタント アプリ]"" に移動してください。" - "キャンセル" - "OK" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-ka/strings.xml b/go/quickstep/res/values-ka/strings.xml index 4747e036c3..adf3e6b029 100644 --- a/go/quickstep/res/values-ka/strings.xml +++ b/go/quickstep/res/values-ka/strings.xml @@ -5,8 +5,24 @@ "მოსმენა" "თარგმნა" "Lens" + + + + + + "თარგმნეთ ან მოისმინეთ ეკრანზე ნაჩვენები ტექსტი" "ისეთი ინფორმაცია, როგორიც არის ტექსტი თქვენს ეკრანზე, ვებ-მისამართები და ეკრანის ანაბეჭდები შეიძლება გაზიარდეს Google-თან.\n\nთუ გსურთ, შეცვალოთ, რა ინფორმაციას აზიარებთ, გადადით: ""პარამეტრები > აპები > ნაგულისხმევი აპები > ციფრული ასისტენტის აპი""." - "გაუქმება" - "გასაგებია" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-kk/strings.xml b/go/quickstep/res/values-kk/strings.xml index d3f7e0cdf8..8a3aedbc07 100644 --- a/go/quickstep/res/values-kk/strings.xml +++ b/go/quickstep/res/values-kk/strings.xml @@ -5,8 +5,24 @@ "Тыңдау" "Аудару" "Объектив" + + + + + + "Экрандағы мәтінді аудару немесе тыңдау" "Экрандағы мәтін, веб-мекенжайлар мен скриншоттар сияқты ақпарат Google-мен бөлісілуі мүмкін.\n\nБөлісілетін ақпаратты өзгерту үшін ""Параметрлер > Қолданбалар > Әдепкі қолданбалар > Цифрлық көмекші қолданбасы"" тармағына өтіңіз." - "БАС ТАРТУ" - "ТҮСІНДІМ" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-km/strings.xml b/go/quickstep/res/values-km/strings.xml index 09d4a84a75..47e99a09f0 100644 --- a/go/quickstep/res/values-km/strings.xml +++ b/go/quickstep/res/values-km/strings.xml @@ -5,8 +5,24 @@ "ស្តាប់" "បកប្រែ" "Lens" + + + + + + "បកប្រែ ឬស្ដាប់អត្ថបទ​នៅលើអេក្រង់" "ព័ត៌មានដូចជា អត្ថបទនៅលើ​អេក្រង់របស់អ្នក អាសយដ្ឋានទំព័រ និងរូបថតអេក្រង់​​អាចនឹងត្រូវបានចែក​រំលែកជាមួយ Google។\n\nដើម្បីប្ដូរព័ត៌មាន​ដែលអ្នកចែករំលែក សូមចូលទៅកាន់""ការកំណត់ > កម្មវិធី > កម្មវិធីលំនាំដើម > កម្មវិធីជំនួយការឌីជីថល""។" - "បោះបង់" - "យល់ហើយ" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-kn/strings.xml b/go/quickstep/res/values-kn/strings.xml index 0e06249269..7ed441e8a7 100644 --- a/go/quickstep/res/values-kn/strings.xml +++ b/go/quickstep/res/values-kn/strings.xml @@ -5,8 +5,24 @@ "ಆಲಿಸಿ" "ಅನುವಾದಿಸಿ" "Lens" + + + + + + "ಸ್ಕ್ರೀನ್ ಮೇಲಿರುವ ಪಠ್ಯವನ್ನು ಅನುವಾದಿಸಿ ಅಥವಾ ಆಲಿಸಿ" "ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಮೇಲಿರುವ ಪಠ್ಯ, ವೆಬ್ ವಿಳಾಸಗಳು, ಮತ್ತು ಸ್ಕ್ರೀನ್‌ಶಾಟ್‌ಗಳಂತಹ ಮಾಹಿತಿಯನ್ನು Google ಜೊತೆಗೆ ಹಂಚಿಕೊಳ್ಳಬಹುದು.\n\nನೀವು ಯಾವ ಮಾಹಿತಿಯನ್ನು ಹಂಚಿಕೊಳ್ಳುತ್ತೀರಿ ಎಂಬುದನ್ನು ಬದಲಾಯಿಸಲು, ""ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಆ್ಯಪ್‌ಗಳು ಮತ್ತು ಡೀಫಾಲ್ಟ್ ಆ್ಯಪ್‌ಗಳು, ಡಿಜಿಟಲ್ ಅಸಿಸ್ಟೆಂಟ್ ಆ್ಯಪ್ ಎಂಬಲ್ಲಿ ಹೋಗಿ""." - "ರದ್ದುಮಾಡಿ" - "ಅರ್ಥವಾಯಿತು" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-ko/strings.xml b/go/quickstep/res/values-ko/strings.xml index 506a802fc4..58e2278875 100644 --- a/go/quickstep/res/values-ko/strings.xml +++ b/go/quickstep/res/values-ko/strings.xml @@ -5,8 +5,24 @@ "듣기" "번역" "렌즈" + + + + + + "화면의 텍스트 번역 또는 듣기" "화면의 텍스트, 웹 주소, 스크린샷과 같은 정보가 Google과 공유될 수 있습니다.\n\n공유되는 정보를 변경하려면 ""설정 > 앱 > 기본 앱 > 디지털 어시스턴트 앱""으로 이동하세요." - "취소" - "확인" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-ky/strings.xml b/go/quickstep/res/values-ky/strings.xml index b0d5c50318..0f56c9bbb6 100644 --- a/go/quickstep/res/values-ky/strings.xml +++ b/go/quickstep/res/values-ky/strings.xml @@ -5,8 +5,24 @@ "Угуу" "Которуу" "Lens" + + + + + + "Экрандагы текстти которуу же угуу" "Экрандагы текст, веб-даректер жана скриншоттор сыяктуу маалымат Google менен бөлүшүлүшү мүмкүн.\n\nБөлүшүлгөн маалыматты өзгөртүү үчүн""Жөндөөлөр > Колдонмолор > Демейки колдонмолор > Санариптик жардамчы колдонмосуна өтүңүз""." - "ЖОККО ЧЫГАРУУ" - "ТҮШҮНДҮМ" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-lo/strings.xml b/go/quickstep/res/values-lo/strings.xml index c391fee459..c8297a0937 100644 --- a/go/quickstep/res/values-lo/strings.xml +++ b/go/quickstep/res/values-lo/strings.xml @@ -5,8 +5,24 @@ "ຟັງ" "ແປພາສາ" "Lens" + + + + + + "ແປພາສາ ຫຼື ຟັງຂໍ້ຄວາມຢູ່ໜ້າຈໍ" "ຂໍ້ມູນ ເຊັ່ນ: ຂໍ້ຄວາມຢູ່ໜ້າຈໍຂອງທ່ານ, ທີ່ຢູ່ເວັບ ແລະ ຮູບໜ້າຈໍອາດຖືກແບ່ງປັນໃຫ້ກັບ Google.\n\nເພື່ອປ່ຽນແປງຂໍ້ມູນທີ່ທ່ານແບ່ງປັນ, ໃຫ້ເຂົ້າໄປ ""ການຕັ້ງຄ່າ > ແອັບ > ແອັບເລີ່ມຕົ້ນ > ແອັບຜູ້ຊ່ວຍດິຈິຕອນ""." - "ຍົກເລີກ" - "ເຂົ້າໃຈແລ້ວ" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-lt/strings.xml b/go/quickstep/res/values-lt/strings.xml index 11f471c511..e1b4d97e74 100644 --- a/go/quickstep/res/values-lt/strings.xml +++ b/go/quickstep/res/values-lt/strings.xml @@ -5,8 +5,24 @@ "Klausyti" "Išversti" "Lens" + + + + + + "Ekrane esančio teksto vertimas arba klausymas" "Tam tikra informacija, pvz., ekrane esantis tekstas, žiniatinklio adresai ir ekrano kopijos, gali būti bendrinama su „Google“.\n\nJei norite pakeisti, kokia informacija gali būti bendrinama, eikite į ""„Nustatymai“ > „Programos“ > „Numatytosios programos“ > „Skaitmeninio pagelbiklio programa“""." - "ATŠAUKTI" - "SUPRATAU" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-lv/strings.xml b/go/quickstep/res/values-lv/strings.xml index 1918cbfb4b..a697ccb3d1 100644 --- a/go/quickstep/res/values-lv/strings.xml +++ b/go/quickstep/res/values-lv/strings.xml @@ -5,8 +5,24 @@ "Klausīties" "Tulkot" "Lens" + + + + + + "Ekrānā redzamā teksta atskaņošana vai tulkošana" "Ar uzņēmumu Google var tikt kopīgota noteikta informācija, piemēram, ekrānā redzamais teksts, tīmekļa adreses un ekrānuzņēmumi.\n\nLai mainītu kopīgotās informācijas veidu, atveriet sadaļu ""Iestatījumi > Lietotnes > Noklusējuma lietotnes > Digitālā asistenta lietotne""." - "ATCELT" - "LABI" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-mk/strings.xml b/go/quickstep/res/values-mk/strings.xml index fea375348e..5560e119ac 100644 --- a/go/quickstep/res/values-mk/strings.xml +++ b/go/quickstep/res/values-mk/strings.xml @@ -5,8 +5,24 @@ "Слушај" "Преведи" "Lens" + + + + + + "Преведете или слушајте текст на екранот" "Информациите како текст на екранот, интернет-адреси и слики од екранот може да се споделуваат со Google.\n\nЗа да промените кои информации ќе се споделуваат, одете во ""Поставки > Апликации > Стандардни апликации > Апликација за дигитален помошник""." - "ОТКАЖИ" - "СФАТИВ" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-ml/strings.xml b/go/quickstep/res/values-ml/strings.xml index 05083d8baa..60e9bbdea2 100644 --- a/go/quickstep/res/values-ml/strings.xml +++ b/go/quickstep/res/values-ml/strings.xml @@ -5,8 +5,24 @@ "കേൾക്കുക" "വിവർത്തനം ചെയ്യുക" "ലെൻസ്" + + + + + + "സ്ക്രീനിലെ ടെക്സ്റ്റ് വിവർത്തനം ചെയ്യുകയോ കേൾക്കുകയോ ചെയ്യുക" "നിങ്ങളുടെ സ്ക്രീനിലെ ടെക്സ്റ്റ്, വെബ് വിലാസങ്ങൾ, സ്ക്രീൻഷോട്ടുകൾ എന്നിവ പോലുള്ള വിവരങ്ങൾ Google-മായി പങ്കിട്ടേക്കാം.\n\nനിങ്ങൾ പങ്കിടുന്ന വിവരങ്ങൾ മാറ്റാൻ, ""ക്രമീകരണ > ആപ്പുകൾ > ഡിഫോൾട്ട് ആപ്പുകൾ > ഡിജിറ്റൽ അസിസ്‌റ്റന്റ് ആപ്പ്"" എന്നതിലേക്ക് പോകുക." - "റദ്ദാക്കുക" - "മനസ്സിലായി" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-mn/strings.xml b/go/quickstep/res/values-mn/strings.xml index 0a1dacb507..fd7ffcd329 100644 --- a/go/quickstep/res/values-mn/strings.xml +++ b/go/quickstep/res/values-mn/strings.xml @@ -5,8 +5,24 @@ "Сонсох" "Орчуулах" "Дуран" + + + + + + "Дэлгэц дээрх текстийг орчуулах эсвэл сонсох" "Таны дэлгэц дээрх текст, веб хаяг, дэлгэцийн агшин зэрэг мэдээллийг Google-тэй хуваалцаж болзошгүй.\n\nТа ямар мэдээлэл хуваалцахаа өөрчлөхийн тулд ""Тохиргоо > Апп > Өгөгдмөл апп > Дижитал туслах апп"" руу очно уу." - "ЦУЦЛАХ" - "ОЙЛГОЛОО" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-mr/strings.xml b/go/quickstep/res/values-mr/strings.xml index c51a780e84..79b555fc5f 100644 --- a/go/quickstep/res/values-mr/strings.xml +++ b/go/quickstep/res/values-mr/strings.xml @@ -5,8 +5,24 @@ "ऐका" "भाषांतर करा" "Lens" + + + + + + "स्क्रीनवरील मजकूर भाषांतरित करा किंवा ऐका" "तुमच्या स्क्रीनवरील मजकूर, वेब अ‍ॅड्रेस आणि स्क्रीनशॉट यांसारखी माहिती Google सह शेअर केली जाऊ शकते.\n\nतुम्ही कोणती माहिती शेअर करता हे बदलण्यासाठी ""सेटिंग्ज > ॲप्स > डीफॉल्ट ॲप्स > डिजिटल असिस्टंट ॲपवर जा""." - "रद्द करा" - "समजले" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-ms/strings.xml b/go/quickstep/res/values-ms/strings.xml index 64c6bff927..3f42e752e6 100644 --- a/go/quickstep/res/values-ms/strings.xml +++ b/go/quickstep/res/values-ms/strings.xml @@ -5,8 +5,24 @@ "Dengar" "Terjemah" "Kanta" + + + + + + "Terjemahkan atau dengar teks pada skrin" "Maklumat seperti teks pada skrin anda, alamat web dan tangkapan skrin boleh dikongsi dengan Google.\n\nUntuk menukar maklumat yang anda kongsi, pergi ke ""Tetapan > Apl > Apl lalai > Apl pembantu digital""." - "BATAL" - "OK" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-my/strings.xml b/go/quickstep/res/values-my/strings.xml index eafa50da61..6e0e78a1f5 100644 --- a/go/quickstep/res/values-my/strings.xml +++ b/go/quickstep/res/values-my/strings.xml @@ -5,8 +5,24 @@ "နားထောင်ရန်" "ဘာသာပြန်ရန်" "Lens" + + + + + + "ဖန်သားပြင်ပေါ်ရှိ စာသားကို ဘာသာပြန်ပါ (သို့) နားထောင်ပါ" "သင့်ဖန်သားပြင်ပေါ်ရှိ စာသား၊ ဝဘ်လိပ်စာနှင့် ဖန်သားပြင်ဓာတ်ပုံများကဲ့သို့ အချက်အလက်များကို Google နှင့် မျှဝေနိုင်သည်။\n\nသင်မျှဝေသည့် အချက်အလက်များကို ပြောင်းရန် ""ဆက်တင်များ > အက်ပ်များ > မူရင်းအက်ပ်များ > ဒစ်ဂျစ်တယ် Assistant အက်ပ်"" သို့ သွားပါ။" - "မလုပ်တော့" - "ရပြီ" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-nb/strings.xml b/go/quickstep/res/values-nb/strings.xml index e4cedd6d30..f21b7a5600 100644 --- a/go/quickstep/res/values-nb/strings.xml +++ b/go/quickstep/res/values-nb/strings.xml @@ -5,8 +5,24 @@ "Lytt" "Oversett" "Lens" + + + + + + "Oversett eller lytt til tekst på skjermen" "Informasjon som tekst på skjermen, nettadresser og skjermdumper kan deles med Google.\n\nFor å endre hvilken informasjon du deler, gå til ""Innstillinger > Apper > Standardapper > Digital assistent-app""." - "AVBRYT" - "GREIT" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-ne/strings.xml b/go/quickstep/res/values-ne/strings.xml index 56ebbf3728..c92751ca2f 100644 --- a/go/quickstep/res/values-ne/strings.xml +++ b/go/quickstep/res/values-ne/strings.xml @@ -5,8 +5,24 @@ "सुन्नुहोस्" "अनुवाद गर्नुहोस्" "लेन्स" + + + + + + "स्क्रिनमा देखिने पाठ अनुवाद गरियोस् वा पढेर सुनाइयोस्" "तपाईंको स्क्रिनमा देखिने पाठ, वेब ठेगाना र स्क्रिनसटलगायतका जानकारी Google सँग सेयर गर्न सकिन्छ।\n\nकुन कुन जानकारी सेयर गर्न दिने भन्ने सेटिङ बदल्न ""सेटिङ > एप > डिफल्ट एप > डिजिटल सहायक एप"" मा जानुहोस्।" - "रद्द गर्नुहोस्" - "बुझेँ" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-nl/strings.xml b/go/quickstep/res/values-nl/strings.xml index 63a38cb4cd..3cf93be68b 100644 --- a/go/quickstep/res/values-nl/strings.xml +++ b/go/quickstep/res/values-nl/strings.xml @@ -5,8 +5,24 @@ "Luisteren" "Vertalen" "Lens" + + + + + + "Tekst op het scherm vertalen of beluisteren" "Informatie zoals tekst op je scherm, webadressen en screenshots kan met Google worden gedeeld.\n\nAls je wilt aanpassen welke informatie je deelt, ga je naar ""Instellingen > Apps > Standaard-apps > Digitale-assistent-app""." - "ANNULEREN" - "OK" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-or/strings.xml b/go/quickstep/res/values-or/strings.xml index 06933750c0..2e759743e3 100644 --- a/go/quickstep/res/values-or/strings.xml +++ b/go/quickstep/res/values-or/strings.xml @@ -5,8 +5,24 @@ "ଶୁଣନ୍ତୁ" "ଅନୁବାଦ କରନ୍ତୁ" "Lens" + + + + + + "ସ୍କିନରେ ଥିବା ଟେକ୍ସଟକୁ ଅନୁବାଦ କରନ୍ତୁ କିମ୍ବା ଶୁଣନ୍ତୁ" "ଆପଣଙ୍କ ସ୍କ୍ରିନରେ ଟେକ୍ସଟ୍, ୱେବ୍ ଠିକଣା ଏବଂ ସ୍କ୍ରିନସଟଗୁଡ଼ିକ ପରି ସୂଚନାକୁ Google ସହ ସେୟାର୍ କରାଯାଇପାରେ।\n\nଆପଣ କେଉଁ ସୂଚନା ସେୟାର୍ କରନ୍ତି ତାହା ପରିବର୍ତ୍ତନ କରିବାକୁ, ""ସେଟିଂସ୍ > ଆପ୍ସ > ଡିଫଲ୍ଟ ଆପ୍ସ > ଡିଜିଟାଲ୍ ଆସିଷ୍ଟାଣ୍ଟ ଆପ""କୁ ଯାଆନ୍ତୁ।" - "ବାତିଲ୍ କରନ୍ତୁ" - "ବୁଝିଗଲି" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-pa/strings.xml b/go/quickstep/res/values-pa/strings.xml index 3252ec02d9..cbcb13e06b 100644 --- a/go/quickstep/res/values-pa/strings.xml +++ b/go/quickstep/res/values-pa/strings.xml @@ -5,8 +5,24 @@ "ਸੁਣੋ" "ਅਨੁਵਾਦ ਕਰੋ" "Lens" + + + + + + "ਸਕ੍ਰੀਨ \'ਤੇ ਦਿੱਤੀ ਲਿਖਤ ਦਾ ਅਨੁਵਾਦ ਕਰੋ ਜਾਂ ਉਸਨੂੰ ਸੁਣੋ" "ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ \'ਤੇ ਦਿੱਤੀ ਲਿਖਤ, ਵੈੱਬ ਪਤਿਆਂ ਅਤੇ ਸਕ੍ਰੀਨਸ਼ਾਟਾਂ ਵਰਗੀ ਜਾਣਕਾਰੀ ਨੂੰ Google ਨਾਲ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।\n\nਤੁਹਾਡੇ ਵੱਲੋਂ ਸਾਂਝੀ ਕੀਤੀ ਜਾਣਕਾਰੀ ਨੂੰ ਬਦਲਣ ਲਈ, ""ਸੈਟਿੰਗਾਂ > ਐਪਾਂ > ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਐਪਾਂ > ਡਿਜੀਟਲ ਸਹਾਇਕ ਐਪ"" \'ਤੇ ਜਾਓ।" - "ਰੱਦ ਕਰੋ" - "ਸਮਝ ਲਿਆ" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-pl/strings.xml b/go/quickstep/res/values-pl/strings.xml index 427ac815c6..43a49b68f2 100644 --- a/go/quickstep/res/values-pl/strings.xml +++ b/go/quickstep/res/values-pl/strings.xml @@ -5,8 +5,24 @@ "Posłuchaj" "Przetłumacz" "Obiektyw" + + + + + + "Przetłumacz lub odsłuchaj tekst na ekranie" "Informacje takie jak tekst na ekranie, adresy internetowe i zrzuty ekranu mogą być udostępniane Google.\n\nAby zmienić zakres udostępnianych informacji, kliknij ""Ustawienia > Aplikacje > Aplikacje domyślne > Asystent cyfrowy""." - "ANULUJ" - "OK" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-pt-rPT/strings.xml b/go/quickstep/res/values-pt-rPT/strings.xml index 2bf8d143a0..426926a223 100644 --- a/go/quickstep/res/values-pt-rPT/strings.xml +++ b/go/quickstep/res/values-pt-rPT/strings.xml @@ -5,8 +5,24 @@ "Ouvir" "Traduzir" "Lens" + + + + + + "Traduza ou ouça o texto no ecrã" "Informações como o texto no ecrã, endereços Web e capturas de ecrã podem ser partilhadas com a Google.\n\nPara alterar as informações que partilha, aceda a ""Definições > Apps > App predefinidas > App de assistente digital""." - "CANCELAR" - "OK" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-pt/strings.xml b/go/quickstep/res/values-pt/strings.xml index ade09b43bf..1bc16ec55d 100644 --- a/go/quickstep/res/values-pt/strings.xml +++ b/go/quickstep/res/values-pt/strings.xml @@ -5,8 +5,24 @@ "Ouvir" "Traduzir" "Google Lens" + + + + + + "Traduzir ou ouvir o texto na tela" "Informações como o texto exibido, endereços da Web e capturas de tela poderão ser compartilhadas com o Google.\n\nPara mudar quais dados são compartilhados, acesse ""Configurações > Apps > Apps padrão > App assistente digital""." - "CANCELAR" - "OK" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-ro/strings.xml b/go/quickstep/res/values-ro/strings.xml index a09e6d15a7..cfd11f8d5d 100644 --- a/go/quickstep/res/values-ro/strings.xml +++ b/go/quickstep/res/values-ro/strings.xml @@ -5,8 +5,24 @@ "Ascultați" "Traduceți" "Lens" + + + + + + "Traduceți sau ascultați textul de pe ecran" "Informații precum textul de pe ecran, adresele web și capturile de ecran pot fi trimise la Google.\n\nCa să schimbați informațiile trimise, accesați ""Setări > Aplicații > Aplicații prestabilite > Aplicația asistent digital""." - "ANULAȚI" - "OK" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-ru/strings.xml b/go/quickstep/res/values-ru/strings.xml index 5a726c1f04..ad9c7bd747 100644 --- a/go/quickstep/res/values-ru/strings.xml +++ b/go/quickstep/res/values-ru/strings.xml @@ -5,8 +5,24 @@ "Слушать" "Перевести" "Объектив" + + + + + + "Перевод или прослушивание текста на экране" "Определенные сведения (например, текст на экране, веб-адреса и скриншоты) могут быть отправлены в Google.\n\nИзменить информацию, которой вы делитесь, можно в меню ""Настройки > Приложения > Приложения по умолчанию > Цифровой помощник""." - "ОТМЕНА" - "ОК" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-si/strings.xml b/go/quickstep/res/values-si/strings.xml index 85625f5996..9a18629f7f 100644 --- a/go/quickstep/res/values-si/strings.xml +++ b/go/quickstep/res/values-si/strings.xml @@ -5,8 +5,24 @@ "සවන් දෙන්න" "පරිවර්තනය කරන්න" "Lens" + + + + + + "තිරය මත පෙළ පරිවර්තනය කරන්න හෝ එයට සවන් දෙන්න" "ඔබගේ තිරයේ ඇති පෙළ, වෙබ් ලිපින සහ තිර රූ වැනි තොරතුරු Google සමඟ බෙදා ගත හැකිය.\n\nඔබ බෙදා ගන්නා තොරතුරු වෙනස් කිරීමට, ""සැකසීම් > යෙදුම් > පෙරනිමි යෙදුම් > ඩිජිටල් සහායක යෙදුම"" වෙත යන්න." - "අවලංගු කරන්න" - "තේරුණා" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-sk/strings.xml b/go/quickstep/res/values-sk/strings.xml index cfe8712f52..cea591a61e 100644 --- a/go/quickstep/res/values-sk/strings.xml +++ b/go/quickstep/res/values-sk/strings.xml @@ -5,8 +5,24 @@ "Počúvať" "Preložiť" "Lens" + + + + + + "Prekladajte alebo počúvajte text na obrazovke" "Údaje, napríklad text na obrazovke, webové adresy a snímky obrazovky, môžu byť zdieľané s Googlom.\n\nAk chcete zmeniť, ktoré údaje zdieľate, prejdite do sekcie ""Nastavenia > Aplikácie > Predvolené aplikácie > Digitálny asistent""." - "ZRUŠIŤ" - "DOBRE" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-sl/strings.xml b/go/quickstep/res/values-sl/strings.xml index c7fc10e5d3..ba17f7d477 100644 --- a/go/quickstep/res/values-sl/strings.xml +++ b/go/quickstep/res/values-sl/strings.xml @@ -5,8 +5,24 @@ "Poslušanje" "Prevedi" "Lens" + + + + + + "Prevod ali poslušanje besedila na zaslonu" "Podatki, kot so besedilo na zaslonu, spletni naslovi in posnetki zaslonov, bodo morda deljeni z Googlom.\n\nČe želite spremeniti, katere podatke delite, odprite ""Nastavitve > Aplikacije > Privzete aplikacije > Digitalni pomočnik""." - "PREKLIČI" - "RAZUMEM" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-sq/strings.xml b/go/quickstep/res/values-sq/strings.xml index 0adc077420..9e379311fd 100644 --- a/go/quickstep/res/values-sq/strings.xml +++ b/go/quickstep/res/values-sq/strings.xml @@ -5,8 +5,24 @@ "Dëgjo" "Përkthe" "Lentja" + + + + + + "Përkthe ose dëgjo tekstin në ekran" "Informacionet si teksti në ekranin tënd, adresat e uebit dhe pamjet e ekranit mund të ndahen me Google.\n\nPër të ndryshuar se çfarë informacionesh ndahen, shko te ""Cilësimet > Aplikacionet > Aplikacionet e parazgjedhura > Aplikacioni i asistentit dixhital""." - "ANULO" - "E KUPTOVA" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-sr/strings.xml b/go/quickstep/res/values-sr/strings.xml index e98e9d63af..9349d5fa49 100644 --- a/go/quickstep/res/values-sr/strings.xml +++ b/go/quickstep/res/values-sr/strings.xml @@ -5,8 +5,24 @@ "Пусти" "Преведи" "Објектив" + + + + + + "Преводите или слушајте текст на екрану" "Информације попут текста на екрану, веб-адреса и снимака екрана могу да се деле са Google-ом.\n\nДа бисте променили информације које делите, идите у ""Подешавања > Апликације > Подразумеване апликације > Апликација дигиталног помоћника""." - "ОТКАЖИ" - "ВАЖИ" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-sv/strings.xml b/go/quickstep/res/values-sv/strings.xml index 8745afdbfd..b88145434f 100644 --- a/go/quickstep/res/values-sv/strings.xml +++ b/go/quickstep/res/values-sv/strings.xml @@ -5,8 +5,24 @@ "Lyssna" "Översätt" "Lens" + + + + + + "Översätt eller lyssna på texten på skärmen" "Information som text på skärmen, webbadresser och skärmbilder kan delas med Google.\n\nFör att ändra vilken information du delar öppnar du ""Inställningar > Appar > Standardappar > Digital assistentapp""." - "AVBRYT" - "OK" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-sw/strings.xml b/go/quickstep/res/values-sw/strings.xml index 826d6e5455..3ff9d9c162 100644 --- a/go/quickstep/res/values-sw/strings.xml +++ b/go/quickstep/res/values-sw/strings.xml @@ -5,8 +5,24 @@ "Sikiliza" "Tafsiri" "Lenzi" + + + + + + "Tafsiri au usikilize maandishi kwenye skrini" "Maelezo kama vile maandishi kwenye skrini yako, anwani za wavuti na picha za skrini yanaweza kushirikiwa na Google.\n\nIli ubadilishe maelezo unayoshiriki, nenda kwenye ""Mipangilio > Programu > Programu chaguomsingi > Programu ya mratibu dijitali""." - "GHAIRI" - "NIMEELEWA" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-ta/strings.xml b/go/quickstep/res/values-ta/strings.xml index ad2e1305b9..cdb91c6189 100644 --- a/go/quickstep/res/values-ta/strings.xml +++ b/go/quickstep/res/values-ta/strings.xml @@ -5,8 +5,24 @@ "கேளுங்கள்" "மொழிபெயர்" "லென்ஸ்" + + + + + + "திரையிலுள்ள உரையை மொழிபெயருங்கள் அல்லது கேளுங்கள்" "உங்கள் திரையிலுள்ள உரை, வலை முகவரிகள், ஸ்கிரீன்ஷாட்டுகள் போன்ற தகவல்கள் Googleளுடன் பகிரப்படலாம்.\n\nஎந்தத் தகவல்கள் பகிரப்படலாம் என்பதை மாற்ற, ""அமைப்புகள் > ஆப்ஸ் > இயல்பு ஆப்ஸ் > டிஜிட்டல் அசிஸ்டண்ட் ஆப்ஸ்"" என்பதற்குச் செல்லுங்கள்." - "ரத்துசெய்" - "சரி" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-te/strings.xml b/go/quickstep/res/values-te/strings.xml index 1736c7f086..33c17b906c 100644 --- a/go/quickstep/res/values-te/strings.xml +++ b/go/quickstep/res/values-te/strings.xml @@ -5,8 +5,24 @@ "వినండి" "అనువదించండి" "Lens" + + + + + + "స్క్రీన్‌పై టెక్స్ట్ అనువదించండి లేదా వినండి" "మీ స్క్రీన్‌పై టెక్స్ట్, వెబ్ అడ్రస్‌లు, అలాగే స్క్రీన్‌షాట్‌ల వంటి సమాచారం Googleతో షేర్ చేయడం జరగవచ్చు.\n\nమీరు ఏ సమాచారాన్ని షేర్ చేసుకుంటారో మార్చడానికి ""సెట్టింగ్‌లు > యాప్‌లు > ఆటోమేటిక్ సెట్టింగ్ యాప్‌లు > డిజిటల్ అసిస్టెంట్ యాప్‌ల""‌కు వెళ్లండి." - "రద్దు చేయి" - "అర్థమైంది" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-th/strings.xml b/go/quickstep/res/values-th/strings.xml index ea89d88c9c..3267525b89 100644 --- a/go/quickstep/res/values-th/strings.xml +++ b/go/quickstep/res/values-th/strings.xml @@ -5,8 +5,24 @@ "ฟัง" "แปลภาษา" "Lens" + + + + + + "แปลหรือฟังข้อความบนหน้าจอ" "อาจมีการแชร์ข้อมูลอย่างเช่น ข้อความบนหน้าจอ ที่อยู่เว็บ และภาพหน้าจอกับ Google\n\nหากต้องการเปลี่ยนประเภทข้อมูลที่คุณแชร์ ให้ไปที่""การตั้งค่า > แอป > แอปเริ่มต้น > แอปผู้ช่วยดิจิทัล" - "ยกเลิก" - "รับทราบ" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-tl/strings.xml b/go/quickstep/res/values-tl/strings.xml index 3502363726..73bfb7fa0a 100644 --- a/go/quickstep/res/values-tl/strings.xml +++ b/go/quickstep/res/values-tl/strings.xml @@ -5,8 +5,24 @@ "Makinig" "Isalin" "Lens" + + + + + + "I-translate o pakinggan ang text sa screen" "Posibleng ibahagi sa Google ang impormasyong gaya ng text sa iyong screen, mga web address, at screenshot.\n\nPara baguhin kung anong impormasyon ang ibinabahagi mo, pumunta sa ""Mga Setting > Mga App > Mga default na app > Digital assistant app""." - "KANSELAHIN" - "OK" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-tr/strings.xml b/go/quickstep/res/values-tr/strings.xml index f150cc5f33..0e16d93cc5 100644 --- a/go/quickstep/res/values-tr/strings.xml +++ b/go/quickstep/res/values-tr/strings.xml @@ -5,8 +5,24 @@ "Dinle" "Çevir" "Lens" + + + + + + "Ekrandaki metni çevirin veya dinleyin" "Ekranınızdaki metin, web adresleri ve ekran görüntüleri gibi bilgiler Google ile paylaşılabilir.\n\nPaylaştığınız bilgileri değiştirmek için ""Ayarlar > Uygulamalar > Varsayılan uygulamalar > Dijital asistan uygulamasına gidin""." - "İPTAL" - "ANLADIM" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-uk/strings.xml b/go/quickstep/res/values-uk/strings.xml index 452c0ebffb..66b4be8318 100644 --- a/go/quickstep/res/values-uk/strings.xml +++ b/go/quickstep/res/values-uk/strings.xml @@ -5,8 +5,24 @@ "Слухати" "Перекласти" "Об’єктив" + + + + + + "Перекласти або прослухати текст на екрані" "Певна інформація (наприклад, текст на екрані, веб-адреси, знімки екрана) може надсилатися на сервери Google.\n\nЩоб змінити типи даних, які надсилаються, відкрийте ""Налаштування > Додатки > Додатки за умовчанням > Цифровий помічник""." - "СКАСУВАТИ" - "OK" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-ur/strings.xml b/go/quickstep/res/values-ur/strings.xml index daff43c7c1..9df59c9e45 100644 --- a/go/quickstep/res/values-ur/strings.xml +++ b/go/quickstep/res/values-ur/strings.xml @@ -5,8 +5,24 @@ "سنیں" "‏Google ترجمہ" "‏Google لینز" + + + + + + "اسکرین پر موجود ٹیکسٹ کو سنیں یا ترجمہ کریں" "‏آپ کی اسکرین پر ٹیکسٹ، ویب پتے اور اسکرین شاٹس جیسی معلومات کا اشتراک Google کے ساتھ کیا جا سکتا ہے۔\n\nآپ جس معلومات کا اشتراک کرتے ہیں اسے تبدیل کرنے کیلئے ""ترتیبات ‎>‎ ایپس ‎>‎ ڈیفالٹ ایپس ‎>‎ ڈیجیٹل اسسٹنٹ ایپ"" پر جائیں۔" - "منسوخ کریں" - "سمجھ آ گئی" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-uz/strings.xml b/go/quickstep/res/values-uz/strings.xml index c67d81cd49..3d71b56944 100644 --- a/go/quickstep/res/values-uz/strings.xml +++ b/go/quickstep/res/values-uz/strings.xml @@ -5,8 +5,24 @@ "Tinglash" "Tarjima" "Lens" + + + + + + "Ekrandagi matnni tarjima qilish yoki tinglash" "Ekraningizdagi matn, veb-manzillar va skrinshot kabilar Googlega yuborilishi mumkin.\n\nQanday maʼlumotlarni ulashishni tanlash uchun ""Sozlamalar > Ilovalar > Standart ilovalar > Raqamli assistent"" ilovasini oching." - "BEKOR QILISH" - "OK" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-vi/strings.xml b/go/quickstep/res/values-vi/strings.xml index 66f6ae782c..d66e01dc54 100644 --- a/go/quickstep/res/values-vi/strings.xml +++ b/go/quickstep/res/values-vi/strings.xml @@ -5,8 +5,24 @@ "Nghe" "Dịch" "Ống kính" + + + + + + "Dịch hoặc nghe văn bản trên màn hình" "Những thông tin như văn bản trên màn hình, địa chỉ web và ảnh chụp màn hình có thể được chia sẻ với Google.\n\nĐể thay đổi những thông tin mà bạn chia sẻ, hãy chuyển đến phần ""Cài đặt > Ứng dụng > Ứng dụng mặc định > Ứng dụng trợ lý kỹ thuật số""." - "HỦY" - "OK" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-zh-rCN/strings.xml b/go/quickstep/res/values-zh-rCN/strings.xml index de598e0879..b31de8fecd 100644 --- a/go/quickstep/res/values-zh-rCN/strings.xml +++ b/go/quickstep/res/values-zh-rCN/strings.xml @@ -5,8 +5,24 @@ "聆听" "翻译" "智能镜头" + + + + + + "翻译或聆听屏幕上的文字" "系统可能会将屏幕上的文字、网址和屏幕截图等信息分享给 Google。\n\n如需更改要分享哪些信息,请依次转到""设置 > 应用 > 默认应用 > 数字助理应用""。" - "取消" - "知道了" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-zh-rHK/strings.xml b/go/quickstep/res/values-zh-rHK/strings.xml index c3a55ac07c..87eca776b4 100644 --- a/go/quickstep/res/values-zh-rHK/strings.xml +++ b/go/quickstep/res/values-zh-rHK/strings.xml @@ -5,8 +5,24 @@ "聆聽" "翻譯" "智能鏡頭" + + + + + + "翻譯或聆聽畫面上的文字" "可能會與 Google 分享螢幕上的文字、網址和螢幕截圖等資料。\n\n如要變更分享的資料,請前往 ""[設定] > [應用程式] > [預設應用程式] > [數碼助理應用程式]""。" - "取消" - "知道了" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-zh-rTW/strings.xml b/go/quickstep/res/values-zh-rTW/strings.xml index 98c32b99d8..a79c268ce9 100644 --- a/go/quickstep/res/values-zh-rTW/strings.xml +++ b/go/quickstep/res/values-zh-rTW/strings.xml @@ -5,8 +5,24 @@ "聆聽" "翻譯" "智慧鏡頭" + + + + + + "翻譯或朗讀畫面上的文字" "系統可能會將畫面上的文字、網址和螢幕截圖等資訊分享給 Google。\n\n如要變更分享的資訊類型,請前往 [設定] > [應用程式] > [預設應用程式] > [數位助理應用程式]""。" - "取消" - "我知道了" + + + + + + + + + + + + diff --git a/go/quickstep/res/values-zu/strings.xml b/go/quickstep/res/values-zu/strings.xml index 176dfe3ca2..aeaf07a6f3 100644 --- a/go/quickstep/res/values-zu/strings.xml +++ b/go/quickstep/res/values-zu/strings.xml @@ -5,8 +5,24 @@ "Lalela" "Humusha" "Ilensi" + + + + + + "Humusha noma ulalele umbhalo osesikrinini" "Imininingwane efana nombhalo esikrinini sakho, amakheli wewebhu, nezithombe-skrini kungabiwa ne-Google.\n\nUkuze ushintshe ukuthi yiluphi ulwazi olwabayo, yiya kokuthi ""Amasethingi > ama-App > Ama-app azenzekelayo > Umsizi we-app odijithali""." - "KHANSELA" - "NGIYITHOLILE" + + + + + + + + + + + + From f7c6ae0e373a83429c611f6fc6fd7beb0809a73c Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 8 Jul 2021 15:15:35 +0000 Subject: [PATCH 05/13] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I1f29c71229eb05b6264037308bf59184603388a7 --- res/values-vi/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 2f53bafe04..0918465df6 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -159,7 +159,7 @@ "Hồ sơ công việc" "Các ứng dụng công việc được gắn huy hiệu và quản trị viên CNTT có thể nhìn thấy" "OK" - "Đã tạm dừng ứng dụng công việc" + "Đã tạm dừng các ứng dụng công việc" "Các ứng dụng công việc không thể gửi thông báo cho bạn, sử dụng pin hoặc truy cập thông tin vị trí của bạn" "Ứng dụng công việc đang tắt. Các ứng dụng công việc không thể gửi thông báo cho bạn, sử dụng pin hoặc truy cập thông tin vị trí của bạn" "Các ứng dụng công việc được gắn huy hiệu và quản trị viên CNTT có thể nhìn thấy" From 452e8b85122c646eb9b643ea0fb15322f65782ff Mon Sep 17 00:00:00 2001 From: Steven Ng Date: Fri, 2 Jul 2021 17:51:39 +0100 Subject: [PATCH 06/13] Correct # of cells estimation that can fit horizontally in widgets picker Fix: 192661517 Test: check widgets are fit correctly in both full & bottom widgets picker in portrait and landscape in different grid settings. Change-Id: Ic1b0589b7ccf62ff1ec1fd5713b4249ba58246a5 --- .../launcher3/widget/BaseWidgetSheet.java | 13 ++++++++++ .../launcher3/widget/WidgetsBottomSheet.java | 13 ++++++---- .../widget/picker/WidgetsFullSheet.java | 25 ++++++++++--------- 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/src/com/android/launcher3/widget/BaseWidgetSheet.java b/src/com/android/launcher3/widget/BaseWidgetSheet.java index a5c142db66..12fd026055 100644 --- a/src/com/android/launcher3/widget/BaseWidgetSheet.java +++ b/src/com/android/launcher3/widget/BaseWidgetSheet.java @@ -51,6 +51,8 @@ import com.android.launcher3.views.ArrowTipView; public abstract class BaseWidgetSheet extends AbstractSlideInView implements OnClickListener, OnLongClickListener, DragSource, PopupDataProvider.PopupDataChangeListener, Insettable { + /** The default number of cells that can fit horizontally in a widget sheet. */ + protected static final int DEFAULT_MAX_HORIZONTAL_SPANS = 4; /** * The maximum scale, [0, 1], of the device screen width that the widgets picker can consume * on large screen devices. @@ -152,6 +154,17 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView MeasureSpec.getSize(heightMeasureSpec)); } + /** Returns the number of cells that can fit horizontally in a given {@code content}. */ + protected int computeMaxHorizontalSpans(View content, int contentHorizontalPaddingPx) { + DeviceProfile deviceProfile = mActivityContext.getDeviceProfile(); + int availableWidth = content.getMeasuredWidth() - contentHorizontalPaddingPx; + Point cellSize = deviceProfile.getCellSize(); + if (cellSize.x > 0) { + return availableWidth / cellSize.x; + } + return DEFAULT_MAX_HORIZONTAL_SPANS; + } + private boolean beginDraggingWidget(WidgetCell v) { // Get the widget preview as the drag representation WidgetImageView image = v.getWidgetView(); diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java index c045cf1b43..14aeaf6048 100644 --- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java +++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java @@ -70,9 +70,11 @@ public class WidgetsBottomSheet extends BaseWidgetSheet { private static final int DEFAULT_CLOSE_DURATION = 200; private static final long EDUCATION_TIP_DELAY_MS = 300; + private final int mWidgetSheetContentHorizontalPadding; + private ItemInfo mOriginalItemInfo; private final int mMaxTableHeight; - private int mMaxHorizontalSpan = 4; + private int mMaxHorizontalSpan = DEFAULT_MAX_HORIZONTAL_SPANS; private final OnLayoutChangeListener mLayoutChangeListenerToShowTips = new OnLayoutChangeListener() { @@ -117,6 +119,9 @@ public class WidgetsBottomSheet extends BaseWidgetSheet { if (!hasSeenEducationTip()) { addOnLayoutChangeListener(mLayoutChangeListenerToShowTips); } + + mWidgetSheetContentHorizontalPadding = getResources().getDimensionPixelSize( + R.dimen.widget_list_horizontal_margin); } @Override @@ -137,10 +142,8 @@ public class WidgetsBottomSheet extends BaseWidgetSheet { private boolean updateMaxSpansPerRow() { if (getMeasuredWidth() == 0) return false; - int paddingPx = 2 * getResources().getDimensionPixelOffset( - R.dimen.widget_cell_horizontal_padding); - int maxHorizontalSpan = findViewById(R.id.widgets_table).getMeasuredWidth() - / (mActivityContext.getDeviceProfile().cellWidthPx + paddingPx); + int maxHorizontalSpan = computeMaxHorizontalSpans(mContent, + mWidgetSheetContentHorizontalPadding); if (mMaxHorizontalSpan != maxHorizontalSpan) { // Ensure the table layout is showing widgets in the right column after measure. mMaxHorizontalSpan = maxHorizontalSpan; diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java index 6c2cca6024..5e1a534bb0 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java +++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java @@ -25,6 +25,7 @@ import android.animation.PropertyValuesHolder; import android.content.Context; import android.content.pm.LauncherApps; import android.content.res.Configuration; +import android.content.res.Resources; import android.graphics.Rect; import android.os.Process; import android.os.UserHandle; @@ -148,13 +149,13 @@ public class WidgetsFullSheet extends BaseWidgetSheet private final int mTabsHeight; private final int mViewPagerTopPadding; private final int mSearchAndRecommendationContainerBottomMargin; - private final int mWidgetCellHorizontalPadding; + private final int mWidgetSheetContentHorizontalPadding; @Nullable private WidgetsRecyclerView mCurrentWidgetsRecyclerView; @Nullable private PersonalWorkPagedView mViewPager; private boolean mIsInSearchMode; private boolean mIsNoWidgetsViewNeeded; - private int mMaxSpansPerRow = 4; + private int mMaxSpansPerRow = DEFAULT_MAX_HORIZONTAL_SPANS; private View mTabsView; private TextView mNoWidgetsView; private SearchAndRecommendationViewHolder mSearchAndRecommendationViewHolder; @@ -166,19 +167,20 @@ public class WidgetsFullSheet extends BaseWidgetSheet mAdapters.put(AdapterHolder.PRIMARY, new AdapterHolder(AdapterHolder.PRIMARY)); mAdapters.put(AdapterHolder.WORK, new AdapterHolder(AdapterHolder.WORK)); mAdapters.put(AdapterHolder.SEARCH, new AdapterHolder(AdapterHolder.SEARCH)); + + Resources resources = getResources(); mTabsHeight = mHasWorkProfile - ? getContext().getResources() - .getDimensionPixelSize(R.dimen.all_apps_header_pill_height) + ? resources.getDimensionPixelSize(R.dimen.all_apps_header_pill_height) : 0; mViewPagerTopPadding = mHasWorkProfile ? getContext().getResources() .getDimensionPixelSize(R.dimen.widget_picker_view_pager_top_padding) : 0; - mSearchAndRecommendationContainerBottomMargin = getContext().getResources() - .getDimensionPixelSize(mHasWorkProfile + mSearchAndRecommendationContainerBottomMargin = resources.getDimensionPixelSize( + mHasWorkProfile ? R.dimen.search_and_recommended_widgets_container_small_bottom_margin : R.dimen.search_and_recommended_widgets_container_bottom_margin); - mWidgetCellHorizontalPadding = 2 * getResources().getDimensionPixelOffset( + mWidgetSheetContentHorizontalPadding = 2 * resources.getDimensionPixelSize( R.dimen.widget_cell_horizontal_padding); } @@ -375,11 +377,10 @@ public class WidgetsFullSheet extends BaseWidgetSheet private boolean updateMaxSpansPerRow() { if (getMeasuredWidth() == 0) return false; - int previousMaxSpansPerRow = mMaxSpansPerRow; - mMaxSpansPerRow = getMeasuredWidth() - / (mActivityContext.getDeviceProfile().cellWidthPx + mWidgetCellHorizontalPadding); - - if (previousMaxSpansPerRow != mMaxSpansPerRow) { + int maxHorizontalSpans = computeMaxHorizontalSpans(mContent, + mWidgetSheetContentHorizontalPadding); + if (mMaxSpansPerRow != maxHorizontalSpans) { + mMaxSpansPerRow = maxHorizontalSpans; mAdapters.get(AdapterHolder.PRIMARY).mWidgetsListAdapter.setMaxHorizontalSpansPerRow( mMaxSpansPerRow); mAdapters.get(AdapterHolder.SEARCH).mWidgetsListAdapter.setMaxHorizontalSpansPerRow( From 1abc73c587b9e6ab921a09ddd5587a01e6710dea Mon Sep 17 00:00:00 2001 From: Evan Rosky Date: Tue, 29 Jun 2021 19:07:05 -0700 Subject: [PATCH 07/13] Hook up split-launch to legacy transition system Adds legacy versions of the animation logic. Bug: 192279476 Test: use SPLIT_SELECT to launch 2 apps in split and observe Change-Id: I5cbe7416819ba88d8c081fb413177fadac5b815d --- .../com/android/quickstep/SystemUiProxy.java | 17 +++ .../com/android/quickstep/TaskViewUtils.java | 88 ++++---------- .../util/SplitSelectStateController.java | 109 +++++++----------- 3 files changed, 81 insertions(+), 133 deletions(-) diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java index 090fd015a4..6226fb0dc0 100644 --- a/quickstep/src/com/android/quickstep/SystemUiProxy.java +++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java @@ -33,6 +33,7 @@ import android.os.RemoteException; import android.os.UserHandle; import android.util.Log; import android.view.MotionEvent; +import android.view.RemoteAnimationAdapter; import android.view.SurfaceControl; import com.android.launcher3.util.MainThreadInitializedObject; @@ -562,6 +563,22 @@ public class SystemUiProxy implements ISystemUiProxy, } } + /** + * Start multiple tasks in split-screen simultaneously. + */ + public void startTasksWithLegacyTransition(int mainTaskId, Bundle mainOptions, int sideTaskId, + Bundle sideOptions, @SplitConfigurationOptions.StagePosition int sidePosition, + RemoteAnimationAdapter adapter) { + if (mSystemUiProxy != null) { + try { + mSplitScreen.startTasksWithLegacyTransition(mainTaskId, mainOptions, sideTaskId, + sideOptions, sidePosition, adapter); + } catch (RemoteException e) { + Log.w(TAG, "Failed call startTasksWithLegacyTransition"); + } + } + } + public void startShortcut(String packageName, String shortcutId, int stage, int position, Bundle options, UserHandle user) { if (mSplitScreen != null) { diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java index 37fda73d44..a85a24dcd9 100644 --- a/quickstep/src/com/android/quickstep/TaskViewUtils.java +++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java @@ -405,77 +405,39 @@ public final class TaskViewUtils { } /** Legacy version (until shell transitions are enabled) */ - public static void composeRecentsSplitLaunchAnimatorLegacy(@NonNull AnimatorSet anim, + public static void composeRecentsSplitLaunchAnimatorLegacy(@NonNull TaskView initialView, @NonNull TaskView v, @NonNull RemoteAnimationTargetCompat[] appTargets, @NonNull RemoteAnimationTargetCompat[] wallpaperTargets, - @NonNull RemoteAnimationTargetCompat[] nonAppTargets, boolean launcherClosing, - @NonNull StateManager stateManager, @NonNull DepthController depthController, - int targetStage) { - PendingAnimation out = new PendingAnimation(RECENTS_LAUNCH_DURATION); - boolean isRunningTask = v.isRunningTask(); - TransformParams params = null; - TaskViewSimulator tvs = null; - RecentsView recentsView = v.getRecentsView(); - if (ENABLE_QUICKSTEP_LIVE_TILE.get() && isRunningTask) { - params = recentsView.getLiveTileParams(); - tvs = recentsView.getLiveTileTaskViewSimulator(); + @NonNull RemoteAnimationTargetCompat[] nonAppTargets, + @NonNull Runnable finishCallback) { + + final int[] splitRoots = new int[2]; + for (int i = 0; i < appTargets.length; ++i) { + final int taskId = appTargets[i].taskInfo != null ? appTargets[i].taskInfo.taskId : -1; + final int mode = appTargets[i].mode; + if (taskId == initialView.getTask().key.id || taskId == v.getTask().key.id) { + if (mode != MODE_OPENING) { + throw new IllegalStateException( + "Expected task to be opening, but it is " + mode); + } + splitRoots[taskId == initialView.getTask().key.id ? 0 : 1] = i; + } } - boolean inLiveTileMode = - ENABLE_QUICKSTEP_LIVE_TILE.get() && recentsView.getRunningTaskIndex() != -1; - final RemoteAnimationTargets targets = - new RemoteAnimationTargets(appTargets, wallpaperTargets, nonAppTargets, - inLiveTileMode ? MODE_CLOSING : MODE_OPENING); + SurfaceControl.Transaction t = new SurfaceControl.Transaction(); - if (params == null) { - SurfaceTransactionApplier applier = new SurfaceTransactionApplier(v); - targets.addReleaseCheck(applier); - - params = new TransformParams() - .setSyncTransactionApplier(applier) - .setTargetSet(targets); + // This is where we should animate the split roots. For now, though, just make them visible. + for (int i = 0; i < 2; ++i) { + t.show(appTargets[splitRoots[i]].leash.getSurfaceControl()); + t.setAlpha(appTargets[splitRoots[i]].leash.getSurfaceControl(), 1.f); } - Rect crop = new Rect(); - Context context = v.getContext(); - DeviceProfile dp = BaseActivity.fromContext(context).getDeviceProfile(); - if (tvs == null && targets.apps.length > 0) { - tvs = new TaskViewSimulator(recentsView.getContext(), recentsView.getSizeStrategy()); - tvs.setDp(dp); + // This contains the initial state (before animation), so apply this at the beginning of + // the animation. + t.apply(); - // RecentsView never updates the display rotation until swipe-up so the value may - // be stale. Use the display value instead. - int displayRotation = DisplayController.INSTANCE.get(recentsView.getContext()) - .getInfo().rotation; - tvs.getOrientationState().update(displayRotation, displayRotation); - - tvs.setPreview(targets.apps[targets.apps.length - 1]); - tvs.fullScreenProgress.value = 0; - tvs.recentsViewScale.value = 1; -// tvs.setScroll(startScroll); - - // Fade in the task during the initial 20% of the animation - out.addFloat(params, TransformParams.TARGET_ALPHA, 0, 1, - clampToProgress(LINEAR, 0, 0.2f)); - } - - TaskViewSimulator topMostSimulator = null; - - if (tvs != null) { - out.setFloat(tvs.fullScreenProgress, - AnimatedFloat.VALUE, 1, TOUCH_RESPONSE_INTERPOLATOR); - out.setFloat(tvs.recentsViewScale, - AnimatedFloat.VALUE, tvs.getFullScreenScale(), TOUCH_RESPONSE_INTERPOLATOR); - out.setFloat(tvs.recentsViewScroll, - AnimatedFloat.VALUE, 0, TOUCH_RESPONSE_INTERPOLATOR); - - TaskViewSimulator finalTsv = tvs; - TransformParams finalParams = params; - out.addOnFrameCallback(() -> finalTsv.apply(finalParams)); - topMostSimulator = tvs; - } - - anim.play(out.buildAnim()); + // Once there is an animation, this should be called AFTER the animation completes. + finishCallback.run(); } public static void composeRecentsLaunchAnimator(@NonNull AnimatorSet anim, @NonNull View v, diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java index a147b6808c..2351a4e164 100644 --- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java +++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java @@ -22,33 +22,26 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT; import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT; -import android.animation.AnimatorSet; -import android.app.ActivityOptions; +import android.app.ActivityThread; import android.content.res.Resources; import android.graphics.Rect; import android.os.Handler; import android.os.IBinder; -import android.os.Looper; -import android.util.Pair; import android.view.Gravity; +import android.view.RemoteAnimationAdapter; import android.view.SurfaceControl; import android.window.TransitionInfo; import androidx.annotation.Nullable; -import com.android.launcher3.BaseActivity; -import com.android.launcher3.BaseQuickstepLauncher; import com.android.launcher3.DeviceProfile; import com.android.launcher3.InsettableFrameLayout; -import com.android.launcher3.LauncherAnimationRunner; -import com.android.launcher3.LauncherAnimationRunner.RemoteAnimationFactory; import com.android.launcher3.R; import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption; import com.android.quickstep.SystemUiProxy; import com.android.quickstep.TaskAnimationManager; import com.android.quickstep.TaskViewUtils; import com.android.quickstep.views.TaskView; -import com.android.systemui.shared.system.ActivityOptionsCompat; import com.android.systemui.shared.system.RemoteAnimationAdapterCompat; import com.android.systemui.shared.system.RemoteAnimationRunnerCompat; import com.android.systemui.shared.system.RemoteAnimationTargetCompat; @@ -92,37 +85,27 @@ public class SplitSelectStateController { ? new int[]{mInitialTaskView.getTask().key.id, taskView.getTask().key.id} : new int[]{taskView.getTask().key.id, mInitialTaskView.getTask().key.id}; - RemoteSplitLaunchAnimationRunner animationRunner = - new RemoteSplitLaunchAnimationRunner(mInitialTaskView, taskView); + RemoteSplitLaunchTransitionRunner animationRunner = + new RemoteSplitLaunchTransitionRunner(mInitialTaskView, taskView); mSystemUiProxy.startTasks(taskIds[0], null /* mainOptions */, taskIds[1], null /* sideOptions */, STAGE_POSITION_BOTTOM_OR_RIGHT, new RemoteTransitionCompat(animationRunner, MAIN_EXECUTOR)); - return; + } else { + // Assume initial task is for top/left part of screen + final int[] taskIds = mInitialPosition.mStagePosition == STAGE_POSITION_TOP_OR_LEFT + ? new int[]{mInitialTaskView.getTask().key.id, taskView.getTask().key.id} + : new int[]{taskView.getTask().key.id, mInitialTaskView.getTask().key.id}; + + RemoteSplitLaunchAnimationRunner animationRunner = + new RemoteSplitLaunchAnimationRunner(mInitialTaskView, taskView); + final RemoteAnimationAdapter adapter = new RemoteAnimationAdapter( + RemoteAnimationAdapterCompat.wrapRemoteAnimationRunner(animationRunner), + 300, 150, + ActivityThread.currentActivityThread().getApplicationThread()); + + mSystemUiProxy.startTasksWithLegacyTransition(taskIds[0], null /* mainOptions */, + taskIds[1], null /* sideOptions */, STAGE_POSITION_BOTTOM_OR_RIGHT, adapter); } - // Assume initial mInitialTaskId is for top/left part of screen - RemoteAnimationFactory initialSplitRunnerWrapped = new SplitLaunchAnimationRunner( - mInitialTaskView, 0); - RemoteAnimationFactory secondarySplitRunnerWrapped = new SplitLaunchAnimationRunner( - taskView, 1); - RemoteAnimationRunnerCompat initialSplitRunner = new LauncherAnimationRunner( - new Handler(Looper.getMainLooper()), initialSplitRunnerWrapped, - true /* startAtFrontOfQueue */); - RemoteAnimationRunnerCompat secondarySplitRunner = new LauncherAnimationRunner( - new Handler(Looper.getMainLooper()), secondarySplitRunnerWrapped, - true /* startAtFrontOfQueue */); - ActivityOptions initialOptions = ActivityOptionsCompat.makeRemoteAnimation( - new RemoteAnimationAdapterCompat(initialSplitRunner, 300, 150)); - ActivityOptions secondaryOptions = ActivityOptionsCompat.makeRemoteAnimation( - new RemoteAnimationAdapterCompat(secondarySplitRunner, 300, 150)); - mSystemUiProxy.startTask(mInitialTaskView.getTask().key.id, mInitialPosition.mStageType, - mInitialPosition.mStagePosition, - /*null*/ initialOptions.toBundle()); - Pair compliment = getComplimentaryStageAndPosition(mInitialPosition); - mSystemUiProxy.startTask(taskView.getTask().key.id, compliment.first, - compliment.second, - /*null*/ secondaryOptions.toBundle()); - // After successful launch, call resetState - resetState(); } /** @@ -153,12 +136,12 @@ public class SplitSelectStateController { /** * Requires Shell Transitions */ - private class RemoteSplitLaunchAnimationRunner implements RemoteTransitionRunner { + private class RemoteSplitLaunchTransitionRunner implements RemoteTransitionRunner { private final TaskView mInitialTaskView; private final TaskView mTaskView; - RemoteSplitLaunchAnimationRunner(TaskView initialTaskView, TaskView taskView) { + RemoteSplitLaunchTransitionRunner(TaskView initialTaskView, TaskView taskView) { mInitialTaskView = initialTaskView; mTaskView = taskView; } @@ -173,50 +156,36 @@ public class SplitSelectStateController { } } - /** - * LEGACY - * @return the opposite stage and position from the {@param position} provided as first and - * second object, respectively - * Ex. If position is has stage = Main and position = Top/Left, this will return - * Pair(stage=Side, position=Bottom/Left) - */ - private Pair getComplimentaryStageAndPosition(SplitPositionOption position) { - // Right now this is as simple as flipping between 0 and 1 - int complimentStageType = position.mStageType ^ 1; - int complimentStagePosition = position.mStagePosition ^ 1; - return new Pair<>(complimentStageType, complimentStagePosition); - } - /** * LEGACY * Remote animation runner for animation to launch an app. */ - private class SplitLaunchAnimationRunner implements RemoteAnimationFactory { + private class RemoteSplitLaunchAnimationRunner implements RemoteAnimationRunnerCompat { - private final TaskView mV; - private final int mTargetState; + private final TaskView mInitialTaskView; + private final TaskView mTaskView; - SplitLaunchAnimationRunner(TaskView v, int targetState) { - mV = v; - mTargetState = targetState; + RemoteSplitLaunchAnimationRunner(TaskView initialTaskView, TaskView taskView) { + mInitialTaskView = initialTaskView; + mTaskView = taskView; } @Override - public void onCreateAnimation(int transit, - RemoteAnimationTargetCompat[] appTargets, - RemoteAnimationTargetCompat[] wallpaperTargets, - RemoteAnimationTargetCompat[] nonAppTargets, - LauncherAnimationRunner.AnimationResult result) { - AnimatorSet anim = new AnimatorSet(); - BaseQuickstepLauncher activity = BaseActivity.fromContext(mV.getContext()); - TaskViewUtils.composeRecentsSplitLaunchAnimatorLegacy(anim, mV, - appTargets, wallpaperTargets, nonAppTargets, true, activity.getStateManager(), - activity.getDepthController(), mTargetState); - result.setAnimation(anim, activity); + public void onAnimationStart(int transit, RemoteAnimationTargetCompat[] apps, + RemoteAnimationTargetCompat[] wallpapers, RemoteAnimationTargetCompat[] nonApps, + Runnable finishedCallback) { + TaskViewUtils.composeRecentsSplitLaunchAnimatorLegacy(mInitialTaskView, mTaskView, apps, + wallpapers, nonApps, finishedCallback); + // After successful launch, call resetState + resetState(); + } + + @Override + public void onAnimationCancelled() { + resetState(); } } - /** * To be called if split select was cancelled */ From ffa6652c25f0d32df3939fc24d574d5293cb45a0 Mon Sep 17 00:00:00 2001 From: Evan Rosky Date: Fri, 2 Jul 2021 17:21:21 -0700 Subject: [PATCH 08/13] Include shell+stage-split in legacy recents animations This just builds the infrastructure and then, just as an example/proof-of-concept, uses the infra to show/hide the divider-bar when it makes sense. Bug: 192292305 Test: enable SPLIT_SELECT, enter split, use recents and observe the divider bar appropriately showing/hiding Change-Id: Iea0704b3f7821c3056a1675f11e671e81305831f --- .../android/quickstep/AbsSwipeUpHandler.java | 8 ++++++++ .../quickstep/RecentsAnimationCallbacks.java | 11 ++++++++-- .../quickstep/RecentsAnimationTargets.java | 6 +++--- .../com/android/quickstep/SystemUiProxy.java | 19 ++++++++++++++++++ .../quickstep/TaskAnimationManager.java | 3 ++- .../com/android/quickstep/TaskViewUtils.java | 20 +++++++++++++++++++ 6 files changed, 61 insertions(+), 6 deletions(-) diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index c04d15ffe4..957484bf34 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -740,6 +740,8 @@ public abstract class AbsSwipeUpHandler, mRecentsAnimationStartCallbacks.clear(); } + TaskViewUtils.setDividerBarShown(mRecentsAnimationTargets.nonApps, false); + // Only add the callback to enable the input consumer after we actually have the controller mStateCallback.runOnceAtState(STATE_APP_CONTROLLER_RECEIVED | STATE_GESTURE_STARTED, mRecentsAnimationController::enableInputConsumer); @@ -754,6 +756,8 @@ public abstract class AbsSwipeUpHandler, mActivityInitListener.unregister(); mStateCallback.setStateOnUiThread(STATE_GESTURE_CANCELLED | STATE_HANDLER_INVALIDATED); + TaskViewUtils.setDividerBarShown(mRecentsAnimationTargets.nonApps, true); + // Defer clearing the controller and the targets until after we've updated the state mRecentsAnimationController = null; mRecentsAnimationTargets = null; @@ -882,6 +886,7 @@ public abstract class AbsSwipeUpHandler, break; case LAST_TASK: mStateCallback.setState(STATE_RESUME_LAST_TASK); + TaskViewUtils.setDividerBarShown(mRecentsAnimationTargets.nonApps, true); break; } ActiveGestureLog.INSTANCE.addLog("onSettledOnEndTarget " + endTarget); @@ -1723,6 +1728,9 @@ public abstract class AbsSwipeUpHandler, @Override public void onRecentsAnimationFinished(RecentsAnimationController controller) { + if (!controller.getFinishTargetIsLauncher()) { + TaskViewUtils.setDividerBarShown(mRecentsAnimationTargets.nonApps, true); + } mRecentsAnimationController = null; mRecentsAnimationTargets = null; if (mRecentsView != null) { diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java b/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java index a21c7140de..239233b191 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java @@ -19,6 +19,7 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import android.graphics.Rect; import android.util.ArraySet; +import android.view.RemoteAnimationTarget; import androidx.annotation.BinderThread; import androidx.annotation.UiThread; @@ -39,6 +40,7 @@ public class RecentsAnimationCallbacks implements com.android.systemui.shared.system.RecentsAnimationListener { private final Set mListeners = new ArraySet<>(); + private final SystemUiProxy mSystemUiProxy; private final boolean mAllowMinimizeSplitScreen; // TODO(141886704): Remove these references when they are no longer needed @@ -46,7 +48,9 @@ public class RecentsAnimationCallbacks implements private boolean mCancelled; - public RecentsAnimationCallbacks(boolean allowMinimizeSplitScreen) { + public RecentsAnimationCallbacks(SystemUiProxy systemUiProxy, + boolean allowMinimizeSplitScreen) { + mSystemUiProxy = systemUiProxy; mAllowMinimizeSplitScreen = allowMinimizeSplitScreen; } @@ -89,8 +93,11 @@ public class RecentsAnimationCallbacks implements RemoteAnimationTargetCompat[] appTargets, RemoteAnimationTargetCompat[] wallpaperTargets, Rect homeContentInsets, Rect minimizedHomeBounds) { + RemoteAnimationTarget[] nonAppTargets = + mSystemUiProxy.onGoingToRecentsLegacy(mCancelled); RecentsAnimationTargets targets = new RecentsAnimationTargets(appTargets, - wallpaperTargets, homeContentInsets, minimizedHomeBounds); + wallpaperTargets, RemoteAnimationTargetCompat.wrap(nonAppTargets), + homeContentInsets, minimizedHomeBounds); mController = new RecentsAnimationController(animationController, mAllowMinimizeSplitScreen, this::onAnimationFinished); diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationTargets.java b/quickstep/src/com/android/quickstep/RecentsAnimationTargets.java index 3861bab04b..b6d9016727 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationTargets.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationTargets.java @@ -31,9 +31,9 @@ public class RecentsAnimationTargets extends RemoteAnimationTargets { public final Rect minimizedHomeBounds; public RecentsAnimationTargets(RemoteAnimationTargetCompat[] apps, - RemoteAnimationTargetCompat[] wallpapers, Rect homeContentInsets, - Rect minimizedHomeBounds) { - super(apps, wallpapers, new RemoteAnimationTargetCompat[0], MODE_CLOSING); + RemoteAnimationTargetCompat[] wallpapers, RemoteAnimationTargetCompat[] nonApps, + Rect homeContentInsets, Rect minimizedHomeBounds) { + super(apps, wallpapers, nonApps, MODE_CLOSING); this.homeContentInsets = homeContentInsets; this.minimizedHomeBounds = minimizedHomeBounds; } diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java index 6226fb0dc0..d6b95c13ab 100644 --- a/quickstep/src/com/android/quickstep/SystemUiProxy.java +++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java @@ -34,6 +34,7 @@ import android.os.UserHandle; import android.util.Log; import android.view.MotionEvent; import android.view.RemoteAnimationAdapter; +import android.view.RemoteAnimationTarget; import android.view.SurfaceControl; import com.android.launcher3.util.MainThreadInitializedObject; @@ -612,6 +613,24 @@ public class SystemUiProxy implements ISystemUiProxy, } } + /** + * Call this when going to recents so that shell can set-up and provide appropriate leashes + * for animation (eg. DividerBar). + * + * @param cancel true if recents starting is being cancelled. + * @return RemoteAnimationTargets of windows that need to animate but only exist in shell. + */ + public RemoteAnimationTarget[] onGoingToRecentsLegacy(boolean cancel) { + if (mSplitScreen != null) { + try { + return mSplitScreen.onGoingToRecentsLegacy(cancel); + } catch (RemoteException e) { + Log.w(TAG, "Failed call onGoingToRecentsLegacy"); + } + } + return null; + } + // // One handed // diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java index 33718a3cac..fe07cbdcce 100644 --- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java +++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java @@ -109,7 +109,8 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn final BaseActivityInterface activityInterface = gestureState.getActivityInterface(); mLastGestureState = gestureState; - mCallbacks = new RecentsAnimationCallbacks(activityInterface.allowMinimizeSplitScreen()); + mCallbacks = new RecentsAnimationCallbacks(SystemUiProxy.INSTANCE.get(mCtx), + activityInterface.allowMinimizeSplitScreen()); mCallbacks.addListener(new RecentsAnimationCallbacks.RecentsAnimationListener() { @Override public void onRecentsAnimationStart(RecentsAnimationController controller, diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java index a85a24dcd9..f292f1a6e3 100644 --- a/quickstep/src/com/android/quickstep/TaskViewUtils.java +++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java @@ -15,6 +15,7 @@ */ package com.android.quickstep; +import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER; import static android.view.WindowManager.TRANSIT_OPEN; import static android.view.WindowManager.TRANSIT_TO_FRONT; @@ -452,6 +453,10 @@ public final class TaskViewUtils { PendingAnimation pa = new PendingAnimation(RECENTS_LAUNCH_DURATION); createRecentsWindowAnimator(taskView, skipLauncherChanges, appTargets, wallpaperTargets, nonAppTargets, depthController, pa); + if (launcherClosing) { + // TODO(b/182592057): differentiate between "restore split" vs "launch fullscreen app" + TaskViewUtils.setDividerBarShown(nonAppTargets, true); + } Animator childStateAnimation = null; // Found a visible recents task that matches the opening app, lets launch the app from there @@ -504,4 +509,19 @@ public final class TaskViewUtils { stateManager.setCurrentAnimation(anim, childStateAnimation); anim.addListener(windowAnimEndListener); } + + static void setDividerBarShown(RemoteAnimationTargetCompat[] nonApps, boolean shown) { + // TODO(b/182592057): make this part of the animations instead. + if (nonApps != null && nonApps.length > 0) { + for (int i = 0; i < nonApps.length; ++i) { + final RemoteAnimationTargetCompat targ = nonApps[i]; + if (targ.windowType == TYPE_DOCK_DIVIDER) { + SurfaceControl.Transaction t = new SurfaceControl.Transaction(); + t.setVisibility(targ.leash.getSurfaceControl(), shown); + t.apply(); + t.close(); + } + } + } + } } From 255fe1ea45e77e25c9cce86b0999a16e6c8d3b7c Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Thu, 8 Jul 2021 10:12:34 -0700 Subject: [PATCH 09/13] Fix crash when handling recents animation canceled - If Launcher finishes the animation, that also cleans up the screenshot on the server side, so we can skip calling it Fixes: 192684578 Test: N/a, adding a null check Change-Id: I8bf1ad5089762469697d14842cc14c184055e925 --- quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index e867f07fb7..7e45369692 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -387,8 +387,11 @@ public abstract class AbsSwipeUpHandler, mGestureState.runOnceAtState(STATE_RECENTS_ANIMATION_CANCELED, () -> { ThumbnailData snapshot = mGestureState.consumeRecentsAnimationCanceledSnapshot(); if (snapshot != null) { - mRecentsView.switchToScreenshot(snapshot, - () -> mRecentsAnimationController.cleanupScreenshot()); + mRecentsView.switchToScreenshot(snapshot, () -> { + if (mRecentsAnimationController != null) { + mRecentsAnimationController.cleanupScreenshot(); + } + }); mRecentsView.onRecentsAnimationComplete(); } }); From 297d2cdd4469401f4038427d4471929ab701924a Mon Sep 17 00:00:00 2001 From: Vinit Nayak Date: Wed, 7 Jul 2021 20:29:06 -0700 Subject: [PATCH 10/13] Re-try binding to TouchInteractionService if service is killed For problem explanation, see b/190339338#comment26. When the binding dies, this attempts to retry binding to the service with a backoff duration of (1000 * 2^N)ms where N is # of attempts. Bug: 190339338 Test: Taskbar seems interactable more consistently. Manually failed the binding a couple times to see retry mechanism and verified by logging locally. Change-Id: Ia76207d0b2ef30b425ee1d7c66d7dee453bca7d8 --- .../launcher3/BaseQuickstepLauncher.java | 48 ++++++++++++++++++- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java index 475f06109e..ecd38b486c 100644 --- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java @@ -37,7 +37,9 @@ import android.content.IntentSender; import android.content.ServiceConnection; import android.os.Bundle; import android.os.CancellationSignal; +import android.os.Handler; import android.os.IBinder; +import android.util.Log; import android.view.View; import android.window.SplashScreen; @@ -89,6 +91,11 @@ import java.util.stream.Stream; public abstract class BaseQuickstepLauncher extends Launcher implements NavigationModeChangeListener { + private static final long BACKOFF_MILLIS = 1000; + + // Max backoff caps at 5 mins + private static final long MAX_BACKOFF_MILLIS = 10 * 60 * 1000; + private DepthController mDepthController = new DepthController(this); private QuickstepTransitionManager mAppTransitionManager; @@ -108,12 +115,24 @@ public abstract class BaseQuickstepLauncher extends Launcher public void onServiceConnected(ComponentName componentName, IBinder iBinder) { mTaskbarManager = ((TISBinder) iBinder).getTaskbarManager(); mTaskbarManager.setLauncher(BaseQuickstepLauncher.this); + Log.d(TAG, "TIS service connected"); + resetServiceBindRetryState(); } @Override public void onServiceDisconnected(ComponentName componentName) { } + + @Override + public void onBindingDied(ComponentName name) { + Log.w(TAG, "TIS binding died"); + internalBindToTIS(); + } }; + + private final Runnable mConnectionRunnable = this::internalBindToTIS; + private short mConnectionAttempts; private final TaskbarStateHandler mTaskbarStateHandler = new TaskbarStateHandler(this); + private final Handler mHandler = new Handler(); // Will be updated when dragging from taskbar. private @Nullable DragOptions mNextWorkspaceDragOptions = null; @@ -132,11 +151,11 @@ public abstract class BaseQuickstepLauncher extends Launcher SysUINavigationMode.INSTANCE.get(this).removeModeChangeListener(this); - unbindService(mTisBinderConnection); if (mTaskbarManager != null) { mTaskbarManager.clearLauncher(this); } + resetServiceBindRetryState(); super.onDestroy(); } @@ -264,8 +283,33 @@ public abstract class BaseQuickstepLauncher extends Launcher mAppTransitionManager = new QuickstepTransitionManager(this); mAppTransitionManager.registerRemoteAnimations(); - bindService(new Intent(this, TouchInteractionService.class), mTisBinderConnection, 0); + internalBindToTIS(); + } + /** + * Binds {@link #mTisBinderConnection} to {@link TouchInteractionService}. If the binding fails, + * attempts to retry via {@link #mConnectionRunnable} + */ + private void internalBindToTIS() { + boolean bound = bindService(new Intent(this, TouchInteractionService.class), + mTisBinderConnection, 0); + if (bound) { + resetServiceBindRetryState(); + return; + } + + Log.w(TAG, "Retrying TIS Binder connection attempt: " + mConnectionAttempts); + final long timeoutMs = (long) Math.min( + Math.scalb(BACKOFF_MILLIS, mConnectionAttempts), MAX_BACKOFF_MILLIS); + mHandler.postDelayed(mConnectionRunnable, timeoutMs); + mConnectionAttempts++; + } + + private void resetServiceBindRetryState() { + if (mHandler.hasCallbacks(mConnectionRunnable)) { + mHandler.removeCallbacks(mConnectionRunnable); + } + mConnectionAttempts = 0; } public void setTaskbarUIController(LauncherTaskbarUIController taskbarUIController) { From 1afca4dce5aa16086ee701d4cef772d7f80c0004 Mon Sep 17 00:00:00 2001 From: Steven Ng Date: Thu, 8 Jul 2021 17:13:29 +0100 Subject: [PATCH 11/13] Wrap the widget preview of the add item sheet with a scroll view Test: manual Fix: 192622015 Change-Id: I1eb676a92201970962c71194682ea70ce42b3d1b --- res/layout/add_item_confirmation_activity.xml | 15 +++++++++++---- .../widget/AddItemWidgetsBottomSheet.java | 17 +++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/res/layout/add_item_confirmation_activity.xml b/res/layout/add_item_confirmation_activity.xml index 1aeda50c5e..6fd4a8580c 100644 --- a/res/layout/add_item_confirmation_activity.xml +++ b/res/layout/add_item_confirmation_activity.xml @@ -65,12 +65,19 @@ android:alpha="0.7" android:importantForAccessibility="no"/> - + android:layout_marginVertical="16dp" + android:layout_weight="1"> + + + 0) { + mNoIntercept = true; + } + } + return super.onControllerInterceptTouchEvent(ev); + } + @Override protected void onLayout(boolean changed, int l, int t, int r, int b) { int width = r - l; @@ -104,6 +120,7 @@ public class AddItemWidgetsBottomSheet extends AbstractSlideInView Date: Fri, 9 Jul 2021 06:01:24 +0000 Subject: [PATCH 12/13] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I9905f7a629d628d392a1a59d74cbf65baf401b58 --- go/quickstep/res/values-en-rXC/strings.xml | 27 ++++++++-------------- 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/go/quickstep/res/values-en-rXC/strings.xml b/go/quickstep/res/values-en-rXC/strings.xml index 54eb30dda8..c729cd845c 100644 --- a/go/quickstep/res/values-en-rXC/strings.xml +++ b/go/quickstep/res/values-en-rXC/strings.xml @@ -5,24 +5,15 @@ "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‏‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎Listen‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎Translate‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‏‎‎‎‏‏‎‎‏‏‎‎‏‎‎‎‎Lens‎‏‎‎‏‎" - - - - - - + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‏‎‎‏‏‎‏‎‏‎‏‏‏‎‏‎‎‎GOT IT‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‏‏‎‎CANCEL‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‎‎‏‎‏‏‎‏‏‎‎‎‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‎‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‎SETTINGS‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎Translate or listen to text on screen‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‏‎‏‎‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‏‎‏‎‏‎‎‏‎Information such as text on your screen, web addresses, and screenshots may be shared with Google.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To change what information you share, go to ‎‏‎‎‏‏‎""‎‏‎‎‏‏‏‎Settings > Apps > Default apps > Digital assistant app‎‏‎‎‏‏‎""‎‏‎‎‏‏‏‎.‎‏‎‎‏‎" - - - - - - - - - - - - + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‎‎‏‎‏‎‎‏‎‎‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‏‏‎‎‎Choose an assistant to use this feature‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‏‎‏‎‎‎‎‎‎‏‎‎‏‏‎‏‎‎‏‏‎‏‏‎‎‎To listen to or translate text on your screen, choose a digital assistant app in Settings‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‎‏‏‎‏‏‏‎‎Change your assistant to use this feature‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‎‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎‎‎‎‏‏‎‏‎‏‎‎‏‏‎‎‏‎‏‎‎‎To listen to or translate text on your screen, change your digital assistant app in Settings‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‎‎‏‏‎‎‏‎‎‎‏‏‏‏‏‎‎‏‎‏‎‏‏‏‎‎Tap here to listen to text on this screen‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‎‏‎‏‎‏‎‏‎‎‏‏‏‎Tap here to translate text on this screen‎‏‎‎‏‎" From 3d27207ff6ff951add0a21b699761126d1af11ec Mon Sep 17 00:00:00 2001 From: Steven Ng Date: Fri, 9 Jul 2021 17:45:19 +0100 Subject: [PATCH 13/13] Clear WidgetCell#mItem before recylcing a WidgetCell This fixes a bug which reuses a previous widget item spans to compute the preview size. Fix: 193133048 Test: manual Change-Id: I5459882e258dc010898854dbbe52a6fa8d84796c --- src/com/android/launcher3/widget/WidgetCell.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java index c3edcce95a..6605509c89 100644 --- a/src/com/android/launcher3/widget/WidgetCell.java +++ b/src/com/android/launcher3/widget/WidgetCell.java @@ -177,6 +177,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener { mWidgetImageContainer.removeView(mAppWidgetHostViewPreview); } mAppWidgetHostViewPreview = null; + mItem = null; } public void setSourceContainer(int sourceContainer) {