diff options
Diffstat (limited to 'libs')
124 files changed, 1356 insertions, 559 deletions
diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java index b12072373c5d..8e1fde066277 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java @@ -22,6 +22,7 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import static android.view.Display.DEFAULT_DISPLAY; import static android.view.WindowManager.TRANSIT_CLOSE; +import static android.window.ActivityWindowInfo.getActivityWindowInfo; import static android.window.TaskFragmentOperation.OP_TYPE_REPARENT_ACTIVITY_TO_TASK_FRAGMENT; import static android.window.TaskFragmentOperation.OP_TYPE_START_ACTIVITY_IN_TASK_FRAGMENT; import static android.window.TaskFragmentOrganizer.KEY_ERROR_CALLBACK_OP_TYPE; @@ -80,6 +81,7 @@ import android.window.ActivityWindowInfo; import android.window.TaskFragmentAnimationParams; import android.window.TaskFragmentInfo; import android.window.TaskFragmentOperation; +import android.window.TaskFragmentOrganizer; import android.window.TaskFragmentParentInfo; import android.window.TaskFragmentTransaction; import android.window.WindowContainerTransaction; @@ -2553,9 +2555,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen return ActivityThread.currentActivityThread().getActivity(activityToken); } - @VisibleForTesting @Nullable - ActivityThread.ActivityClientRecord getActivityClientRecord(@NonNull Activity activity) { + private ActivityThread.ActivityClientRecord getActivityClientRecord( + @NonNull Activity activity) { return ActivityThread.currentActivityThread() .getActivityClient(activity.getActivityToken()); } @@ -3092,10 +3094,8 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen */ @Override public boolean isActivityEmbedded(@NonNull Activity activity) { - Objects.requireNonNull(activity); synchronized (mLock) { - final ActivityWindowInfo activityWindowInfo = getActivityWindowInfo(activity); - return activityWindowInfo != null && activityWindowInfo.isEmbedded(); + return TaskFragmentOrganizer.isActivityEmbedded(activity); } } @@ -3165,15 +3165,6 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen } } - @Nullable - private ActivityWindowInfo getActivityWindowInfo(@NonNull Activity activity) { - if (activity.isFinishing()) { - return null; - } - final ActivityThread.ActivityClientRecord record = getActivityClientRecord(activity); - return record != null ? record.getActivityWindowInfo() : null; - } - @NonNull private static EmbeddedActivityWindowInfo translateActivityWindowInfo( @NonNull Activity activity, @NonNull ActivityWindowInfo activityWindowInfo) { diff --git a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitControllerTest.java b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitControllerTest.java index 99c0ee29962c..d852204b88a8 100644 --- a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitControllerTest.java +++ b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitControllerTest.java @@ -165,6 +165,7 @@ public class SplitControllerTest { private Consumer<List<SplitInfo>> mEmbeddingCallback; private List<SplitInfo> mSplitInfos; private TransactionManager mTransactionManager; + private ActivityThread mCurrentActivityThread; @Before public void setUp() { @@ -181,10 +182,12 @@ public class SplitControllerTest { }; mSplitController.setSplitInfoCallback(mEmbeddingCallback); mTransactionManager = mSplitController.mTransactionManager; + mCurrentActivityThread = ActivityThread.currentActivityThread(); spyOn(mSplitController); spyOn(mSplitPresenter); spyOn(mEmbeddingCallback); spyOn(mTransactionManager); + spyOn(mCurrentActivityThread); doNothing().when(mSplitPresenter).applyTransaction(any(), anyInt(), anyBoolean()); final Configuration activityConfig = new Configuration(); activityConfig.windowConfiguration.setBounds(TASK_BOUNDS); @@ -1668,7 +1671,8 @@ public class SplitControllerTest { final IBinder activityToken = new Binder(); doReturn(activityToken).when(activity).getActivityToken(); doReturn(activity).when(mSplitController).getActivity(activityToken); - doReturn(activityClientRecord).when(mSplitController).getActivityClientRecord(activity); + doReturn(activityClientRecord).when(mCurrentActivityThread).getActivityClient( + activityToken); doReturn(taskId).when(activity).getTaskId(); doReturn(new ActivityInfo()).when(activity).getActivityInfo(); doReturn(DEFAULT_DISPLAY).when(activity).getDisplayId(); diff --git a/libs/WindowManager/Shell/Android.bp b/libs/WindowManager/Shell/Android.bp index a00d003001e6..e6cb3a08119a 100644 --- a/libs/WindowManager/Shell/Android.bp +++ b/libs/WindowManager/Shell/Android.bp @@ -235,6 +235,10 @@ android_library { // *.kt sources are inside a filegroup. "kotlin-annotations", ], + required: [ + "wmshell.protolog.json.gz", + "wmshell.protolog.pb", + ], kotlincflags: ["-Xjvm-default=all"], manifest: "AndroidManifest.xml", plugins: ["dagger2-compiler"], diff --git a/libs/WindowManager/Shell/res/values-af/strings.xml b/libs/WindowManager/Shell/res/values-af/strings.xml index 8b328e2c79cf..6e8a679928f0 100644 --- a/libs/WindowManager/Shell/res/values-af/strings.xml +++ b/libs/WindowManager/Shell/res/values-af/strings.xml @@ -118,6 +118,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Sweef"</string> <string name="select_text" msgid="5139083974039906583">"Kies"</string> <string name="screenshot_text" msgid="1477704010087786671">"Skermskoot"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Maak toe"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Maak kieslys toe"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Maak kieslys oop"</string> diff --git a/libs/WindowManager/Shell/res/values-am/strings.xml b/libs/WindowManager/Shell/res/values-am/strings.xml index b005a01711eb..ac7935d76bfd 100644 --- a/libs/WindowManager/Shell/res/values-am/strings.xml +++ b/libs/WindowManager/Shell/res/values-am/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"አረፋ"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"ያቀናብሩ"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"አረፋ ተሰናብቷል።"</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"አረፋዎች"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"አረፋዎችን አሳይ"</string> <string name="restart_button_description" msgid="4564728020654658478">"ለተሻለ ዕይታ ይህን መተግበሪያ እንደገና ለመጀመር መታ ያድርጉ"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"የዚህን መተግበሪያ ምጥጥነ ገፅታ በቅንብሮች ውስጥ ይለውጡ"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"የምጥጥነ ገፅታ ለውጥ"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"ተንሳፋፊ"</string> <string name="select_text" msgid="5139083974039906583">"ምረጥ"</string> <string name="screenshot_text" msgid="1477704010087786671">"ቅጽበታዊ ገፅ ዕይታ"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"ዝጋ"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"ምናሌ ዝጋ"</string> <string name="expand_menu_text" msgid="3847736164494181168">"ምናሌን ክፈት"</string> diff --git a/libs/WindowManager/Shell/res/values-ar/strings.xml b/libs/WindowManager/Shell/res/values-ar/strings.xml index 8c283d33eff6..53ff6da41d34 100644 --- a/libs/WindowManager/Shell/res/values-ar/strings.xml +++ b/libs/WindowManager/Shell/res/values-ar/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"فقاعة"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"إدارة"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"تم إغلاق الفقاعة."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"الفقاعات"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"إظهار الفقاعات"</string> <string name="restart_button_description" msgid="4564728020654658478">"انقر لإعادة تشغيل هذا التطبيق للحصول على تجربة عرض أفضل."</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"يمكنك تغيير نسبة العرض إلى الارتفاع لهذا التطبيق من خلال \"الإعدادات\"."</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"تغيير نسبة العرض إلى الارتفاع"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"نافذة عائمة"</string> <string name="select_text" msgid="5139083974039906583">"اختيار"</string> <string name="screenshot_text" msgid="1477704010087786671">"لقطة شاشة"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"إغلاق"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"إغلاق القائمة"</string> <string name="expand_menu_text" msgid="3847736164494181168">"فتح القائمة"</string> diff --git a/libs/WindowManager/Shell/res/values-as/strings.xml b/libs/WindowManager/Shell/res/values-as/strings.xml index ef92587ad274..b94ab2e73e9c 100644 --- a/libs/WindowManager/Shell/res/values-as/strings.xml +++ b/libs/WindowManager/Shell/res/values-as/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"বাবল"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"পৰিচালনা কৰক"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"বাবল অগ্ৰাহ্য কৰা হৈছে"</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"বাবল"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"বাবল দেখুৱাওক"</string> <string name="restart_button_description" msgid="4564728020654658478">"উন্নত ভিউ পোৱাৰ বাবে এপ্টো ৰিষ্টাৰ্ট কৰিবলৈ টিপক"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"ছেটিঙলৈ গৈ এই এপ্টোৰ আকাৰৰ অনুপাত সলনি কৰক"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"আকাৰৰ অনুপাত সলনি কৰক"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"ওপঙা"</string> <string name="select_text" msgid="5139083974039906583">"বাছনি কৰক"</string> <string name="screenshot_text" msgid="1477704010087786671">"স্ক্ৰীনশ্বট"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"ব্ৰাউজাৰত খোলক"</string> <string name="close_text" msgid="4986518933445178928">"বন্ধ কৰক"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"মেনু বন্ধ কৰক"</string> <string name="expand_menu_text" msgid="3847736164494181168">"মেনু খোলক"</string> diff --git a/libs/WindowManager/Shell/res/values-az/strings.xml b/libs/WindowManager/Shell/res/values-az/strings.xml index 04b2f1c23bc4..dd3e0e3b03f4 100644 --- a/libs/WindowManager/Shell/res/values-az/strings.xml +++ b/libs/WindowManager/Shell/res/values-az/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Qabarcıq"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"İdarə edin"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Qabarcıqdan imtina edilib."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Yumrucuq"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Yumrucuqları göstərin"</string> <string name="restart_button_description" msgid="4564728020654658478">"Yaxşı görünüş üçün toxunaraq bu tətbiqi yenidən başladın"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Ayarlarda bu tətbiqin tərəflər nisbətini dəyişin"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Tərəflər nisbətini dəyişin"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Üzən pəncərə"</string> <string name="select_text" msgid="5139083974039906583">"Seçin"</string> <string name="screenshot_text" msgid="1477704010087786671">"Skrinşot"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Bağlayın"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Menyunu bağlayın"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Menyunu açın"</string> diff --git a/libs/WindowManager/Shell/res/values-b+sr+Latn/strings.xml b/libs/WindowManager/Shell/res/values-b+sr+Latn/strings.xml index 47bc105f19bc..af695e73161d 100644 --- a/libs/WindowManager/Shell/res/values-b+sr+Latn/strings.xml +++ b/libs/WindowManager/Shell/res/values-b+sr+Latn/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Oblačić"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Upravljajte"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Oblačić je odbačen."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Oblačići"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Prikaži oblačiće"</string> <string name="restart_button_description" msgid="4564728020654658478">"Dodirnite da biste restartovali ovu aplikaciju radi boljeg prikaza"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Promenite razmeru ove aplikacije u Podešavanjima"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Promeni razmeru"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"Plutajuće"</string> <string name="select_text" msgid="5139083974039906583">"Izaberite"</string> <string name="screenshot_text" msgid="1477704010087786671">"Snimak ekrana"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"Otvorite u pregledaču"</string> <string name="close_text" msgid="4986518933445178928">"Zatvorite"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zatvorite meni"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Otvorite meni"</string> diff --git a/libs/WindowManager/Shell/res/values-be/strings.xml b/libs/WindowManager/Shell/res/values-be/strings.xml index 6ad7553a8383..dbbc07fe2407 100644 --- a/libs/WindowManager/Shell/res/values-be/strings.xml +++ b/libs/WindowManager/Shell/res/values-be/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Усплывальнае апавяшчэнне"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Кіраваць"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Усплывальнае апавяшчэнне адхілена."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Успл. чаты"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Паказ усплывальных чатаў"</string> <string name="restart_button_description" msgid="4564728020654658478">"Націсніце, каб перазапусціць гэту праграму для зручнейшага прагляду"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Змяніць суадносіны бакоў для гэтай праграмы ў наладах"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Змяніць суадносіны бакоў"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"Зрабіць рухомым акном"</string> <string name="select_text" msgid="5139083974039906583">"Выбраць"</string> <string name="screenshot_text" msgid="1477704010087786671">"Здымак экрана"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"Адкрыць у браўзеры"</string> <string name="close_text" msgid="4986518933445178928">"Закрыць"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Закрыць меню"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Адкрыць меню"</string> diff --git a/libs/WindowManager/Shell/res/values-bg/strings.xml b/libs/WindowManager/Shell/res/values-bg/strings.xml index a9e0bce81376..bba2f999c8ea 100644 --- a/libs/WindowManager/Shell/res/values-bg/strings.xml +++ b/libs/WindowManager/Shell/res/values-bg/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Балонче"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Управление"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Балончето е отхвърлено."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Балончета"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Показване на балончетата"</string> <string name="restart_button_description" msgid="4564728020654658478">"Докоснете, за да рестартирате това приложение с цел по-добър изглед"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Променете съотношението на това приложение в „Настройки“"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Промяна на съотношението"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Плаващо"</string> <string name="select_text" msgid="5139083974039906583">"Избиране"</string> <string name="screenshot_text" msgid="1477704010087786671">"Екранна снимка"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Затваряне"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Затваряне на менюто"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Отваряне на менюто"</string> diff --git a/libs/WindowManager/Shell/res/values-bn/strings.xml b/libs/WindowManager/Shell/res/values-bn/strings.xml index 29de1007e311..cb081821d719 100644 --- a/libs/WindowManager/Shell/res/values-bn/strings.xml +++ b/libs/WindowManager/Shell/res/values-bn/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"বাবল"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"ম্যানেজ করুন"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"বাবল বাতিল করা হয়েছে।"</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"বাবল"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"বাবল দেখুন"</string> <string name="restart_button_description" msgid="4564728020654658478">"আরও ভাল ভিউয়ের জন্য এই অ্যাপ রিস্টার্ট করতে ট্যাপ করুন"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"সেটিংস থেকে এই অ্যাপের অ্যাস্পেক্ট রেশিও পরিবর্তন করুন"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"অ্যাস্পেক্ট রেশিও পরিবর্তন করুন"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"ফ্লোট"</string> <string name="select_text" msgid="5139083974039906583">"বেছে নিন"</string> <string name="screenshot_text" msgid="1477704010087786671">"স্ক্রিনশট"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"বন্ধ করুন"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"\'মেনু\' বন্ধ করুন"</string> <string name="expand_menu_text" msgid="3847736164494181168">"মেনু খুলুন"</string> diff --git a/libs/WindowManager/Shell/res/values-bs/strings.xml b/libs/WindowManager/Shell/res/values-bs/strings.xml index 5f1da7571d95..e7505e50f749 100644 --- a/libs/WindowManager/Shell/res/values-bs/strings.xml +++ b/libs/WindowManager/Shell/res/values-bs/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Oblačić"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Upravljaj"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Oblačić je odbačen."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Oblačići"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Prikaz oblačića"</string> <string name="restart_button_description" msgid="4564728020654658478">"Dodirnite da ponovo pokrenete ovu aplikaciju radi boljeg prikaza"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Promijenite format slike aplikacije u Postavkama"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Promijenite format slike"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"Lebdeći"</string> <string name="select_text" msgid="5139083974039906583">"Odabir"</string> <string name="screenshot_text" msgid="1477704010087786671">"Snimak ekrana"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"Otvori u pregledniku"</string> <string name="close_text" msgid="4986518933445178928">"Zatvaranje"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zatvaranje menija"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Otvaranje menija"</string> diff --git a/libs/WindowManager/Shell/res/values-ca/strings.xml b/libs/WindowManager/Shell/res/values-ca/strings.xml index d70de794ba17..ce9f54798120 100644 --- a/libs/WindowManager/Shell/res/values-ca/strings.xml +++ b/libs/WindowManager/Shell/res/values-ca/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bombolla"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Gestiona"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"La bombolla s\'ha ignorat."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Bombolles"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Mostra les bombolles"</string> <string name="restart_button_description" msgid="4564728020654658478">"Toca per reiniciar aquesta aplicació i obtenir una millor visualització"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Canvia la relació d\'aspecte d\'aquesta aplicació a Configuració"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Canvia la relació d\'aspecte"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"Flotant"</string> <string name="select_text" msgid="5139083974039906583">"Selecciona"</string> <string name="screenshot_text" msgid="1477704010087786671">"Captura de pantalla"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"Obre al navegador"</string> <string name="close_text" msgid="4986518933445178928">"Tanca"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Tanca el menú"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Obre el menú"</string> diff --git a/libs/WindowManager/Shell/res/values-cs/strings.xml b/libs/WindowManager/Shell/res/values-cs/strings.xml index ca00fec12e86..06941f6db248 100644 --- a/libs/WindowManager/Shell/res/values-cs/strings.xml +++ b/libs/WindowManager/Shell/res/values-cs/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bublina"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Spravovat"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Bublina byla zavřena."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Bubliny"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Zobrazovat bubliny"</string> <string name="restart_button_description" msgid="4564728020654658478">"Klepnutím tuto aplikaci restartujete kvůli lepšímu zobrazení"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Změnit v Nastavení poměr stran této aplikace"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Změnit poměr stran"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Plovoucí"</string> <string name="select_text" msgid="5139083974039906583">"Vybrat"</string> <string name="screenshot_text" msgid="1477704010087786671">"Snímek obrazovky"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Zavřít"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zavřít nabídku"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Otevřít nabídku"</string> diff --git a/libs/WindowManager/Shell/res/values-da/strings.xml b/libs/WindowManager/Shell/res/values-da/strings.xml index d50d2f0f135d..7883bb0fab8b 100644 --- a/libs/WindowManager/Shell/res/values-da/strings.xml +++ b/libs/WindowManager/Shell/res/values-da/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Boble"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Administrer"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Boblen blev lukket."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Bobler"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Vis bobler"</string> <string name="restart_button_description" msgid="4564728020654658478">"Tryk for at genstarte denne app, så visningen forbedres"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Skift denne apps billedformat i Indstillinger"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Skift billedformat"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Svævende"</string> <string name="select_text" msgid="5139083974039906583">"Vælg"</string> <string name="screenshot_text" msgid="1477704010087786671">"Screenshot"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Luk"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Luk menu"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Åbn menu"</string> diff --git a/libs/WindowManager/Shell/res/values-de/strings.xml b/libs/WindowManager/Shell/res/values-de/strings.xml index 7f44f83a1790..6bb85239f397 100644 --- a/libs/WindowManager/Shell/res/values-de/strings.xml +++ b/libs/WindowManager/Shell/res/values-de/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bubble"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Verwalten"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Bubble verworfen."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Bubbles"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Bubbles anzeigen"</string> <string name="restart_button_description" msgid="4564728020654658478">"Tippen, um diese App neu zu starten und die Ansicht zu verbessern"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Seitenverhältnis der App in den Einstellungen ändern"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Seitenverhältnis ändern"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Frei schwebend"</string> <string name="select_text" msgid="5139083974039906583">"Auswählen"</string> <string name="screenshot_text" msgid="1477704010087786671">"Screenshot"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Schließen"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Menü schließen"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Menü öffnen"</string> diff --git a/libs/WindowManager/Shell/res/values-el/strings.xml b/libs/WindowManager/Shell/res/values-el/strings.xml index a3a5ccd839e4..a640b941dd6e 100644 --- a/libs/WindowManager/Shell/res/values-el/strings.xml +++ b/libs/WindowManager/Shell/res/values-el/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Συννεφάκι"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Διαχείριση"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Το συννεφάκι παραβλέφθηκε."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Συννεφάκια"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Εμφάνιση συννεφακίων"</string> <string name="restart_button_description" msgid="4564728020654658478">"Πατήστε για να επανεκκινήσετε αυτή την εφαρμογή για καλύτερη προβολή"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Αλλάξτε τον λόγο διαστάσεων αυτής της εφαρμογής στις Ρυθμίσεις"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Αλλαγή λόγου διαστάσεων"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Κινούμενο"</string> <string name="select_text" msgid="5139083974039906583">"Επιλογή"</string> <string name="screenshot_text" msgid="1477704010087786671">"Στιγμιότυπο οθόνης"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Κλείσιμο"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Κλείσιμο μενού"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Άνοιγμα μενού"</string> diff --git a/libs/WindowManager/Shell/res/values-en-rAU/strings.xml b/libs/WindowManager/Shell/res/values-en-rAU/strings.xml index edc4f4e25c2a..4708d5fcd54e 100644 --- a/libs/WindowManager/Shell/res/values-en-rAU/strings.xml +++ b/libs/WindowManager/Shell/res/values-en-rAU/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bubble"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Manage"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Bubble dismissed."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Bubbles"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Show bubbles"</string> <string name="restart_button_description" msgid="4564728020654658478">"Tap to restart this app for a better view"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Change this app\'s aspect ratio in Settings"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Change aspect ratio"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Float"</string> <string name="select_text" msgid="5139083974039906583">"Select"</string> <string name="screenshot_text" msgid="1477704010087786671">"Screenshot"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Close"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Close menu"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Open menu"</string> diff --git a/libs/WindowManager/Shell/res/values-en-rCA/strings.xml b/libs/WindowManager/Shell/res/values-en-rCA/strings.xml index d7e23fd8dfd8..bd8a63690ba3 100644 --- a/libs/WindowManager/Shell/res/values-en-rCA/strings.xml +++ b/libs/WindowManager/Shell/res/values-en-rCA/strings.xml @@ -116,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"Float"</string> <string name="select_text" msgid="5139083974039906583">"Select"</string> <string name="screenshot_text" msgid="1477704010087786671">"Screenshot"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"Open in browser"</string> <string name="close_text" msgid="4986518933445178928">"Close"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Close Menu"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Open Menu"</string> diff --git a/libs/WindowManager/Shell/res/values-en-rGB/strings.xml b/libs/WindowManager/Shell/res/values-en-rGB/strings.xml index edc4f4e25c2a..4708d5fcd54e 100644 --- a/libs/WindowManager/Shell/res/values-en-rGB/strings.xml +++ b/libs/WindowManager/Shell/res/values-en-rGB/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bubble"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Manage"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Bubble dismissed."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Bubbles"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Show bubbles"</string> <string name="restart_button_description" msgid="4564728020654658478">"Tap to restart this app for a better view"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Change this app\'s aspect ratio in Settings"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Change aspect ratio"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Float"</string> <string name="select_text" msgid="5139083974039906583">"Select"</string> <string name="screenshot_text" msgid="1477704010087786671">"Screenshot"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Close"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Close menu"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Open menu"</string> diff --git a/libs/WindowManager/Shell/res/values-en-rIN/strings.xml b/libs/WindowManager/Shell/res/values-en-rIN/strings.xml index edc4f4e25c2a..4708d5fcd54e 100644 --- a/libs/WindowManager/Shell/res/values-en-rIN/strings.xml +++ b/libs/WindowManager/Shell/res/values-en-rIN/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bubble"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Manage"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Bubble dismissed."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Bubbles"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Show bubbles"</string> <string name="restart_button_description" msgid="4564728020654658478">"Tap to restart this app for a better view"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Change this app\'s aspect ratio in Settings"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Change aspect ratio"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Float"</string> <string name="select_text" msgid="5139083974039906583">"Select"</string> <string name="screenshot_text" msgid="1477704010087786671">"Screenshot"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Close"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Close menu"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Open menu"</string> diff --git a/libs/WindowManager/Shell/res/values-en-rXC/strings.xml b/libs/WindowManager/Shell/res/values-en-rXC/strings.xml index 1da8c275ce54..35030808f4fd 100644 --- a/libs/WindowManager/Shell/res/values-en-rXC/strings.xml +++ b/libs/WindowManager/Shell/res/values-en-rXC/strings.xml @@ -116,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"Float"</string> <string name="select_text" msgid="5139083974039906583">"Select"</string> <string name="screenshot_text" msgid="1477704010087786671">"Screenshot"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"Open in browser"</string> <string name="close_text" msgid="4986518933445178928">"Close"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Close Menu"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Open Menu"</string> diff --git a/libs/WindowManager/Shell/res/values-es-rUS/strings.xml b/libs/WindowManager/Shell/res/values-es-rUS/strings.xml index 8653e5932a04..72bafcd61e5a 100644 --- a/libs/WindowManager/Shell/res/values-es-rUS/strings.xml +++ b/libs/WindowManager/Shell/res/values-es-rUS/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Cuadro"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Administrar"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Se descartó el cuadro."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Burbujas"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Mostrar burbujas"</string> <string name="restart_button_description" msgid="4564728020654658478">"Presiona para reiniciar esta app y tener una mejor vista"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Cambiar la relación de aspecto de esta app en Configuración"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Cambiar relación de aspecto"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Flotante"</string> <string name="select_text" msgid="5139083974039906583">"Seleccionar"</string> <string name="screenshot_text" msgid="1477704010087786671">"Captura de pantalla"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Cerrar"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Cerrar menú"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Abrir el menú"</string> diff --git a/libs/WindowManager/Shell/res/values-es/strings.xml b/libs/WindowManager/Shell/res/values-es/strings.xml index 8f59c9c91d20..d907a56d15c4 100644 --- a/libs/WindowManager/Shell/res/values-es/strings.xml +++ b/libs/WindowManager/Shell/res/values-es/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Burbuja"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Gestionar"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Burbuja cerrada."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Burbujas"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Mostrar burbujas"</string> <string name="restart_button_description" msgid="4564728020654658478">"Toca para reiniciar esta aplicación y obtener una mejor vista"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Cambiar la relación de aspecto de esta aplicación en Ajustes"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Cambiar relación de aspecto"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Flotante"</string> <string name="select_text" msgid="5139083974039906583">"Seleccionar"</string> <string name="screenshot_text" msgid="1477704010087786671">"Captura de pantalla"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Cerrar"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Cerrar menú"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Abrir menú"</string> diff --git a/libs/WindowManager/Shell/res/values-et/strings.xml b/libs/WindowManager/Shell/res/values-et/strings.xml index 3d86eb4a91d9..7d8103edf664 100644 --- a/libs/WindowManager/Shell/res/values-et/strings.xml +++ b/libs/WindowManager/Shell/res/values-et/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Mull"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Halda"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Mullist loobuti."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Mullid"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Kuva mullid"</string> <string name="restart_button_description" msgid="4564728020654658478">"Puudutage, et see rakendus parema vaate jaoks taaskäivitada"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Muutke selle rakenduse kuvasuhet jaotises Seaded"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Muutke kuvasuhet"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Hõljuv"</string> <string name="select_text" msgid="5139083974039906583">"Vali"</string> <string name="screenshot_text" msgid="1477704010087786671">"Ekraanipilt"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Sule"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Sule menüü"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Ava menüü"</string> diff --git a/libs/WindowManager/Shell/res/values-eu/strings.xml b/libs/WindowManager/Shell/res/values-eu/strings.xml index 4e7bdd246d10..19e028f0f706 100644 --- a/libs/WindowManager/Shell/res/values-eu/strings.xml +++ b/libs/WindowManager/Shell/res/values-eu/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Burbuila"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Kudeatu"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Baztertu da globoa."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Burbuilak"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Erakutsi burbuilak"</string> <string name="restart_button_description" msgid="4564728020654658478">"Hobeto ikusteko, sakatu hau, eta aplikazioa berrabiarazi egingo da"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Aldatu aplikazioaren aspektu-erlazioa ezarpenetan"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Aldatu aspektu-erlazioa"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Leiho gainerakorra"</string> <string name="select_text" msgid="5139083974039906583">"Hautatu"</string> <string name="screenshot_text" msgid="1477704010087786671">"Pantaila-argazkia"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Itxi"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Itxi menua"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Ireki menua"</string> diff --git a/libs/WindowManager/Shell/res/values-fa/strings.xml b/libs/WindowManager/Shell/res/values-fa/strings.xml index a4711d4180bc..2bb9415d83a6 100644 --- a/libs/WindowManager/Shell/res/values-fa/strings.xml +++ b/libs/WindowManager/Shell/res/values-fa/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"حباب"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"مدیریت"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"حبابک رد شد."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"حبابک"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"نمایش حبابک"</string> <string name="restart_button_description" msgid="4564728020654658478">"برای داشتن نمایی بهتر، تکضرب بزنید تا این برنامه بازراهاندازی شود"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"نسبت ابعادی این برنامه را در «تنظیمات» تغییر دهید"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"تغییر نسبت ابعادی"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"شناور"</string> <string name="select_text" msgid="5139083974039906583">"انتخاب"</string> <string name="screenshot_text" msgid="1477704010087786671">"نماگرفت"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"بستن"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"بستن منو"</string> <string name="expand_menu_text" msgid="3847736164494181168">"باز کردن منو"</string> diff --git a/libs/WindowManager/Shell/res/values-fi/strings.xml b/libs/WindowManager/Shell/res/values-fi/strings.xml index 577d625ba8f8..fcc4150f6fc1 100644 --- a/libs/WindowManager/Shell/res/values-fi/strings.xml +++ b/libs/WindowManager/Shell/res/values-fi/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Kupla"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Ylläpidä"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Kupla ohitettu."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Kuplat"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Näytä kuplat"</string> <string name="restart_button_description" msgid="4564728020654658478">"Napauta, niin sovellus käynnistyy uudelleen paremmin näytölle sopivana"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Muuta tämän sovelluksen kuvasuhdetta Asetuksissa"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Vaihda kuvasuhdetta"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Kelluva ikkuna"</string> <string name="select_text" msgid="5139083974039906583">"Valitse"</string> <string name="screenshot_text" msgid="1477704010087786671">"Kuvakaappaus"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Sulje"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Sulje valikko"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Avaa valikko"</string> diff --git a/libs/WindowManager/Shell/res/values-fr-rCA/strings.xml b/libs/WindowManager/Shell/res/values-fr-rCA/strings.xml index 7feb772eb10a..268b409e6eef 100644 --- a/libs/WindowManager/Shell/res/values-fr-rCA/strings.xml +++ b/libs/WindowManager/Shell/res/values-fr-rCA/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bulle"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Gérer"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Bulle ignorée."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Bulles"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Afficher les bulles"</string> <string name="restart_button_description" msgid="4564728020654658478">"Touchez pour redémarrer cette appli afin d\'obtenir un meilleur affichage"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Changer les proportions de cette appli dans les paramètres"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Modifier les proportions"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Flottant"</string> <string name="select_text" msgid="5139083974039906583">"Sélectionner"</string> <string name="screenshot_text" msgid="1477704010087786671">"Capture d\'écran"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Fermer"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Fermer le menu"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Ouvrir le menu"</string> diff --git a/libs/WindowManager/Shell/res/values-fr/strings.xml b/libs/WindowManager/Shell/res/values-fr/strings.xml index 4d14d0b85f3e..1762a2921863 100644 --- a/libs/WindowManager/Shell/res/values-fr/strings.xml +++ b/libs/WindowManager/Shell/res/values-fr/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bulle"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Gérer"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Bulle fermée."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Bulles"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Afficher les bulles"</string> <string name="restart_button_description" msgid="4564728020654658478">"Appuyez pour redémarrer cette appli et obtenir une meilleure vue."</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Modifiez le format de cette appli dans les Paramètres."</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Modifier le format"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Flottante"</string> <string name="select_text" msgid="5139083974039906583">"Sélectionner"</string> <string name="screenshot_text" msgid="1477704010087786671">"Capture d\'écran"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Fermer"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Fermer le menu"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Ouvrir le menu"</string> diff --git a/libs/WindowManager/Shell/res/values-gl/strings.xml b/libs/WindowManager/Shell/res/values-gl/strings.xml index e5b67c2aaad1..94e7ad5bcd4e 100644 --- a/libs/WindowManager/Shell/res/values-gl/strings.xml +++ b/libs/WindowManager/Shell/res/values-gl/strings.xml @@ -118,6 +118,7 @@ <string name="float_button_text" msgid="9221657008391364581">"Flotante"</string> <string name="select_text" msgid="5139083974039906583">"Seleccionar"</string> <string name="screenshot_text" msgid="1477704010087786671">"Captura de pantalla"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"Abrir no navegador"</string> <string name="close_text" msgid="4986518933445178928">"Pechar"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Pechar o menú"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Abrir menú"</string> diff --git a/libs/WindowManager/Shell/res/values-gu/strings.xml b/libs/WindowManager/Shell/res/values-gu/strings.xml index e2a52dccd8ea..8a03a4d33b87 100644 --- a/libs/WindowManager/Shell/res/values-gu/strings.xml +++ b/libs/WindowManager/Shell/res/values-gu/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"બબલ"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"મેનેજ કરો"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"બબલ છોડી દેવાયો."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"બબલ"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"બબલ બતાવો"</string> <string name="restart_button_description" msgid="4564728020654658478">"વધુ સારા વ્યૂ માટે, આ ઍપને ફરી શરૂ કરવા ટૅપ કરો"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"સેટિંગમાં આ ઍપનો સાપેક્ષ ગુણોત્તર બદલો"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"સાપેક્ષ ગુણોત્તર બદલો"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"ફ્લોટિંગ વિન્ડો"</string> <string name="select_text" msgid="5139083974039906583">"પસંદ કરો"</string> <string name="screenshot_text" msgid="1477704010087786671">"સ્ક્રીનશૉટ"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"બંધ કરો"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"મેનૂ બંધ કરો"</string> <string name="expand_menu_text" msgid="3847736164494181168">"મેનૂ ખોલો"</string> diff --git a/libs/WindowManager/Shell/res/values-hi/strings.xml b/libs/WindowManager/Shell/res/values-hi/strings.xml index f75e0e0528e1..b73f449e4e83 100644 --- a/libs/WindowManager/Shell/res/values-hi/strings.xml +++ b/libs/WindowManager/Shell/res/values-hi/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"बबल"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"मैनेज करें"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"बबल खारिज किया गया."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"बबल्स"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"बबल्स दिखाएं"</string> <string name="restart_button_description" msgid="4564728020654658478">"बेहतर व्यू पाने के लिए, टैप करके ऐप्लिकेशन को रीस्टार्ट करें"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"सेटिंग में जाकर इस ऐप्लिकेशन का आसपेक्ट रेशियो (लंबाई-चौड़ाई का अनुपात) बदलें"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"आसपेक्ट रेशियो (लंबाई-चौड़ाई का अनुपात) बदलें"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"फ़्लोट"</string> <string name="select_text" msgid="5139083974039906583">"चुनें"</string> <string name="screenshot_text" msgid="1477704010087786671">"स्क्रीनशॉट"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"बंद करें"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"मेन्यू बंद करें"</string> <string name="expand_menu_text" msgid="3847736164494181168">"मेन्यू खोलें"</string> diff --git a/libs/WindowManager/Shell/res/values-hr/strings.xml b/libs/WindowManager/Shell/res/values-hr/strings.xml index ed80c505d756..000b0e63bf8e 100644 --- a/libs/WindowManager/Shell/res/values-hr/strings.xml +++ b/libs/WindowManager/Shell/res/values-hr/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Oblačić"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Upravljanje"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Oblačić odbačen."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Oblačići"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Prikaži oblačiće"</string> <string name="restart_button_description" msgid="4564728020654658478">"Dodirnite da biste ponovo pokrenuli tu aplikaciju kako biste bolje vidjeli"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Promijeni omjer slike ove aplikacije u postavkama"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Promijeni omjer slike"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"Plutajući"</string> <string name="select_text" msgid="5139083974039906583">"Odaberite"</string> <string name="screenshot_text" msgid="1477704010087786671">"Snimka zaslona"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"Otvori u pregledniku"</string> <string name="close_text" msgid="4986518933445178928">"Zatvorite"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zatvorite izbornik"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Otvaranje izbornika"</string> diff --git a/libs/WindowManager/Shell/res/values-hu/strings.xml b/libs/WindowManager/Shell/res/values-hu/strings.xml index 32a31063bd90..f4cf75472bb7 100644 --- a/libs/WindowManager/Shell/res/values-hu/strings.xml +++ b/libs/WindowManager/Shell/res/values-hu/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Buborék"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Kezelés"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Buborék elvetve."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Buborékok"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Buborékok megjelenítése"</string> <string name="restart_button_description" msgid="4564728020654658478">"A jobb nézet érdekében koppintson az alkalmazás újraindításához."</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Az app méretarányát a Beállításokban módosíthatja"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Méretarány módosítása"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Lebegő"</string> <string name="select_text" msgid="5139083974039906583">"Kiválasztás"</string> <string name="screenshot_text" msgid="1477704010087786671">"Képernyőkép"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Bezárás"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Menü bezárása"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Menü megnyitása"</string> diff --git a/libs/WindowManager/Shell/res/values-hy/strings.xml b/libs/WindowManager/Shell/res/values-hy/strings.xml index 65ca704ded09..1d2d2ff76912 100644 --- a/libs/WindowManager/Shell/res/values-hy/strings.xml +++ b/libs/WindowManager/Shell/res/values-hy/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Պղպջակ"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Կառավարել"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Ամպիկը փակվեց։"</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Ամպիկներ"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Ցույց տալ ամպիկներ"</string> <string name="restart_button_description" msgid="4564728020654658478">"Հպեք՝ հավելվածը վերագործարկելու և ավելի հարմար տեսք ընտրելու համար"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Փոխել հավելվածի կողմերի հարաբերակցությունը Կարգավորումներում"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Փոխել չափերի հարաբերակցությունը"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"Լողացող պատուհան"</string> <string name="select_text" msgid="5139083974039906583">"Ընտրել"</string> <string name="screenshot_text" msgid="1477704010087786671">"Սքրինշոթ"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"Բացել դիտարկիչում"</string> <string name="close_text" msgid="4986518933445178928">"Փակել"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Փակել ընտրացանկը"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Բացել ընտրացանկը"</string> diff --git a/libs/WindowManager/Shell/res/values-in/strings.xml b/libs/WindowManager/Shell/res/values-in/strings.xml index 975dd72f67d7..0e662f65e1e1 100644 --- a/libs/WindowManager/Shell/res/values-in/strings.xml +++ b/libs/WindowManager/Shell/res/values-in/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Balon"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Kelola"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Balon ditutup."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Balon"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Tampilkan Balon"</string> <string name="restart_button_description" msgid="4564728020654658478">"Ketuk untuk memulai ulang aplikasi ini agar mendapatkan tampilan yang lebih baik"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Ubah rasio aspek aplikasi ini di Setelan"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Ubah rasio aspek"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Mengambang"</string> <string name="select_text" msgid="5139083974039906583">"Pilih"</string> <string name="screenshot_text" msgid="1477704010087786671">"Screenshot"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Tutup"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Tutup Menu"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Buka Menu"</string> diff --git a/libs/WindowManager/Shell/res/values-is/strings.xml b/libs/WindowManager/Shell/res/values-is/strings.xml index 11c47189dce0..fb1df4db5d71 100644 --- a/libs/WindowManager/Shell/res/values-is/strings.xml +++ b/libs/WindowManager/Shell/res/values-is/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Blaðra"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Stjórna"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Blöðru lokað."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Blöðrur"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Sýna blöðrur"</string> <string name="restart_button_description" msgid="4564728020654658478">"Ýttu til að endurræsa forritið og fá betri sýn"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Breyta myndhlutfalli þessa forrits í stillingunum"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Breyta myndhlutfalli"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Reikult"</string> <string name="select_text" msgid="5139083974039906583">"Velja"</string> <string name="screenshot_text" msgid="1477704010087786671">"Skjámynd"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Loka"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Loka valmynd"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Opna valmynd"</string> diff --git a/libs/WindowManager/Shell/res/values-it/strings.xml b/libs/WindowManager/Shell/res/values-it/strings.xml index 168c8cc5936f..9c825bee57ce 100644 --- a/libs/WindowManager/Shell/res/values-it/strings.xml +++ b/libs/WindowManager/Shell/res/values-it/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Fumetto"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Gestisci"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Fumetto ignorato."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Bolle"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Mostra bolle"</string> <string name="restart_button_description" msgid="4564728020654658478">"Tocca per riavviare l\'app e migliorare la visualizzazione"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Cambia le proporzioni dell\'app nelle Impostazioni"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Cambia proporzioni"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Mobile"</string> <string name="select_text" msgid="5139083974039906583">"Seleziona"</string> <string name="screenshot_text" msgid="1477704010087786671">"Screenshot"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Chiudi"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Chiudi il menu"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Apri menu"</string> diff --git a/libs/WindowManager/Shell/res/values-iw/strings.xml b/libs/WindowManager/Shell/res/values-iw/strings.xml index fd4cd1adaa2a..abd0f6b34178 100644 --- a/libs/WindowManager/Shell/res/values-iw/strings.xml +++ b/libs/WindowManager/Shell/res/values-iw/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"בועה"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"ניהול"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"הבועה נסגרה."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"בועות"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"הצגת הבועות"</string> <string name="restart_button_description" msgid="4564728020654658478">"כדי לראות טוב יותר יש להקיש ולהפעיל את האפליקציה הזו מחדש"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"אפשר לשנות את יחס הגובה-רוחב של האפליקציה הזו ב\'הגדרות\'"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"שינוי יחס גובה-רוחב"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"בלונים"</string> <string name="select_text" msgid="5139083974039906583">"בחירה"</string> <string name="screenshot_text" msgid="1477704010087786671">"צילום מסך"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"סגירה"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"סגירת התפריט"</string> <string name="expand_menu_text" msgid="3847736164494181168">"פתיחת התפריט"</string> diff --git a/libs/WindowManager/Shell/res/values-ja/strings.xml b/libs/WindowManager/Shell/res/values-ja/strings.xml index 64ddec9450ae..55fd8b16f2a2 100644 --- a/libs/WindowManager/Shell/res/values-ja/strings.xml +++ b/libs/WindowManager/Shell/res/values-ja/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"バブル"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"管理"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"ふきだしが非表示になっています。"</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"バブル"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"バブルを表示"</string> <string name="restart_button_description" msgid="4564728020654658478">"タップしてこのアプリを再起動すると、表示が適切になります"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"このアプリのアスペクト比を [設定] で変更します"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"アスペクト比を変更"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"フローティング"</string> <string name="select_text" msgid="5139083974039906583">"選択"</string> <string name="screenshot_text" msgid="1477704010087786671">"スクリーンショット"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"ブラウザで開く"</string> <string name="close_text" msgid="4986518933445178928">"閉じる"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"メニューを閉じる"</string> <string name="expand_menu_text" msgid="3847736164494181168">"メニューを開く"</string> diff --git a/libs/WindowManager/Shell/res/values-ka/strings.xml b/libs/WindowManager/Shell/res/values-ka/strings.xml index cab8807b86d1..235420812937 100644 --- a/libs/WindowManager/Shell/res/values-ka/strings.xml +++ b/libs/WindowManager/Shell/res/values-ka/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"ბუშტი"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"მართვა"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"ბუშტი დაიხურა."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"ბუშტები"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"ბუშტების ჩვენება"</string> <string name="restart_button_description" msgid="4564728020654658478">"შეხებით გადატვირთეთ ეს აპი უკეთესი ხედის მისაღებად"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"შეცვალეთ ამ აპის თანაფარდობა პარამეტრებიდან"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"თანაფარდობის შეცვლა"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"ფარფატი"</string> <string name="select_text" msgid="5139083974039906583">"არჩევა"</string> <string name="screenshot_text" msgid="1477704010087786671">"ეკრანის ანაბეჭდი"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"ბრაუზერში გახსნა"</string> <string name="close_text" msgid="4986518933445178928">"დახურვა"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"მენიუს დახურვა"</string> <string name="expand_menu_text" msgid="3847736164494181168">"მენიუს გახსნა"</string> diff --git a/libs/WindowManager/Shell/res/values-kk/strings.xml b/libs/WindowManager/Shell/res/values-kk/strings.xml index 4ff5b85b36fd..18183739cb99 100644 --- a/libs/WindowManager/Shell/res/values-kk/strings.xml +++ b/libs/WindowManager/Shell/res/values-kk/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Көпіршік"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Басқару"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Қалқыма хабар жабылды."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Қалқыма хабарлар"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Қалқыма хабарлар көрсету"</string> <string name="restart_button_description" msgid="4564728020654658478">"Көріністі жақсарту үшін осы қолданбаны түртіп, қайта ашыңыз."</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Осы қолданбаның арақатынасын параметрлерден өзгертуге болады."</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Арақатынасты өзгерту"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Қалқыма"</string> <string name="select_text" msgid="5139083974039906583">"Таңдау"</string> <string name="screenshot_text" msgid="1477704010087786671">"Скриншот"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Жабу"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Мәзірді жабу"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Мәзірді ашу"</string> diff --git a/libs/WindowManager/Shell/res/values-km/strings.xml b/libs/WindowManager/Shell/res/values-km/strings.xml index ba7a32495659..69c0e1eabc05 100644 --- a/libs/WindowManager/Shell/res/values-km/strings.xml +++ b/libs/WindowManager/Shell/res/values-km/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"ពពុះ"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"គ្រប់គ្រង"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"បានច្រានចោលសារលេចឡើង។"</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"ផ្ទាំងអណ្ដែត"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"បង្ហាញផ្ទាំងអណ្ដែត"</string> <string name="restart_button_description" msgid="4564728020654658478">"ចុចដើម្បីចាប់ផ្ដើមកម្មវិធីនេះឡើងវិញសម្រាប់ទិដ្ឋភាពកាន់តែប្រសើរ"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"ផ្លាស់ប្ដូរសមាមាត្ររបស់កម្មវិធីនេះនៅក្នុងការកំណត់"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"ប្ដូរសមាមាត្រ"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"អណ្ដែត"</string> <string name="select_text" msgid="5139083974039906583">"ជ្រើសរើស"</string> <string name="screenshot_text" msgid="1477704010087786671">"រូបថតអេក្រង់"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"បើកក្នុងកម្មវិធីរុករកតាមអ៊ីនធឺណិត"</string> <string name="close_text" msgid="4986518933445178928">"បិទ"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"បិទម៉ឺនុយ"</string> <string name="expand_menu_text" msgid="3847736164494181168">"បើកម៉ឺនុយ"</string> diff --git a/libs/WindowManager/Shell/res/values-kn/strings.xml b/libs/WindowManager/Shell/res/values-kn/strings.xml index 423e8d53a654..88a29df525e9 100644 --- a/libs/WindowManager/Shell/res/values-kn/strings.xml +++ b/libs/WindowManager/Shell/res/values-kn/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"ಬಬಲ್"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"ನಿರ್ವಹಿಸಿ"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"ಬಬಲ್ ವಜಾಗೊಳಿಸಲಾಗಿದೆ."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"ಬಬಲ್ಸ್"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"ಬಬಲ್ಸ್ ತೋರಿಸಿ"</string> <string name="restart_button_description" msgid="4564728020654658478">"ಉತ್ತಮ ವೀಕ್ಷಣೆಗಾಗಿ ಈ ಆ್ಯಪ್ ಅನ್ನು ಮರುಪ್ರಾರಂಭಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಈ ಆ್ಯಪ್ನ ದೃಶ್ಯಾನುಪಾತವನ್ನು ಬದಲಾಯಿಸಿ"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"ದೃಶ್ಯಾನುಪಾತವನ್ನು ಬದಲಾಯಿಸಿ"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"ಫ್ಲೋಟ್"</string> <string name="select_text" msgid="5139083974039906583">"ಆಯ್ಕೆಮಾಡಿ"</string> <string name="screenshot_text" msgid="1477704010087786671">"ಸ್ಕ್ರೀನ್ಶಾಟ್"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"ಬ್ರೌಸರ್ನಲ್ಲಿ ತೆರೆಯಿರಿ"</string> <string name="close_text" msgid="4986518933445178928">"ಮುಚ್ಚಿ"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"ಮೆನು ಮುಚ್ಚಿ"</string> <string name="expand_menu_text" msgid="3847736164494181168">"ಮೆನು ತೆರೆಯಿರಿ"</string> diff --git a/libs/WindowManager/Shell/res/values-ko/strings.xml b/libs/WindowManager/Shell/res/values-ko/strings.xml index 0d1c6216776b..a22667d83858 100644 --- a/libs/WindowManager/Shell/res/values-ko/strings.xml +++ b/libs/WindowManager/Shell/res/values-ko/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"버블"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"관리"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"대화창을 닫았습니다."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"대화창"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"대화창 표시"</string> <string name="restart_button_description" msgid="4564728020654658478">"탭하면 앱을 다시 시작하여 보기를 개선합니다."</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"설정에서 앱의 가로세로 비율을 변경합니다."</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"가로세로 비율 변경"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"플로팅"</string> <string name="select_text" msgid="5139083974039906583">"선택"</string> <string name="screenshot_text" msgid="1477704010087786671">"스크린샷"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"닫기"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"메뉴 닫기"</string> <string name="expand_menu_text" msgid="3847736164494181168">"메뉴 열기"</string> diff --git a/libs/WindowManager/Shell/res/values-ky/strings.xml b/libs/WindowManager/Shell/res/values-ky/strings.xml index f17e9ca891c0..289d930ecedd 100644 --- a/libs/WindowManager/Shell/res/values-ky/strings.xml +++ b/libs/WindowManager/Shell/res/values-ky/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Көбүк"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Башкаруу"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Калкып чыкма билдирме жабылды."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Калкып чыкма билдирмелер"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Калкып чыкма билдирмелерди көрсөтүү"</string> <string name="restart_button_description" msgid="4564728020654658478">"Жакшыраак көрүү үчүн бул колдонмону өчүрүп күйгүзүңүз. Ал үчүн таптап коюңуз"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Бул колдонмонун тараптарынын катнашын параметрлерден өзгөртүү"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Тараптардын катнашын өзгөртүү"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"Калкыма"</string> <string name="select_text" msgid="5139083974039906583">"Тандоо"</string> <string name="screenshot_text" msgid="1477704010087786671">"Скриншот"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"Серепчиден ачуу"</string> <string name="close_text" msgid="4986518933445178928">"Жабуу"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Менюну жабуу"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Менюну ачуу"</string> diff --git a/libs/WindowManager/Shell/res/values-lo/strings.xml b/libs/WindowManager/Shell/res/values-lo/strings.xml index 195e4d56a1c1..0b84d2c45957 100644 --- a/libs/WindowManager/Shell/res/values-lo/strings.xml +++ b/libs/WindowManager/Shell/res/values-lo/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"ຟອງ"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"ຈັດການ"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"ປິດ Bubble ໄສ້ແລ້ວ."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"ຟອງ"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"ສະແດງຟອງ"</string> <string name="restart_button_description" msgid="4564728020654658478">"ແຕະເພື່ອຣີສະຕາດແອັບນີ້ເພື່ອມຸມມອງທີ່ດີຂຶ້ນ"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"ປ່ຽນອັດຕາສ່ວນຂອງແອັບນີ້ໃນການຕັ້ງຄ່າ"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"ປ່ຽນອັດຕາສ່ວນ"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"ລອຍ"</string> <string name="select_text" msgid="5139083974039906583">"ເລືອກ"</string> <string name="screenshot_text" msgid="1477704010087786671">"ຮູບໜ້າຈໍ"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"ເປີດໃນໂປຣແກຣມທ່ອງເວັບ"</string> <string name="close_text" msgid="4986518933445178928">"ປິດ"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"ປິດເມນູ"</string> <string name="expand_menu_text" msgid="3847736164494181168">"ເປີດເມນູ"</string> diff --git a/libs/WindowManager/Shell/res/values-lt/strings.xml b/libs/WindowManager/Shell/res/values-lt/strings.xml index 63ad580a81cc..5b0e6b7a7047 100644 --- a/libs/WindowManager/Shell/res/values-lt/strings.xml +++ b/libs/WindowManager/Shell/res/values-lt/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Debesėlis"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Tvarkyti"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Debesėlio atsisakyta."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Burbulai"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Rodyti burbulus"</string> <string name="restart_button_description" msgid="4564728020654658478">"Palieskite, kad iš naujo paleistumėte šią programą ir matytumėte aiškiau"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Pakeiskite šios programos kraštinių santykį"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Keisti kraštinių santykį"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Slankusis langas"</string> <string name="select_text" msgid="5139083974039906583">"Pasirinkti"</string> <string name="screenshot_text" msgid="1477704010087786671">"Ekrano kopija"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Uždaryti"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Uždaryti meniu"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Atidaryti meniu"</string> diff --git a/libs/WindowManager/Shell/res/values-lv/strings.xml b/libs/WindowManager/Shell/res/values-lv/strings.xml index 268d89324f54..704b2ed43f92 100644 --- a/libs/WindowManager/Shell/res/values-lv/strings.xml +++ b/libs/WindowManager/Shell/res/values-lv/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Burbulis"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Pārvaldīt"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Burbulis ir noraidīts."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Burbuļi"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Rādīt burbuļus"</string> <string name="restart_button_description" msgid="4564728020654658478">"Pieskarieties, lai restartētu šo lietotni un uzlabotu attēlojumu."</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Iestatījumos mainiet šīs lietotnes malu attiecību."</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Mainīt malu attiecību"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Peldošs"</string> <string name="select_text" msgid="5139083974039906583">"Atlasīt"</string> <string name="screenshot_text" msgid="1477704010087786671">"Ekrānuzņēmums"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Aizvērt"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Aizvērt izvēlni"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Atvērt izvēlni"</string> diff --git a/libs/WindowManager/Shell/res/values-mk/strings.xml b/libs/WindowManager/Shell/res/values-mk/strings.xml index 0a0027fa1bae..b257f802f294 100644 --- a/libs/WindowManager/Shell/res/values-mk/strings.xml +++ b/libs/WindowManager/Shell/res/values-mk/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Балонче"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Управувајте"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Балончето е отфрлено."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Балончиња"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Прикажи „Балончиња“"</string> <string name="restart_button_description" msgid="4564728020654658478">"Допрете за да ја рестартирате апликацијава за подобар приказ"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Промени го соодносот на апликацијава во „Поставки“"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Променување на соодносот"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Лебдечко"</string> <string name="select_text" msgid="5139083974039906583">"Изберете"</string> <string name="screenshot_text" msgid="1477704010087786671">"Слика од екранот"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Затворете"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Затворете го менито"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Отвори го менито"</string> diff --git a/libs/WindowManager/Shell/res/values-ml/strings.xml b/libs/WindowManager/Shell/res/values-ml/strings.xml index 07809e1a0014..2efd983b3342 100644 --- a/libs/WindowManager/Shell/res/values-ml/strings.xml +++ b/libs/WindowManager/Shell/res/values-ml/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"ബബിൾ"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"മാനേജ് ചെയ്യുക"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"ബബിൾ ഡിസ്മിസ് ചെയ്തു."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"ബബിൾ"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"ബബിൾ കാണിക്കുക"</string> <string name="restart_button_description" msgid="4564728020654658478">"മികച്ച കാഴ്ചയ്ക്കായി ഈ ആപ്പ് റീസ്റ്റാർട്ട് ചെയ്യാൻ ടാപ്പ് ചെയ്യുക"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"ഈ ആപ്പിന്റെ വീക്ഷണ അനുപാതം, ക്രമീകരണത്തിൽ മാറ്റുക"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"വീക്ഷണ അനുപാതം മാറ്റുക"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"ഫ്ലോട്ട്"</string> <string name="select_text" msgid="5139083974039906583">"തിരഞ്ഞെടുക്കുക"</string> <string name="screenshot_text" msgid="1477704010087786671">"സ്ക്രീൻഷോട്ട്"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"ബ്രൗസറിൽ തുറക്കുക"</string> <string name="close_text" msgid="4986518933445178928">"അടയ്ക്കുക"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"മെനു അടയ്ക്കുക"</string> <string name="expand_menu_text" msgid="3847736164494181168">"മെനു തുറക്കുക"</string> diff --git a/libs/WindowManager/Shell/res/values-mn/strings.xml b/libs/WindowManager/Shell/res/values-mn/strings.xml index 99bd2dffca53..a343065d2506 100644 --- a/libs/WindowManager/Shell/res/values-mn/strings.xml +++ b/libs/WindowManager/Shell/res/values-mn/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Бөмбөлөг"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Удирдах"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Бөмбөлгийг үл хэрэгссэн."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Бөмбөлгүүд"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Бөмбөлгүүдийг харуулах"</string> <string name="restart_button_description" msgid="4564728020654658478">"Харагдах байдлыг сайжруулахын тулд энэ аппыг товшиж, дахин эхлүүлнэ үү"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Энэ аппын харьцааг Тохиргоонд өөрчилнө үү"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Харьцааг өөрчлөх"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Хөвөгч"</string> <string name="select_text" msgid="5139083974039906583">"Сонгох"</string> <string name="screenshot_text" msgid="1477704010087786671">"Дэлгэцийн агшин"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Хаах"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Цэсийг хаах"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Цэс нээх"</string> diff --git a/libs/WindowManager/Shell/res/values-mr/strings.xml b/libs/WindowManager/Shell/res/values-mr/strings.xml index ac57e0a549b4..ef71e864a809 100644 --- a/libs/WindowManager/Shell/res/values-mr/strings.xml +++ b/libs/WindowManager/Shell/res/values-mr/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"बबल"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"व्यवस्थापित करा"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"बबल डिसमिस केला."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"बबल"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"बबल दाखवा"</string> <string name="restart_button_description" msgid="4564728020654658478">"अधिक चांगल्या दृश्यासाठी हे अॅप रीस्टार्ट करण्याकरिता टॅप करा"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"सेटिंग्ज मध्ये या ॲपचा आस्पेक्ट रेशो बदला"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"आस्पेक्ट रेशो बदला"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"फ्लोट"</string> <string name="select_text" msgid="5139083974039906583">"निवडा"</string> <string name="screenshot_text" msgid="1477704010087786671">"स्क्रीनशॉट"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"ब्राउझरमध्ये उघडा"</string> <string name="close_text" msgid="4986518933445178928">"बंद करा"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"मेनू बंद करा"</string> <string name="expand_menu_text" msgid="3847736164494181168">"मेनू उघडा"</string> diff --git a/libs/WindowManager/Shell/res/values-ms/strings.xml b/libs/WindowManager/Shell/res/values-ms/strings.xml index 6bc2fbb27c51..a9a97d8112c6 100644 --- a/libs/WindowManager/Shell/res/values-ms/strings.xml +++ b/libs/WindowManager/Shell/res/values-ms/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Gelembung"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Urus"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Gelembung diketepikan."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Gelembung"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Tunjukkan Gelembung"</string> <string name="restart_button_description" msgid="4564728020654658478">"Ketik untuk memulakan semula apl ini untuk mendapatkan paparan yang lebih baik"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Tukar nisbah bidang apl ini dalam Tetapan"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Tukar nisbah bidang"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"Terapung"</string> <string name="select_text" msgid="5139083974039906583">"Pilih"</string> <string name="screenshot_text" msgid="1477704010087786671">"Tangkapan skrin"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"Buka dalam penyemak imbas"</string> <string name="close_text" msgid="4986518933445178928">"Tutup"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Tutup Menu"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Buka Menu"</string> diff --git a/libs/WindowManager/Shell/res/values-my/strings.xml b/libs/WindowManager/Shell/res/values-my/strings.xml index 12c19edcaeb1..781148d83a4a 100644 --- a/libs/WindowManager/Shell/res/values-my/strings.xml +++ b/libs/WindowManager/Shell/res/values-my/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"ပူဖောင်းဖောက်သံ"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"စီမံရန်"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"ပူဖောင်းကွက် ဖယ်လိုက်သည်။"</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"ပူဖောင်းကွက်"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"ပူဖောင်းကွက်များ ပြပါ"</string> <string name="restart_button_description" msgid="4564728020654658478">"ပိုကောင်းသောမြင်ကွင်းအတွက် ဤအက်ပ်ပြန်စရန် တို့ပါ"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"ဆက်တင်များတွင် ဤအက်ပ်၏အချိုးအစားကို ပြောင်းရန်"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"အချိုးစား ပြောင်းရန်"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"မျှောရန်"</string> <string name="select_text" msgid="5139083974039906583">"ရွေးရန်"</string> <string name="screenshot_text" msgid="1477704010087786671">"ဖန်သားပြင်ဓာတ်ပုံ"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"ပိတ်ရန်"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"မီနူး ပိတ်ရန်"</string> <string name="expand_menu_text" msgid="3847736164494181168">"မီနူး ဖွင့်ရန်"</string> diff --git a/libs/WindowManager/Shell/res/values-nb/strings.xml b/libs/WindowManager/Shell/res/values-nb/strings.xml index 27b79019a57a..9dc8501692a6 100644 --- a/libs/WindowManager/Shell/res/values-nb/strings.xml +++ b/libs/WindowManager/Shell/res/values-nb/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Boble"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Administrer"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Boblen er avvist."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Bobler"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Vis bobler"</string> <string name="restart_button_description" msgid="4564728020654658478">"Trykk for å starte denne appen på nytt og få en bedre visning"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Endre høyde/bredde-forholdet for denne appen i Innstillinger"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Endre høyde/bredde-forholdet"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Svevende"</string> <string name="select_text" msgid="5139083974039906583">"Velg"</string> <string name="screenshot_text" msgid="1477704010087786671">"Skjermbilde"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Lukk"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Lukk menyen"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Åpne menyen"</string> diff --git a/libs/WindowManager/Shell/res/values-ne/strings.xml b/libs/WindowManager/Shell/res/values-ne/strings.xml index 25d033738c86..7cc4a437905b 100644 --- a/libs/WindowManager/Shell/res/values-ne/strings.xml +++ b/libs/WindowManager/Shell/res/values-ne/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"बबल"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"व्यवस्थापन गर्नुहोस्"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"बबल हटाइयो।"</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"बबलहरू"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"बबलहरू देखाउनुहोस्"</string> <string name="restart_button_description" msgid="4564728020654658478">"अझ राम्रो भ्यू प्राप्त गर्नका लागि यो एप रिस्टार्ट गर्न ट्याप गर्नुहोस्"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"सेटिङमा गई यो एपको एस्पेक्ट रेसियो परिवर्तन गर्नुहोस्"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"एस्पेक्ट रेसियो परिवर्तन गर्नुहोस्"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"फ्लोट"</string> <string name="select_text" msgid="5139083974039906583">"चयन गर्नुहोस्"</string> <string name="screenshot_text" msgid="1477704010087786671">"स्क्रिनसट"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"ब्राउजरमा खोल्नुहोस्"</string> <string name="close_text" msgid="4986518933445178928">"बन्द गर्नुहोस्"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"मेनु बन्द गर्नुहोस्"</string> <string name="expand_menu_text" msgid="3847736164494181168">"मेनु खोल्नुहोस्"</string> diff --git a/libs/WindowManager/Shell/res/values-nl/strings.xml b/libs/WindowManager/Shell/res/values-nl/strings.xml index 4ad343cb1a4e..7480add2ab0a 100644 --- a/libs/WindowManager/Shell/res/values-nl/strings.xml +++ b/libs/WindowManager/Shell/res/values-nl/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bubbel"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Beheren"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Bubbel gesloten."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Bubbels"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Bubbels tonen"</string> <string name="restart_button_description" msgid="4564728020654658478">"Tik om deze app opnieuw op te starten voor een betere weergave"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Wijzig de beeldverhouding van deze app in Instellingen"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Beeldverhouding wijzigen"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"Zwevend"</string> <string name="select_text" msgid="5139083974039906583">"Selecteren"</string> <string name="screenshot_text" msgid="1477704010087786671">"Screenshot"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"Openen in browser"</string> <string name="close_text" msgid="4986518933445178928">"Sluiten"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Menu sluiten"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Menu openen"</string> diff --git a/libs/WindowManager/Shell/res/values-or/strings.xml b/libs/WindowManager/Shell/res/values-or/strings.xml index 966d40440ac7..5412bb8c4a85 100644 --- a/libs/WindowManager/Shell/res/values-or/strings.xml +++ b/libs/WindowManager/Shell/res/values-or/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"ବବଲ୍"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"ପରିଚାଳନା କରନ୍ତୁ"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"ବବଲ୍ ଖାରଜ କରାଯାଇଛି।"</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"ବବଲ"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"ବବଲ ଦେଖାନ୍ତୁ"</string> <string name="restart_button_description" msgid="4564728020654658478">"ଏକ ଆହୁରି ଭଲ ଭ୍ୟୁ ପାଇଁ ଏହି ଆପ ରିଷ୍ଟାର୍ଟ କରିବାକୁ ଟାପ କରନ୍ତୁ"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"ସେଟିଂସରେ ଏହି ଆପର ଚଉଡ଼ା ଓ ଉଚ୍ଚତାର ଅନୁପାତ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"ଚଉଡ଼ା ଓ ଉଚ୍ଚତାର ଅନୁପାତ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"ଫ୍ଲୋଟ"</string> <string name="select_text" msgid="5139083974039906583">"ଚୟନ କରନ୍ତୁ"</string> <string name="screenshot_text" msgid="1477704010087786671">"ସ୍କ୍ରିନସଟ"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"ବନ୍ଦ କରନ୍ତୁ"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"ମେନୁ ବନ୍ଦ କରନ୍ତୁ"</string> <string name="expand_menu_text" msgid="3847736164494181168">"ମେନୁ ଖୋଲନ୍ତୁ"</string> diff --git a/libs/WindowManager/Shell/res/values-pa/strings.xml b/libs/WindowManager/Shell/res/values-pa/strings.xml index 9feaf41cda7f..abff90d32cc1 100644 --- a/libs/WindowManager/Shell/res/values-pa/strings.xml +++ b/libs/WindowManager/Shell/res/values-pa/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"ਬੁਲਬੁਲਾ"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"ਪ੍ਰਬੰਧਨ ਕਰੋ"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"ਬਬਲ ਨੂੰ ਖਾਰਜ ਕੀਤਾ ਗਿਆ।"</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"ਬਬਲ"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"ਬਬਲ ਦਿਖਾਓ"</string> <string name="restart_button_description" msgid="4564728020654658478">"ਬਿਹਤਰ ਦ੍ਰਿਸ਼ ਵਾਸਤੇ ਇਸ ਐਪ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਜਾ ਕੇ ਇਸ ਐਪ ਦੇ ਆਕਾਰ ਅਨੁਪਾਤ ਨੂੰ ਬਦਲੋ"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"ਆਕਾਰ ਅਨੁਪਾਤ ਬਦਲੋ"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"ਫ਼ਲੋਟ"</string> <string name="select_text" msgid="5139083974039906583">"ਚੁਣੋ"</string> <string name="screenshot_text" msgid="1477704010087786671">"ਸਕ੍ਰੀਨਸ਼ਾਟ"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"ਬੰਦ ਕਰੋ"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"ਮੀਨੂ ਬੰਦ ਕਰੋ"</string> <string name="expand_menu_text" msgid="3847736164494181168">"ਮੀਨੂ ਖੋਲ੍ਹੋ"</string> diff --git a/libs/WindowManager/Shell/res/values-pl/strings.xml b/libs/WindowManager/Shell/res/values-pl/strings.xml index 1c7fbf8e80d3..1c268bd34d55 100644 --- a/libs/WindowManager/Shell/res/values-pl/strings.xml +++ b/libs/WindowManager/Shell/res/values-pl/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Dymek"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Zarządzaj"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Zamknięto dymek"</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Dymki"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Pokaż dymki"</string> <string name="restart_button_description" msgid="4564728020654658478">"Kliknij w celu zrestartowania aplikacji, aby lepiej się wyświetlała."</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Zmień proporcje obrazu aplikacji w Ustawieniach"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Zmień proporcje obrazu"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"Pływające"</string> <string name="select_text" msgid="5139083974039906583">"Wybierz"</string> <string name="screenshot_text" msgid="1477704010087786671">"Zrzut ekranu"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"Otwórz w przeglądarce"</string> <string name="close_text" msgid="4986518933445178928">"Zamknij"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zamknij menu"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Otwórz menu"</string> diff --git a/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml b/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml index 5c2de2ad0d31..82566fedf890 100644 --- a/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml +++ b/libs/WindowManager/Shell/res/values-pt-rBR/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bolha"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Gerenciar"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Balão dispensado."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Balões"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Mostrar balões"</string> <string name="restart_button_description" msgid="4564728020654658478">"Toque para reiniciar o app e atualizar a visualização"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Mude o tamanho da janela deste app nas Configurações"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Mudar a proporção"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"Ponto flutuante"</string> <string name="select_text" msgid="5139083974039906583">"Selecionar"</string> <string name="screenshot_text" msgid="1477704010087786671">"Captura de tela"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"Abrir no navegador"</string> <string name="close_text" msgid="4986518933445178928">"Fechar"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Fechar menu"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Abrir o menu"</string> diff --git a/libs/WindowManager/Shell/res/values-pt-rPT/strings.xml b/libs/WindowManager/Shell/res/values-pt-rPT/strings.xml index 6f76525473eb..b2e89182ace4 100644 --- a/libs/WindowManager/Shell/res/values-pt-rPT/strings.xml +++ b/libs/WindowManager/Shell/res/values-pt-rPT/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Balão"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Gerir"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Balão ignorado."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Balões"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Mostrar balões"</string> <string name="restart_button_description" msgid="4564728020654658478">"Toque para reiniciar esta app e ficar com uma melhor visão"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Altere o formato desta app nas Definições"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Altere o formato"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"Flutuar"</string> <string name="select_text" msgid="5139083974039906583">"Selecionar"</string> <string name="screenshot_text" msgid="1477704010087786671">"Captura de ecrã"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"Abrir no navegador"</string> <string name="close_text" msgid="4986518933445178928">"Fechar"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Fechar menu"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Abrir menu"</string> diff --git a/libs/WindowManager/Shell/res/values-pt/strings.xml b/libs/WindowManager/Shell/res/values-pt/strings.xml index 5c2de2ad0d31..82566fedf890 100644 --- a/libs/WindowManager/Shell/res/values-pt/strings.xml +++ b/libs/WindowManager/Shell/res/values-pt/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bolha"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Gerenciar"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Balão dispensado."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Balões"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Mostrar balões"</string> <string name="restart_button_description" msgid="4564728020654658478">"Toque para reiniciar o app e atualizar a visualização"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Mude o tamanho da janela deste app nas Configurações"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Mudar a proporção"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"Ponto flutuante"</string> <string name="select_text" msgid="5139083974039906583">"Selecionar"</string> <string name="screenshot_text" msgid="1477704010087786671">"Captura de tela"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"Abrir no navegador"</string> <string name="close_text" msgid="4986518933445178928">"Fechar"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Fechar menu"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Abrir o menu"</string> diff --git a/libs/WindowManager/Shell/res/values-ro/strings.xml b/libs/WindowManager/Shell/res/values-ro/strings.xml index 6e85e7849d95..67dc389816a6 100644 --- a/libs/WindowManager/Shell/res/values-ro/strings.xml +++ b/libs/WindowManager/Shell/res/values-ro/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Balon"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Gestionează"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Balonul a fost respins."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Baloane"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Afișează Baloane"</string> <string name="restart_button_description" msgid="4564728020654658478">"Atinge ca să repornești aplicația pentru o vizualizare mai bună"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Schimbă raportul de dimensiuni al aplicației din Setări"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Schimbă raportul de dimensiuni"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Flotantă"</string> <string name="select_text" msgid="5139083974039906583">"Selectează"</string> <string name="screenshot_text" msgid="1477704010087786671">"Captură de ecran"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Închide"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Închide meniul"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Deschide meniul"</string> diff --git a/libs/WindowManager/Shell/res/values-ru/strings.xml b/libs/WindowManager/Shell/res/values-ru/strings.xml index 1b41983cd1a3..b2a60302bd1a 100644 --- a/libs/WindowManager/Shell/res/values-ru/strings.xml +++ b/libs/WindowManager/Shell/res/values-ru/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Всплывающая подсказка"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Настроить"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Всплывающий чат закрыт."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Чаты"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Всплывающие чаты"</string> <string name="restart_button_description" msgid="4564728020654658478">"Нажмите, чтобы перезапустить приложение и оптимизировать размер"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Изменить соотношение сторон приложения в настройках"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Изменить соотношение сторон"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"Плавающее окно"</string> <string name="select_text" msgid="5139083974039906583">"Выбрать"</string> <string name="screenshot_text" msgid="1477704010087786671">"Скриншот"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"Открыть в браузере"</string> <string name="close_text" msgid="4986518933445178928">"Закрыть"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Закрыть меню"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Открыть меню"</string> diff --git a/libs/WindowManager/Shell/res/values-si/strings.xml b/libs/WindowManager/Shell/res/values-si/strings.xml index 6fd37e91c8b0..34eaad0825f6 100644 --- a/libs/WindowManager/Shell/res/values-si/strings.xml +++ b/libs/WindowManager/Shell/res/values-si/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"බුබුළු"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"කළමනා කරන්න"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"බුබුල ඉවත දමා ඇත."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"බුබුළු"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"බුබුළු පෙන්වන්න"</string> <string name="restart_button_description" msgid="4564728020654658478">"වඩා හොඳ දසුනක් සඳහා මෙම යෙදුම යළි ඇරඹීමට තට්ටු කරන්න"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"සැකසීම් තුළ මෙම යෙදුමේ දර්ශන අනුපාතය වෙනස් කරන්න"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"දර්ශන අනුපාතය වෙනස් කරන්න"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"පාවෙන"</string> <string name="select_text" msgid="5139083974039906583">"තෝරන්න"</string> <string name="screenshot_text" msgid="1477704010087786671">"තිර රුව"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"වසන්න"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"මෙනුව වසන්න"</string> <string name="expand_menu_text" msgid="3847736164494181168">"මෙනුව විවෘත කරන්න"</string> diff --git a/libs/WindowManager/Shell/res/values-sk/strings.xml b/libs/WindowManager/Shell/res/values-sk/strings.xml index dabbf397d38f..4687f39cb308 100644 --- a/libs/WindowManager/Shell/res/values-sk/strings.xml +++ b/libs/WindowManager/Shell/res/values-sk/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bublina"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Spravovať"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Bublina bola zavretá."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Bubliny"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Zobraziť bubliny"</string> <string name="restart_button_description" msgid="4564728020654658478">"Ak chcete zlepšiť zobrazenie, klepnutím túto aplikáciu reštartujte"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Zmeniť pomer strán tejto aplikácie v Nastaveniach"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Zmeniť pomer strán"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Plávajúce"</string> <string name="select_text" msgid="5139083974039906583">"Vybrať"</string> <string name="screenshot_text" msgid="1477704010087786671">"Snímka obrazovky"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Zavrieť"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zavrieť ponuku"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Otvoriť ponuku"</string> diff --git a/libs/WindowManager/Shell/res/values-sl/strings.xml b/libs/WindowManager/Shell/res/values-sl/strings.xml index 3ade33810cc8..5848f9261d9b 100644 --- a/libs/WindowManager/Shell/res/values-sl/strings.xml +++ b/libs/WindowManager/Shell/res/values-sl/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Mehurček"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Upravljanje"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Oblaček je bil opuščen."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Oblački"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Prikaži oblačke"</string> <string name="restart_button_description" msgid="4564728020654658478">"Če želite boljši prikaz, se dotaknite za vnovični zagon te aplikacije."</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Razmerje stranic te aplikacije spremenite v nastavitvah."</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Sprememba razmerja stranic"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"Lebdeče"</string> <string name="select_text" msgid="5139083974039906583">"Izberi"</string> <string name="screenshot_text" msgid="1477704010087786671">"Posnetek zaslona"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"Odpri v brskalniku"</string> <string name="close_text" msgid="4986518933445178928">"Zapri"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Zapri meni"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Odpri meni"</string> diff --git a/libs/WindowManager/Shell/res/values-sq/strings.xml b/libs/WindowManager/Shell/res/values-sq/strings.xml index ee1aa00c5cbe..5f8f97e8b7df 100644 --- a/libs/WindowManager/Shell/res/values-sq/strings.xml +++ b/libs/WindowManager/Shell/res/values-sq/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Flluskë"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Menaxho"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Flluska u hoq."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Flluskat"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Shfaq \"Flluskat\""</string> <string name="restart_button_description" msgid="4564728020654658478">"Trokit për ta rinisur këtë aplikacion për një pamje më të mirë"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Ndrysho raportin e pamjes së këtij aplikacioni te \"Cilësimet\""</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Ndrysho raportin e pamjes"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Pluskuese"</string> <string name="select_text" msgid="5139083974039906583">"Zgjidh"</string> <string name="screenshot_text" msgid="1477704010087786671">"Pamja e ekranit"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Mbyll"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Mbyll menynë"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Hap menynë"</string> diff --git a/libs/WindowManager/Shell/res/values-sr/strings.xml b/libs/WindowManager/Shell/res/values-sr/strings.xml index b2868ca84dac..8402eef99c38 100644 --- a/libs/WindowManager/Shell/res/values-sr/strings.xml +++ b/libs/WindowManager/Shell/res/values-sr/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Облачић"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Управљајте"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Облачић је одбачен."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Облачићи"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Прикажи облачиће"</string> <string name="restart_button_description" msgid="4564728020654658478">"Додирните да бисте рестартовали ову апликацију ради бољег приказа"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Промените размеру ове апликације у Подешавањима"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Промени размеру"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"Плутајуће"</string> <string name="select_text" msgid="5139083974039906583">"Изаберите"</string> <string name="screenshot_text" msgid="1477704010087786671">"Снимак екрана"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"Отворите у прегледачу"</string> <string name="close_text" msgid="4986518933445178928">"Затворите"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Затворите мени"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Отворите мени"</string> diff --git a/libs/WindowManager/Shell/res/values-sv/strings.xml b/libs/WindowManager/Shell/res/values-sv/strings.xml index 66118efd5da7..a991152ddc06 100644 --- a/libs/WindowManager/Shell/res/values-sv/strings.xml +++ b/libs/WindowManager/Shell/res/values-sv/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bubbla"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Hantera"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Bubblan ignorerades."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Bubblor"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Visa bubblor"</string> <string name="restart_button_description" msgid="4564728020654658478">"Tryck för att starta om appen och få en bättre vy"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Ändra appens bildformat i inställningarna"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Ändra bildformat"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Svävande"</string> <string name="select_text" msgid="5139083974039906583">"Välj"</string> <string name="screenshot_text" msgid="1477704010087786671">"Skärmbild"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Stäng"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Stäng menyn"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Öppna menyn"</string> diff --git a/libs/WindowManager/Shell/res/values-sw/strings.xml b/libs/WindowManager/Shell/res/values-sw/strings.xml index 863b49b1f010..94ea2f2ad02e 100644 --- a/libs/WindowManager/Shell/res/values-sw/strings.xml +++ b/libs/WindowManager/Shell/res/values-sw/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Kiputo"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Dhibiti"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Umeondoa kiputo."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Viputo"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Onyesha Viputo"</string> <string name="restart_button_description" msgid="4564728020654658478">"Gusa ili uzime kisha uwashe programu hii, ili upate mwonekano bora"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Badilisha uwiano wa programu hii katika Mipangilio"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Badilisha uwiano wa kipengele"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Inayoelea"</string> <string name="select_text" msgid="5139083974039906583">"Chagua"</string> <string name="screenshot_text" msgid="1477704010087786671">"Picha ya skrini"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Funga"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Funga Menyu"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Fungua Menyu"</string> diff --git a/libs/WindowManager/Shell/res/values-ta/strings.xml b/libs/WindowManager/Shell/res/values-ta/strings.xml index 74e0207bf62e..866fe568c470 100644 --- a/libs/WindowManager/Shell/res/values-ta/strings.xml +++ b/libs/WindowManager/Shell/res/values-ta/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"பபிள்"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"நிர்வகி"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"குமிழ் நிராகரிக்கப்பட்டது."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"குமிழ்கள்"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"குமிழ்களைக் காட்டு"</string> <string name="restart_button_description" msgid="4564728020654658478">"இங்கு தட்டுவதன் மூலம் இந்த ஆப்ஸை மீண்டும் தொடங்கி, ஆப்ஸ் காட்டப்படும் விதத்தை இன்னும் சிறப்பாக்கலாம்"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"அமைப்புகளில் இந்த ஆப்ஸின் தோற்ற விகிதத்தை மாற்றும்"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"தோற்ற விகிதத்தை மாற்றும்"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"மிதக்கும் சாளரம்"</string> <string name="select_text" msgid="5139083974039906583">"தேர்ந்தெடுக்கும்"</string> <string name="screenshot_text" msgid="1477704010087786671">"ஸ்கிரீன்ஷாட்"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"மூடும்"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"மெனுவை மூடும்"</string> <string name="expand_menu_text" msgid="3847736164494181168">"மெனுவைத் திற"</string> diff --git a/libs/WindowManager/Shell/res/values-te/strings.xml b/libs/WindowManager/Shell/res/values-te/strings.xml index 35711567e760..ef094fcc8e64 100644 --- a/libs/WindowManager/Shell/res/values-te/strings.xml +++ b/libs/WindowManager/Shell/res/values-te/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"బబుల్"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"మేనేజ్ చేయండి"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"బబుల్ విస్మరించబడింది."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"బబుల్స్"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"బబుల్స్ చూడండి"</string> <string name="restart_button_description" msgid="4564728020654658478">"మెరుగైన వీక్షణ కోసం ఈ యాప్ను రీస్టార్ట్ చేయడానికి ట్యాప్ చేయండి"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"సెట్టింగ్లలో ఈ యాప్ ఆకార నిష్పత్తిని మార్చండి"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"ఆకార నిష్పత్తిని మార్చండి"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"ఫ్లోట్"</string> <string name="select_text" msgid="5139083974039906583">"ఎంచుకోండి"</string> <string name="screenshot_text" msgid="1477704010087786671">"స్క్రీన్షాట్"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"బ్రౌజర్లో తెరవండి"</string> <string name="close_text" msgid="4986518933445178928">"మూసివేయండి"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"మెనూను మూసివేయండి"</string> <string name="expand_menu_text" msgid="3847736164494181168">"మెనూను తెరవండి"</string> diff --git a/libs/WindowManager/Shell/res/values-th/strings.xml b/libs/WindowManager/Shell/res/values-th/strings.xml index 47694164270e..762a81a0305a 100644 --- a/libs/WindowManager/Shell/res/values-th/strings.xml +++ b/libs/WindowManager/Shell/res/values-th/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"บับเบิล"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"จัดการ"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"ปิดบับเบิลแล้ว"</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"บับเบิล"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"แสดงบับเบิล"</string> <string name="restart_button_description" msgid="4564728020654658478">"แตะเพื่อรีสตาร์ทแอปนี้และรับมุมมองที่ดียิ่งขึ้น"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"เปลี่ยนสัดส่วนภาพของแอปนี้ในการตั้งค่า"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"เปลี่ยนอัตราส่วนกว้างยาว"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"ล่องลอย"</string> <string name="select_text" msgid="5139083974039906583">"เลือก"</string> <string name="screenshot_text" msgid="1477704010087786671">"ภาพหน้าจอ"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"เปิดในเบราว์เซอร์"</string> <string name="close_text" msgid="4986518933445178928">"ปิด"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"ปิดเมนู"</string> <string name="expand_menu_text" msgid="3847736164494181168">"เปิดเมนู"</string> diff --git a/libs/WindowManager/Shell/res/values-tl/strings.xml b/libs/WindowManager/Shell/res/values-tl/strings.xml index be18d88194c1..418f500aac80 100644 --- a/libs/WindowManager/Shell/res/values-tl/strings.xml +++ b/libs/WindowManager/Shell/res/values-tl/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bubble"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Pamahalaan"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Na-dismiss na ang bubble."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Mga Bubble"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Ipakita ang Mga Bubble"</string> <string name="restart_button_description" msgid="4564728020654658478">"I-tap para i-restart ang app na ito para sa mas magandang view"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Baguhin ang aspect ratio ng app na ito sa Mga Setting"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Baguhin ang aspect ratio"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"Float"</string> <string name="select_text" msgid="5139083974039906583">"Piliin"</string> <string name="screenshot_text" msgid="1477704010087786671">"Screenshot"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"Buksan sa browser"</string> <string name="close_text" msgid="4986518933445178928">"Isara"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Isara ang Menu"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Buksan ang Menu"</string> diff --git a/libs/WindowManager/Shell/res/values-tr/strings.xml b/libs/WindowManager/Shell/res/values-tr/strings.xml index 4c8c53610711..e70f1708fb75 100644 --- a/libs/WindowManager/Shell/res/values-tr/strings.xml +++ b/libs/WindowManager/Shell/res/values-tr/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Baloncuk"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Yönet"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Balon kapatıldı."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Baloncuklar"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Baloncukları göster"</string> <string name="restart_button_description" msgid="4564728020654658478">"Bu uygulamayı yeniden başlatarak daha iyi bir görünüm elde etmek için dokunun"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Bu uygulamanın en boy oranını Ayarlar\'dan değiştirin"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"En boy oranını değiştir"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Havada Süzülen"</string> <string name="select_text" msgid="5139083974039906583">"Seç"</string> <string name="screenshot_text" msgid="1477704010087786671">"Ekran görüntüsü"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Kapat"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Menüyü kapat"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Menüyü Aç"</string> diff --git a/libs/WindowManager/Shell/res/values-uk/strings.xml b/libs/WindowManager/Shell/res/values-uk/strings.xml index 7cc1a0406f97..b243a153af8f 100644 --- a/libs/WindowManager/Shell/res/values-uk/strings.xml +++ b/libs/WindowManager/Shell/res/values-uk/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Спливаюче сповіщення"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Налаштувати"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Спливаюче сповіщення закрито."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Спл. чати"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Показувати спливаючі чати"</string> <string name="restart_button_description" msgid="4564728020654658478">"Натисніть, щоб перезапустити цей додаток для зручнішого перегляду"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Змінити формат для цього додатка в налаштуваннях"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Змінити формат"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Плаваюче вікно"</string> <string name="select_text" msgid="5139083974039906583">"Вибрати"</string> <string name="screenshot_text" msgid="1477704010087786671">"Знімок екрана"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Закрити"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Закрити меню"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Відкрити меню"</string> diff --git a/libs/WindowManager/Shell/res/values-ur/strings.xml b/libs/WindowManager/Shell/res/values-ur/strings.xml index 8b9f29969d80..2cf9f325892d 100644 --- a/libs/WindowManager/Shell/res/values-ur/strings.xml +++ b/libs/WindowManager/Shell/res/values-ur/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"بلبلہ"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"نظم کریں"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"بلبلہ برخاست کر دیا گیا۔"</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"بلبلے"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"بلبلے دکھائیں"</string> <string name="restart_button_description" msgid="4564728020654658478">"بہتر منظر کے لیے اس ایپ کو ری اسٹارٹ کرنے کی خاطر تھپتھپائیں"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"ترتیبات میں اس ایپ کی تناسبی شرح کو تبدیل کریں"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"تناسبی شرح کو تبدیل کریں"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"فلوٹ"</string> <string name="select_text" msgid="5139083974039906583">"منتخب کریں"</string> <string name="screenshot_text" msgid="1477704010087786671">"اسکرین شاٹ"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"براؤزر میں کھولیں"</string> <string name="close_text" msgid="4986518933445178928">"بند کریں"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"مینیو بند کریں"</string> <string name="expand_menu_text" msgid="3847736164494181168">"مینو کھولیں"</string> diff --git a/libs/WindowManager/Shell/res/values-uz/strings.xml b/libs/WindowManager/Shell/res/values-uz/strings.xml index 55c6b32c909b..f8cd43f9d6fa 100644 --- a/libs/WindowManager/Shell/res/values-uz/strings.xml +++ b/libs/WindowManager/Shell/res/values-uz/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Pufaklar"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Boshqarish"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Bulutcha yopildi."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Bulutchalar"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Bulutchalarni chiqarish"</string> <string name="restart_button_description" msgid="4564728020654658478">"Yaxshiroq koʻrish maqsadida bu ilovani qayta ishga tushirish uchun bosing"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Sozlamalar orqali bu ilovaning tomonlar nisbatini oʻzgartiring"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Tomonlar nisbatini oʻzgartirish"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"Pufakli"</string> <string name="select_text" msgid="5139083974039906583">"Tanlash"</string> <string name="screenshot_text" msgid="1477704010087786671">"Skrinshot"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"Brauzerda ochish"</string> <string name="close_text" msgid="4986518933445178928">"Yopish"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Menyuni yopish"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Menyuni ochish"</string> diff --git a/libs/WindowManager/Shell/res/values-vi/strings.xml b/libs/WindowManager/Shell/res/values-vi/strings.xml index 07a6b6f6c2b4..a813b265a4dc 100644 --- a/libs/WindowManager/Shell/res/values-vi/strings.xml +++ b/libs/WindowManager/Shell/res/values-vi/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Bong bóng"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Quản lý"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Đã đóng bong bóng."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Bong bóng"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Hiện bong bóng"</string> <string name="restart_button_description" msgid="4564728020654658478">"Nhấn nút khởi động lại ứng dụng này để xem dễ hơn"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Thay đổi tỷ lệ khung hình của ứng dụng này thông qua phần Cài đặt"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Thay đổi tỷ lệ khung hình"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"Nổi"</string> <string name="select_text" msgid="5139083974039906583">"Chọn"</string> <string name="screenshot_text" msgid="1477704010087786671">"Ảnh chụp màn hình"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"Đóng"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Đóng trình đơn"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Mở Trình đơn"</string> diff --git a/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml b/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml index 908095a163a7..6f21fdfa250e 100644 --- a/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml +++ b/libs/WindowManager/Shell/res/values-zh-rCN/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"气泡"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"管理"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"已关闭消息气泡。"</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"消息气泡"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"显示消息气泡"</string> <string name="restart_button_description" msgid="4564728020654658478">"点按即可重启此应用，获得更好的视觉体验"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"在“设置”中更改此应用的宽高比"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"更改高宽比"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"悬浮"</string> <string name="select_text" msgid="5139083974039906583">"选择"</string> <string name="screenshot_text" msgid="1477704010087786671">"屏幕截图"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"关闭"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"关闭菜单"</string> <string name="expand_menu_text" msgid="3847736164494181168">"打开菜单"</string> diff --git a/libs/WindowManager/Shell/res/values-zh-rHK/strings.xml b/libs/WindowManager/Shell/res/values-zh-rHK/strings.xml index c8550b4e0611..159db8f0e82d 100644 --- a/libs/WindowManager/Shell/res/values-zh-rHK/strings.xml +++ b/libs/WindowManager/Shell/res/values-zh-rHK/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"氣泡"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"管理"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"對話氣泡已關閉。"</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"對話氣泡"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"顯示對話氣泡"</string> <string name="restart_button_description" msgid="4564728020654658478">"輕按並重新啟動此應用程式，以取得更佳的觀看體驗"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"前往「設定」變更此應用程式的長寬比"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"變更長寬比"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"浮動"</string> <string name="select_text" msgid="5139083974039906583">"選取"</string> <string name="screenshot_text" msgid="1477704010087786671">"螢幕截圖"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"關閉"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"關閉選單"</string> <string name="expand_menu_text" msgid="3847736164494181168">"打開選單"</string> diff --git a/libs/WindowManager/Shell/res/values-zh-rTW/strings.xml b/libs/WindowManager/Shell/res/values-zh-rTW/strings.xml index 67048335de64..8a1b2bf2b14e 100644 --- a/libs/WindowManager/Shell/res/values-zh-rTW/strings.xml +++ b/libs/WindowManager/Shell/res/values-zh-rTW/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"泡泡"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"管理"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"已關閉泡泡。"</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"對話框"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"顯示對話框"</string> <string name="restart_button_description" msgid="4564728020654658478">"輕觸此按鈕重新啟動這個應用程式，即可獲得更良好的觀看體驗"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"前往「設定」變更這個應用程式的顯示比例"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"變更顯示比例"</string> @@ -118,6 +116,8 @@ <string name="float_button_text" msgid="9221657008391364581">"浮動"</string> <string name="select_text" msgid="5139083974039906583">"選取"</string> <string name="screenshot_text" msgid="1477704010087786671">"螢幕截圖"</string> + <!-- no translation found for open_in_browser_text (9181692926376072904) --> + <skip /> <string name="close_text" msgid="4986518933445178928">"關閉"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"關閉選單"</string> <string name="expand_menu_text" msgid="3847736164494181168">"開啟選單"</string> diff --git a/libs/WindowManager/Shell/res/values-zu/strings.xml b/libs/WindowManager/Shell/res/values-zu/strings.xml index 96b4faec06b8..ba3df301df54 100644 --- a/libs/WindowManager/Shell/res/values-zu/strings.xml +++ b/libs/WindowManager/Shell/res/values-zu/strings.xml @@ -84,10 +84,8 @@ <string name="notification_bubble_title" msgid="6082910224488253378">"Ibhamuza"</string> <string name="manage_bubbles_text" msgid="7730624269650594419">"Phatha"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Ibhamuza licashisiwe."</string> - <!-- no translation found for bubble_shortcut_label (666269077944378311) --> - <skip /> - <!-- no translation found for bubble_shortcut_long_label (6088437544312894043) --> - <skip /> + <string name="bubble_shortcut_label" msgid="666269077944378311">"Amabhamuza"</string> + <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Bonisa Amabhamuza"</string> <string name="restart_button_description" msgid="4564728020654658478">"Thepha ukuze uqale kabusha le app ukuze ibonakale kangcono"</string> <string name="user_aspect_ratio_settings_button_hint" msgid="734835849600713016">"Shintsha ukubukeka kwesilinganiselo kwe-app kuMasethingi"</string> <string name="user_aspect_ratio_settings_button_description" msgid="4315566801697411684">"Shintsha ukubukeka kwesilinganiselo"</string> @@ -118,6 +116,7 @@ <string name="float_button_text" msgid="9221657008391364581">"Iflowuthi"</string> <string name="select_text" msgid="5139083974039906583">"Khetha"</string> <string name="screenshot_text" msgid="1477704010087786671">"Isithombe-skrini"</string> + <string name="open_in_browser_text" msgid="9181692926376072904">"Vula kubhrawuza"</string> <string name="close_text" msgid="4986518933445178928">"Vala"</string> <string name="collapse_menu_text" msgid="7515008122450342029">"Vala Imenyu"</string> <string name="expand_menu_text" msgid="3847736164494181168">"Vula Imenyu"</string> diff --git a/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/animation/PhysicsAnimatorTestUtils.kt b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/animation/PhysicsAnimatorTestUtils.kt index 235b9bf7b9fd..fc3dc1465dff 100644 --- a/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/animation/PhysicsAnimatorTestUtils.kt +++ b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/animation/PhysicsAnimatorTestUtils.kt @@ -168,6 +168,16 @@ object PhysicsAnimatorTestUtils { } } + /** Whether any animation is currently running. */ + @JvmStatic + fun isAnyAnimationRunning(): Boolean { + for (target in allAnimatedObjects) { + val animator = PhysicsAnimator.getInstance(target) + if (animator.isRunning()) return true + } + return false + } + /** * Blocks the calling thread until the first animation frame in which predicate returns true. If * the given object isn't animating, returns without blocking. diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimation.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimation.java index 196f89d5794e..df80946a99aa 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimation.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimation.java @@ -107,4 +107,24 @@ public interface BackAnimation { * @param pilferCallback the callback to pilfer pointers. */ void setPilferPointerCallback(Runnable pilferCallback); + + /** + * Set a callback to requestTopUi. + * @param topUiRequest the callback to requestTopUi. + */ + void setTopUiRequestCallback(TopUiRequest topUiRequest); + + /** + * Callback to request SysUi to call + * {@link android.app.IActivityManager#setHasTopUi(boolean)}. + */ + interface TopUiRequest { + + /** + * Request {@link android.app.IActivityManager#setHasTopUi(boolean)} to be called. + * @param requestTopUi whether topUi should be requested or not + * @param tag tag of the request-source + */ + void requestTopUi(boolean requestTopUi, String tag); + } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java index 8467e972526e..a9fdea34515e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java @@ -114,6 +114,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont @Nullable private BackNavigationInfo mBackNavigationInfo; + private boolean mReceivedNullNavigationInfo = false; private final IActivityTaskManager mActivityTaskManager; private final Context mContext; private final ContentResolver mContentResolver; @@ -179,6 +180,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont @BackNavigationInfo.BackTargetType private int mPreviousNavigationType; private Runnable mPilferPointerCallback; + private BackAnimation.TopUiRequest mRequestTopUiCallback; public BackAnimationController( @NonNull ShellInit shellInit, @@ -357,6 +359,11 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont mPilferPointerCallback = callback; }); } + + @Override + public void setTopUiRequestCallback(TopUiRequest topUiRequest) { + mShellExecutor.execute(() -> mRequestTopUiCallback = topUiRequest); + } } private static class IBackAnimationImpl extends IBackAnimation.Stub @@ -424,7 +431,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont mThresholdCrossed = true; // There was no focus window when calling startBackNavigation, still pilfer pointers so // the next focus window won't receive motion events. - if (mBackNavigationInfo == null) { + if (mBackNavigationInfo == null && mReceivedNullNavigationInfo) { tryPilferPointers(); return; } @@ -547,6 +554,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont ProtoLog.d(WM_SHELL_BACK_PREVIEW, "Received backNavigationInfo:%s", backNavigationInfo); if (backNavigationInfo == null) { ProtoLog.e(WM_SHELL_BACK_PREVIEW, "Received BackNavigationInfo is null."); + mReceivedNullNavigationInfo = true; cancelLatencyTracking(); tryPilferPointers(); return; @@ -557,6 +565,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont if (!mShellBackAnimationRegistry.startGesture(backType)) { mActiveCallback = null; } + requestTopUi(true, backType); tryPilferPointers(); } else { mActiveCallback = mBackNavigationInfo.getOnBackInvokedCallback(); @@ -902,10 +911,12 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont mPointersPilfered = false; mShellBackAnimationRegistry.resetDefaultCrossActivity(); cancelLatencyTracking(); + mReceivedNullNavigationInfo = false; if (mBackNavigationInfo != null) { mPreviousNavigationType = mBackNavigationInfo.getType(); mBackNavigationInfo.onBackNavigationFinished(triggerBack); mBackNavigationInfo = null; + requestTopUi(false, mPreviousNavigationType); } } @@ -969,6 +980,13 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont } } + private void requestTopUi(boolean hasTopUi, int backType) { + if (mRequestTopUiCallback != null && (backType == BackNavigationInfo.TYPE_CROSS_TASK + || backType == BackNavigationInfo.TYPE_CROSS_ACTIVITY)) { + mRequestTopUiCallback.requestTopUi(hasTopUi, TAG); + } + } + /** * Validate animation targets. */ diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityBackAnimation.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityBackAnimation.kt index 4f04c5c28412..4e0c82b9628f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityBackAnimation.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityBackAnimation.kt @@ -61,8 +61,7 @@ abstract class CrossActivityBackAnimation( private val context: Context, private val background: BackAnimationBackground, private val rootTaskDisplayAreaOrganizer: RootTaskDisplayAreaOrganizer, - protected val transaction: SurfaceControl.Transaction, - private val choreographer: Choreographer + protected val transaction: SurfaceControl.Transaction ) : ShellBackAnimation() { protected val startClosingRect = RectF() @@ -269,7 +268,9 @@ abstract class CrossActivityBackAnimation( .setSpring(postCommitFlingSpring) flingAnimation.start() // do an animation-frame immediately to prevent idle frame - flingAnimation.doAnimationFrame(choreographer.lastFrameTimeNanos / TimeUtils.NANOS_PER_MS) + flingAnimation.doAnimationFrame( + Choreographer.getInstance().lastFrameTimeNanos / TimeUtils.NANOS_PER_MS + ) val valueAnimator = ValueAnimator.ofFloat(1f, 0f).setDuration(getPostCommitAnimationDuration()) @@ -362,7 +363,7 @@ abstract class CrossActivityBackAnimation( } protected fun applyTransaction() { - transaction.setFrameTimelineVsync(choreographer.vsyncId) + transaction.setFrameTimelineVsync(Choreographer.getInstance().vsyncId) transaction.apply() } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossTaskBackAnimation.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossTaskBackAnimation.java index 103a65422504..e2b0513c951f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossTaskBackAnimation.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossTaskBackAnimation.java @@ -52,7 +52,6 @@ import com.android.internal.policy.SystemBarUtils; import com.android.internal.protolog.ProtoLog; import com.android.wm.shell.R; import com.android.wm.shell.animation.Interpolators; -import com.android.wm.shell.shared.annotations.ShellMainThread; import javax.inject.Inject; @@ -69,7 +68,6 @@ import javax.inject.Inject; * IOnBackInvokedCallback} with WM Shell and receives back dispatches when a back navigation to * launcher starts. */ -@ShellMainThread public class CrossTaskBackAnimation extends ShellBackAnimation { private static final int BACKGROUNDCOLOR = 0x43433A; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/CustomCrossActivityBackAnimation.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/back/CustomCrossActivityBackAnimation.kt index e266e2cd7eea..b02f97bf7784 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/CustomCrossActivityBackAnimation.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/CustomCrossActivityBackAnimation.kt @@ -19,7 +19,6 @@ import android.content.Context import android.graphics.Rect import android.graphics.RectF import android.util.MathUtils -import android.view.Choreographer import android.view.SurfaceControl import android.view.animation.Animation import android.view.animation.Transformation @@ -31,27 +30,23 @@ import com.android.internal.policy.TransitionAnimation import com.android.internal.protolog.ProtoLog import com.android.wm.shell.RootTaskDisplayAreaOrganizer import com.android.wm.shell.protolog.ShellProtoLogGroup -import com.android.wm.shell.shared.annotations.ShellMainThread import javax.inject.Inject import kotlin.math.max import kotlin.math.min /** Class that handles customized predictive cross activity back animations. */ -@ShellMainThread class CustomCrossActivityBackAnimation( context: Context, background: BackAnimationBackground, rootTaskDisplayAreaOrganizer: RootTaskDisplayAreaOrganizer, transaction: SurfaceControl.Transaction, - choreographer: Choreographer, private val customAnimationLoader: CustomAnimationLoader ) : CrossActivityBackAnimation( context, background, rootTaskDisplayAreaOrganizer, - transaction, - choreographer + transaction ) { private var enterAnimation: Animation? = null @@ -70,7 +65,6 @@ class CustomCrossActivityBackAnimation( background, rootTaskDisplayAreaOrganizer, SurfaceControl.Transaction(), - Choreographer.getInstance(), CustomAnimationLoader( TransitionAnimation(context, false /* debug */, "CustomCrossActivityBackAnimation") ) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/DefaultCrossActivityBackAnimation.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/back/DefaultCrossActivityBackAnimation.kt index 3b5eb3613d2a..c747e1e98956 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/DefaultCrossActivityBackAnimation.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/DefaultCrossActivityBackAnimation.kt @@ -16,18 +16,15 @@ package com.android.wm.shell.back import android.content.Context -import android.view.Choreographer import android.view.SurfaceControl import android.window.BackEvent import com.android.wm.shell.R import com.android.wm.shell.RootTaskDisplayAreaOrganizer import com.android.wm.shell.animation.Interpolators -import com.android.wm.shell.shared.annotations.ShellMainThread import javax.inject.Inject import kotlin.math.max /** Class that defines cross-activity animation. */ -@ShellMainThread class DefaultCrossActivityBackAnimation @Inject constructor( @@ -39,8 +36,7 @@ constructor( context, background, rootTaskDisplayAreaOrganizer, - SurfaceControl.Transaction(), - Choreographer.getInstance() + SurfaceControl.Transaction() ) { private val postCommitInterpolator = Interpolators.EMPHASIZED diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java index e36f6e6c04c5..fca8a625811c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java @@ -1230,10 +1230,14 @@ public class BubbleController implements ConfigurationChangeListener, * A bubble was dragged and is released in dismiss target in Launcher. * * @param bubbleKey key of the bubble being dragged to dismiss target + * @param timestamp the timestamp of the removal */ - public void dragBubbleToDismiss(String bubbleKey) { + public void dragBubbleToDismiss(String bubbleKey, long timestamp) { String selectedBubbleKey = mBubbleData.getSelectedBubbleKey(); - removeBubble(bubbleKey, Bubbles.DISMISS_USER_GESTURE); + if (mBubbleData.hasAnyBubbleWithKey(bubbleKey)) { + mBubbleData.dismissBubbleWithKey( + bubbleKey, Bubbles.DISMISS_USER_GESTURE_FROM_LAUNCHER, timestamp); + } if (selectedBubbleKey != null && !selectedBubbleKey.equals(bubbleKey)) { // We did not remove the selected bubble. Expand it again mBubbleBarViewCallback.expansionChanged(/* isExpanded = */ true); @@ -2458,8 +2462,8 @@ public class BubbleController implements ConfigurationChangeListener, } @Override - public void dragBubbleToDismiss(String key) { - mMainExecutor.execute(() -> mController.dragBubbleToDismiss(key)); + public void dragBubbleToDismiss(String key, long timestamp) { + mMainExecutor.execute(() -> mController.dragBubbleToDismiss(key, timestamp)); } @Override diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java index 4e6c517b9194..434b512a585c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java @@ -150,8 +150,11 @@ public class BubbleData { : null; for (int i = 0; i < removedBubbles.size(); i++) { Pair<Bubble, Integer> pair = removedBubbles.get(i); - bubbleBarUpdate.removedBubbles.add( - new RemovedBubble(pair.first.getKey(), pair.second)); + // if the removal happened in launcher, don't send it back + if (pair.second != Bubbles.DISMISS_USER_GESTURE_FROM_LAUNCHER) { + bubbleBarUpdate.removedBubbles.add( + new RemovedBubble(pair.first.getKey(), pair.second)); + } } if (orderChanged) { // Include the new order @@ -502,12 +505,34 @@ public class BubbleData { dispatchPendingChanges(); } + /** Dismisses the bubble with the matching key, if it exists. */ + public void dismissBubbleWithKey(String key, @DismissReason int reason) { + dismissBubbleWithKey(key, reason, mTimeSource.currentTimeMillis()); + } + /** * Dismisses the bubble with the matching key, if it exists. + * + * <p>This is used when the bubble was dismissed in launcher, where the {@code removalTimestamp} + * represents when the removal happened and can be used to check whether or not the bubble has + * been updated after the removal. If no updates, it's safe to remove the bubble, otherwise the + * removal is ignored. */ - public void dismissBubbleWithKey(String key, @DismissReason int reason) { - doRemove(key, reason); - dispatchPendingChanges(); + public void dismissBubbleWithKey(String key, @DismissReason int reason, long removalTimestamp) { + boolean shouldRemove = true; + // if the bubble was removed from launcher, verify that the removal happened after the last + // time it was updated + if (reason == Bubbles.DISMISS_USER_GESTURE_FROM_LAUNCHER) { + // if the bubble was removed from launcher it must be active. + Bubble bubble = getBubbleInStackWithKey(key); + if (bubble != null && bubble.getLastActivity() > removalTimestamp) { + shouldRemove = false; + } + } + if (shouldRemove) { + doRemove(key, reason); + dispatchPendingChanges(); + } } /** diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubbles.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubbles.java index 82af88d03b19..589dfd24624e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubbles.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubbles.java @@ -62,7 +62,7 @@ public interface Bubbles { DISMISS_USER_CHANGED, DISMISS_GROUP_CANCELLED, DISMISS_INVALID_INTENT, DISMISS_OVERFLOW_MAX_REACHED, DISMISS_SHORTCUT_REMOVED, DISMISS_PACKAGE_REMOVED, DISMISS_NO_BUBBLE_UP, DISMISS_RELOAD_FROM_DISK, DISMISS_USER_ACCOUNT_REMOVED, - DISMISS_SWITCH_TO_STACK}) + DISMISS_SWITCH_TO_STACK, DISMISS_USER_GESTURE_FROM_LAUNCHER}) @Target({FIELD, LOCAL_VARIABLE, PARAMETER}) @interface DismissReason { } @@ -84,6 +84,7 @@ public interface Bubbles { int DISMISS_RELOAD_FROM_DISK = 15; int DISMISS_USER_ACCOUNT_REMOVED = 16; int DISMISS_SWITCH_TO_STACK = 17; + int DISMISS_USER_GESTURE_FROM_LAUNCHER = 18; /** Returns a binder that can be passed to an external process to manipulate Bubbles. */ default IBubbles createExternalInterface() { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/IBubbles.aidl b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/IBubbles.aidl index 1db556c04180..0907ddd1de83 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/IBubbles.aidl +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/IBubbles.aidl @@ -33,7 +33,7 @@ interface IBubbles { oneway void showBubble(in String key, in int topOnScreen) = 3; - oneway void dragBubbleToDismiss(in String key) = 4; + oneway void dragBubbleToDismiss(in String key, in long timestamp) = 4; oneway void removeAllBubbles() = 5; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/api/CompatUIRepository.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/api/CompatUIRepository.kt new file mode 100644 index 000000000000..cb54d89a5714 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/api/CompatUIRepository.kt @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.compatui.api + +/** + * Abstraction for the repository of all the available CompatUISpec + */ +interface CompatUIRepository { + /** + * Adds a {@link CompatUISpec} to the repository + * @throws IllegalStateException in case of illegal spec + */ + fun addSpec(spec: CompatUISpec) + + /** + * Iterates on the list of available {@link CompatUISpec} invoking + * fn for each of them. + */ + fun iterateOn(fn: (CompatUISpec) -> Unit) + + /** + * Returns the {@link CompatUISpec} for a given key + */ + fun findSpec(name: String): CompatUISpec? +}
\ No newline at end of file diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/api/CompatUISpec.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/api/CompatUISpec.kt new file mode 100644 index 000000000000..24c2c8c2aedf --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/api/CompatUISpec.kt @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.compatui.api + +/** + * Describes each compat ui component to the framework. + */ +data class CompatUISpec( + // Unique name for the component. It's used for debug and for generating the + // unique component identifier in the system. + val name: String +)
\ No newline at end of file diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/impl/DefaultCompatUIHandler.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/impl/DefaultCompatUIHandler.kt index a181eafada7d..8408ea6ebc31 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/impl/DefaultCompatUIHandler.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/impl/DefaultCompatUIHandler.kt @@ -19,12 +19,15 @@ package com.android.wm.shell.compatui.impl import com.android.wm.shell.compatui.api.CompatUIEvent import com.android.wm.shell.compatui.api.CompatUIHandler import com.android.wm.shell.compatui.api.CompatUIInfo +import com.android.wm.shell.compatui.api.CompatUIRepository import java.util.function.Consumer /** * Default implementation of {@link CompatUIHandler} to handle CompatUI components */ -class DefaultCompatUIHandler : CompatUIHandler { +class DefaultCompatUIHandler( + private val compatUIRepository: CompatUIRepository +) : CompatUIHandler { private var compatUIEventSender: Consumer<CompatUIEvent>? = null override fun onCompatInfoChanged(compatUIInfo: CompatUIInfo) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/impl/DefaultCompatUIRepository.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/impl/DefaultCompatUIRepository.kt new file mode 100644 index 000000000000..10d9425c85ea --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/impl/DefaultCompatUIRepository.kt @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.compatui.impl + +import com.android.wm.shell.compatui.api.CompatUIRepository +import com.android.wm.shell.compatui.api.CompatUISpec + +/** + * Default {@link CompatUIRepository} implementation + */ +class DefaultCompatUIRepository : CompatUIRepository { + + private val allSpecs = mutableMapOf<String, CompatUISpec>() + + override fun addSpec(spec: CompatUISpec) { + if (allSpecs[spec.name] != null) { + throw IllegalStateException("Spec with id:${spec.name} already present") + } + allSpecs[spec.name] = spec + } + + override fun iterateOn(fn: (CompatUISpec) -> Unit) = + allSpecs.values.forEach(fn) + + override fun findSpec(name: String): CompatUISpec? = + allSpecs[name] +}
\ No newline at end of file diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java index 9bdc0b2b55b4..4b548cbe77cc 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java @@ -72,7 +72,9 @@ import com.android.wm.shell.compatui.CompatUIConfiguration; import com.android.wm.shell.compatui.CompatUIController; import com.android.wm.shell.compatui.CompatUIShellCommandHandler; import com.android.wm.shell.compatui.api.CompatUIHandler; +import com.android.wm.shell.compatui.api.CompatUIRepository; import com.android.wm.shell.compatui.impl.DefaultCompatUIHandler; +import com.android.wm.shell.compatui.impl.DefaultCompatUIRepository; import com.android.wm.shell.desktopmode.DesktopMode; import com.android.wm.shell.desktopmode.DesktopModeTaskRepository; import com.android.wm.shell.desktopmode.DesktopTasksController; @@ -245,12 +247,13 @@ public abstract class WMShellBaseModule { Lazy<DockStateReader> dockStateReader, Lazy<CompatUIConfiguration> compatUIConfiguration, Lazy<CompatUIShellCommandHandler> compatUIShellCommandHandler, - Lazy<AccessibilityManager> accessibilityManager) { + Lazy<AccessibilityManager> accessibilityManager, + CompatUIRepository compatUIRepository) { if (!context.getResources().getBoolean(R.bool.config_enableCompatUIController)) { return Optional.empty(); } if (Flags.appCompatUiFramework()) { - return Optional.of(new DefaultCompatUIHandler()); + return Optional.of(new DefaultCompatUIHandler(compatUIRepository)); } return Optional.of( new CompatUIController( @@ -271,6 +274,12 @@ public abstract class WMShellBaseModule { @WMSingleton @Provides + static CompatUIRepository provideCompatUIRepository() { + return new DefaultCompatUIRepository(); + } + + @WMSingleton + @Provides static SyncTransactionQueue provideSyncTransactionQueue(TransactionPool pool, @ShellMainThread ShellExecutor mainExecutor) { return new SyncTransactionQueue(pool, mainExecutor); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java index 45feff5b0ccc..e713af6a5311 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java @@ -573,8 +573,9 @@ public abstract class WMShellModule { @Provides static EnterDesktopTaskTransitionHandler provideEnterDesktopModeTaskTransitionHandler( Transitions transitions, - Optional<DesktopTasksLimiter> desktopTasksLimiter) { - return new EnterDesktopTaskTransitionHandler(transitions); + Optional<DesktopTasksLimiter> desktopTasksLimiter, + InteractionJankMonitor interactionJankMonitor) { + return new EnterDesktopTaskTransitionHandler(transitions, interactionJankMonitor); } @WMSingleton diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepository.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepository.kt index ca0586418041..247cc42e51ed 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepository.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepository.kt @@ -88,14 +88,17 @@ class DesktopModeTaskRepository { /** Add a [VisibleTasksListener] to be notified when freeform tasks are visible or not. */ fun addVisibleTasksListener(visibleTasksListener: VisibleTasksListener, executor: Executor) { visibleTasksListeners[visibleTasksListener] = executor - displayData.keyIterator().forEach { displayId -> - val visibleTasksCount = getVisibleTaskCount(displayId) + displayData.keyIterator().forEach { executor.execute { - visibleTasksListener.onTasksVisibilityChanged(displayId, visibleTasksCount) + visibleTasksListener.onTasksVisibilityChanged(it, visibleTaskCount(it)) } } } + /** Returns a list of all [DisplayData]. */ + private fun displayDataList(): Sequence<DisplayData> = + displayData.valueIterator().asSequence() + /** * Add a Consumer which will inform other classes of changes to exclusion regions for all * Desktop tasks. @@ -208,37 +211,17 @@ class DesktopModeTaskRepository { return removed } - /** Check if a task with the given [taskId] was marked as an active task */ - fun isActiveTask(taskId: Int): Boolean { - return displayData.valueIterator().asSequence().any { data -> - data.activeTasks.contains(taskId) - } - } - - /** Check if a task with the given [taskId] was marked as a closing task */ - fun isClosingTask(taskId: Int): Boolean = - displayData.valueIterator().asSequence().any { data -> taskId in data.closingTasks } - - /** Whether a task is visible. */ - fun isVisibleTask(taskId: Int): Boolean { - return displayData.valueIterator().asSequence().any { data -> - data.visibleTasks.contains(taskId) - } - } - - /** Return whether the given Task is minimized. */ - fun isMinimizedTask(taskId: Int): Boolean { - return displayData.valueIterator().asSequence().any { data -> - data.minimizedTasks.contains(taskId) - } - } + fun isActiveTask(taskId: Int) = displayDataList().any { taskId in it.activeTasks } + fun isClosingTask(taskId: Int) = displayDataList().any { taskId in it.closingTasks } + fun isVisibleTask(taskId: Int) = displayDataList().any { taskId in it.visibleTasks } + fun isMinimizedTask(taskId: Int) = displayDataList().any { taskId in it.minimizedTasks } /** * Check if a task with the given [taskId] is the only visible, non-closing, not-minimized task * on its display */ fun isOnlyVisibleNonClosingTask(taskId: Int): Boolean = - displayData.valueIterator().asSequence().any { data -> + displayDataList().any { data -> data.visibleTasks .subtract(data.closingTasks) .subtract(data.minimizedTasks) @@ -255,12 +238,6 @@ class DesktopModeTaskRepository { ArraySet(displayData[displayId]?.minimizedTasks) /** - * Returns whether Desktop Mode is currently showing any tasks, i.e. whether any Desktop Tasks - * are visible. - */ - fun isDesktopModeShowing(displayId: Int): Boolean = getVisibleTaskCount(displayId) > 0 - - /** * Returns a list of Tasks IDs representing all active non-minimized Tasks on the given display, * ordered from front to back. */ @@ -305,14 +282,14 @@ class DesktopModeTaskRepository { return } - val prevCount = getVisibleTaskCount(displayId) + val prevCount = visibleTaskCount(displayId) if (visible) { displayData.getOrCreate(displayId).visibleTasks.add(taskId) unminimizeTask(displayId, taskId) } else { displayData[displayId]?.visibleTasks?.remove(taskId) } - val newCount = getVisibleTaskCount(displayId) + val newCount = visibleTaskCount(displayId) // Check if count changed if (prevCount != newCount) { @@ -340,7 +317,7 @@ class DesktopModeTaskRepository { } /** Get number of tasks that are marked as visible on given [displayId] */ - fun getVisibleTaskCount(displayId: Int): Int { + fun visibleTaskCount(displayId: Int): Int { ProtoLog.d( WM_SHELL_DESKTOP_MODE, "DesktopTaskRepo: visibleTaskCount= %d", diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt index 580724666949..9e6099f2e4cc 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt @@ -246,10 +246,12 @@ class DesktopTasksController( } } - /** Get number of tasks that are marked as visible */ - fun getVisibleTaskCount(displayId: Int): Int { - return desktopModeTaskRepository.getVisibleTaskCount(displayId) - } + /** Gets number of visible tasks in [displayId]. */ + fun visibleTaskCount(displayId: Int): Int = + desktopModeTaskRepository.visibleTaskCount(displayId) + + /** Returns true if any tasks are visible in Desktop Mode. */ + fun isDesktopModeShowing(displayId: Int): Boolean = visibleTaskCount(displayId) > 0 /** Enter desktop by using the focused task in given `displayId` */ fun moveFocusedTaskToDesktop(displayId: Int, transitionSource: DesktopModeTransitionSource) { @@ -981,19 +983,25 @@ class DesktopTasksController( ProtoLog.v(WM_SHELL_DESKTOP_MODE, "DesktopTasksController: skip keyguard is locked") return null } - if (!desktopModeTaskRepository.isDesktopModeShowing(task.displayId)) { + val wct = WindowContainerTransaction() + if (!isDesktopModeShowing(task.displayId)) { ProtoLog.d( WM_SHELL_DESKTOP_MODE, "DesktopTasksController: bring desktop tasks to front on transition" + " taskId=%d", task.taskId ) - return WindowContainerTransaction().also { wct -> - bringDesktopAppsToFrontBeforeShowingNewTask(task.displayId, wct, task.taskId) - wct.reorder(task.token, true) + // We are outside of desktop mode and already existing desktop task is being launched. + // We should make this task go to fullscreen instead of freeform. Note that this means + // any re-launch of a freeform window outside of desktop will be in fullscreen. + if (desktopModeTaskRepository.isActiveTask(task.taskId)) { + addMoveToFullscreenChanges(wct, task) + return wct } + bringDesktopAppsToFrontBeforeShowingNewTask(task.displayId, wct, task.taskId) + wct.reorder(task.token, true) + return wct } - val wct = WindowContainerTransaction() if (useDesktopOverrideDensity()) { wct.setDensityDpi(task.token, DESKTOP_DENSITY_OVERRIDE) } @@ -1012,7 +1020,7 @@ class DesktopTasksController( transition: IBinder ): WindowContainerTransaction? { ProtoLog.v(WM_SHELL_DESKTOP_MODE, "DesktopTasksController: handleFullscreenTaskLaunch") - if (desktopModeTaskRepository.isDesktopModeShowing(task.displayId)) { + if (isDesktopModeShowing(task.displayId)) { ProtoLog.d( WM_SHELL_DESKTOP_MODE, "DesktopTasksController: switch fullscreen task to freeform on transition" + @@ -1045,14 +1053,12 @@ class DesktopTasksController( /** Handle task closing by removing wallpaper activity if it's the last active task */ private fun handleTaskClosing(task: RunningTaskInfo): WindowContainerTransaction? { - val wct = if ( - desktopModeTaskRepository.isOnlyVisibleNonClosingTask(task.taskId) && - desktopModeTaskRepository.wallpaperActivityToken != null - ) { + ProtoLog.v(WM_SHELL_DESKTOP_MODE, "DesktopTasksController: handleTaskClosing") + val wct = WindowContainerTransaction() + if (desktopModeTaskRepository.isOnlyVisibleNonClosingTask(task.taskId) + && desktopModeTaskRepository.wallpaperActivityToken != null) { // Remove wallpaper activity when the last active task is removed - WindowContainerTransaction().also { wct -> removeWallpaperActivity(wct) } - } else { - null + removeWallpaperActivity(wct) } if (!desktopModeTaskRepository.addClosingTask(task.displayId, task.taskId)) { // Could happen if the task hasn't been removed from closing list after it disappeared @@ -1062,7 +1068,12 @@ class DesktopTasksController( task.taskId ) } - return wct + // If a CLOSE or TO_BACK is triggered on a desktop task, remove the task. + if (Flags.enableDesktopWindowingBackNavigation() && + desktopModeTaskRepository.isVisibleTask(task.taskId)) { + wct.removeTask(task.token) + } + return if (wct.isEmpty) null else wct } private fun addMoveToDesktopChanges( @@ -1393,8 +1404,7 @@ class DesktopTasksController( onFinishCallback: Consumer<Boolean> ): Boolean { // TODO(b/320797628): Pass through which display we are dropping onto - val activeTasks = desktopModeTaskRepository.getActiveTasks(DEFAULT_DISPLAY) - if (!activeTasks.any { desktopModeTaskRepository.isVisibleTask(it) }) { + if (!isDesktopModeShowing(DEFAULT_DISPLAY)) { // Not currently in desktop mode, ignore the drop return false } @@ -1553,8 +1563,8 @@ class DesktopTasksController( val result = IntArray(1) executeRemoteCallWithTaskPermission( controller, - "getVisibleTaskCount", - { controller -> result[0] = controller.getVisibleTaskCount(displayId) }, + "visibleTaskCount", + { controller -> result[0] = controller.visibleTaskCount(displayId) }, true /* blocking */ ) return result[0] diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/EnterDesktopTaskTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/EnterDesktopTaskTransitionHandler.java index e5b624f91c54..04506c1e66f2 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/EnterDesktopTaskTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/EnterDesktopTaskTransitionHandler.java @@ -18,6 +18,7 @@ package com.android.wm.shell.desktopmode; import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; +import static com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_ENTER_MODE_APP_HANDLE_MENU; import static com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.getEnterTransitionType; import static com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.isEnterDesktopModeTransition; @@ -39,6 +40,7 @@ import android.window.WindowContainerTransaction; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.android.internal.jank.InteractionJankMonitor; import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource; import com.android.wm.shell.transition.Transitions; import com.android.wm.shell.windowdecor.OnTaskResizeAnimationListener; @@ -60,18 +62,21 @@ public class EnterDesktopTaskTransitionHandler implements Transitions.Transition public static final int FREEFORM_ANIMATION_DURATION = 336; private final List<IBinder> mPendingTransitionTokens = new ArrayList<>(); + private final InteractionJankMonitor mInteractionJankMonitor; private OnTaskResizeAnimationListener mOnTaskResizeAnimationListener; public EnterDesktopTaskTransitionHandler( - Transitions transitions) { - this(transitions, SurfaceControl.Transaction::new); + Transitions transitions, InteractionJankMonitor interactionJankMonitor) { + this(transitions, interactionJankMonitor, SurfaceControl.Transaction::new); } public EnterDesktopTaskTransitionHandler( Transitions transitions, + InteractionJankMonitor interactionJankMonitor, Supplier<SurfaceControl.Transaction> supplier) { mTransitions = transitions; + mInteractionJankMonitor = interactionJankMonitor; mTransactionSupplier = supplier; } @@ -175,6 +180,7 @@ public class EnterDesktopTaskTransitionHandler implements Transitions.Transition mOnTaskResizeAnimationListener.onAnimationEnd(taskInfo.taskId); mTransitions.getMainExecutor().execute( () -> finishCallback.onTransitionFinished(null)); + mInteractionJankMonitor.end(CUJ_DESKTOP_MODE_ENTER_MODE_APP_HANDLE_MENU); } }); animator.start(); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java index ff40d4c6e231..8d63ff2a3a5d 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java @@ -1980,12 +1980,6 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, } clearContentOverlay(); } - if (mPipTransitionState.getTransitionState() == PipTransitionState.UNDEFINED) { - // Avoid double removal, which is fatal. - ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, - "%s: trying to remove overlay (%s) while in UNDEFINED state", TAG, surface); - return; - } if (surface == null || !surface.isValid()) { ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, "%s: trying to remove invalid content overlay (%s)", TAG, surface); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java index 41042344fd3a..9bcd9b0a11c8 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java @@ -3573,7 +3573,8 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, pw.println(innerPrefix + "mDividerVisible=" + mDividerVisible); pw.println(innerPrefix + "isSplitActive=" + isSplitActive()); pw.println(innerPrefix + "isSplitVisible=" + isSplitScreenVisible()); - pw.println(innerPrefix + "isLeftRightSplit=" + mSplitLayout.isLeftRightSplit()); + pw.println(innerPrefix + "isLeftRightSplit=" + + (mSplitLayout != null ? mSplitLayout.isLeftRightSplit() : "null")); pw.println(innerPrefix + "MainStage"); pw.println(childPrefix + "stagePosition=" + splitPositionToString(getMainStagePosition())); pw.println(childPrefix + "isActive=" + mMainStage.isActive()); @@ -3585,7 +3586,9 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, mSideStage.dump(pw, childPrefix); pw.println(innerPrefix + "SideStageListener"); mSideStageListener.dump(pw, childPrefix); - mSplitLayout.dump(pw, childPrefix); + if (mSplitLayout != null) { + mSplitLayout.dump(pw, childPrefix); + } if (!mPausingTasks.isEmpty()) { pw.println(childPrefix + "mPausingTasks=" + mPausingTasks); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java index 4f4b8097cfac..766a6b3f48ac 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java @@ -353,7 +353,7 @@ public class DefaultMixedHandler implements MixedTransitionHandler, return this::setRecentsTransitionDuringKeyguard; } else if (mDesktopTasksController != null // Check on the default display. Recents/gesture nav is only available there - && mDesktopTasksController.getVisibleTaskCount(DEFAULT_DISPLAY) > 0) { + && mDesktopTasksController.visibleTaskCount(DEFAULT_DISPLAY) > 0) { return this::setRecentsTransitionDuringDesktop; } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java index 8d53bebba7bb..fc8b1d27ad02 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java @@ -79,7 +79,6 @@ import androidx.annotation.BinderThread; import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.protolog.ProtoLog; -import com.android.window.flags.Flags; import com.android.wm.shell.RootTaskDisplayAreaOrganizer; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.DisplayController; @@ -582,14 +581,6 @@ public class Transitions implements RemoteCallable<Transitions>, final boolean isOpening = isOpeningType(transitType); final boolean isClosing = isClosingType(transitType); final int mode = change.getMode(); - // Ensure wallpapers stay in the back - if (change.hasFlags(FLAG_IS_WALLPAPER) && Flags.ensureWallpaperInTransitions()) { - if (mode == TRANSIT_OPEN || mode == TRANSIT_TO_FRONT) { - return -zSplitLine + numChanges - i; - } else { - return -zSplitLine - i; - } - } // Put all the OPEN/SHOW on top if (mode == TRANSIT_OPEN || mode == TRANSIT_TO_FRONT) { if (isOpening) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java index d12b9060bee3..53976251e31d 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java @@ -31,6 +31,7 @@ import static android.view.MotionEvent.ACTION_MOVE; import static android.view.MotionEvent.ACTION_UP; import static android.view.WindowInsets.Type.statusBars; +import static com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_ENTER_MODE_APP_HANDLE_MENU; import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT; import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT; import static com.android.wm.shell.compatui.AppCompatUtils.isTopActivityExemptFromDesktopWindowing; @@ -499,6 +500,8 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { final WindowContainerTransaction wct = new WindowContainerTransaction(); // App sometimes draws before the insets from WindowDecoration#relayout have // been added, so they must be added here + mInteractionJankMonitor.begin(decoration.mTaskSurface, mContext, + CUJ_DESKTOP_MODE_ENTER_MODE_APP_HANDLE_MENU); mWindowDecorByTaskId.get(mTaskId).addCaptionInset(wct); mDesktopTasksController.moveToDesktop(mTaskId, wct, DesktopModeTransitionSource.APP_HANDLE_MENU_BUTTON); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositioner.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositioner.java index 153221150992..b5b476d90d0e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositioner.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/VeiledResizeTaskPositioner.java @@ -18,6 +18,7 @@ package com.android.wm.shell.windowdecor; import static android.view.WindowManager.TRANSIT_CHANGE; +import static com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_DRAG_WINDOW; import static com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_RESIZE_WINDOW; import android.graphics.Point; @@ -103,6 +104,9 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback, wct.reorder(mDesktopWindowDecoration.mTaskInfo.token, true); mTaskOrganizer.applyTransaction(wct); } + } else { + mInteractionJankMonitor.begin(mDesktopWindowDecoration.mTaskSurface, + mDesktopWindowDecoration.mContext, CUJ_DESKTOP_MODE_DRAG_WINDOW); } mDragStartListener.onDragStart(mDesktopWindowDecoration.mTaskInfo.taskId); mRepositionTaskBounds.set(mTaskBoundsAtDragStart); @@ -157,11 +161,16 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback, } mInteractionJankMonitor.end(CUJ_DESKTOP_MODE_RESIZE_WINDOW); } else { - final WindowContainerTransaction wct = new WindowContainerTransaction(); DragPositioningCallbackUtility.updateTaskBounds(mRepositionTaskBounds, mTaskBoundsAtDragStart, mRepositionStartPoint, x, y); - wct.setBounds(mDesktopWindowDecoration.mTaskInfo.token, mRepositionTaskBounds); - mTransitions.startTransition(TRANSIT_CHANGE, wct, this); + if (!mTaskBoundsAtDragStart.equals(mRepositionTaskBounds)) { + final WindowContainerTransaction wct = new WindowContainerTransaction(); + wct.setBounds(mDesktopWindowDecoration.mTaskInfo.token, mRepositionTaskBounds); + mTransitions.startTransition(TRANSIT_CHANGE, wct, this); + } else { + // Drag-move ended where it originally started, no need to update WM. + mInteractionJankMonitor.end(CUJ_DESKTOP_MODE_DRAG_WINDOW); + } } mCtrlType = CTRL_TYPE_UNDEFINED; @@ -202,6 +211,7 @@ public class VeiledResizeTaskPositioner implements DragPositioningCallback, mCtrlType = CTRL_TYPE_UNDEFINED; finishCallback.onTransitionFinished(null); mIsResizingOrAnimatingResize = false; + mInteractionJankMonitor.end(CUJ_DESKTOP_MODE_DRAG_WINDOW); return true; } diff --git a/libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/DragAppWindowMultiWindow.kt b/libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/DragAppWindowMultiWindow.kt new file mode 100644 index 000000000000..bbf0ce5f8165 --- /dev/null +++ b/libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/DragAppWindowMultiWindow.kt @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.flicker.service.desktopmode.scenarios + +import com.android.server.wm.flicker.helpers.DesktopModeAppHelper +import com.android.server.wm.flicker.helpers.ImeAppHelper +import com.android.server.wm.flicker.helpers.MailAppHelper +import com.android.server.wm.flicker.helpers.NewTasksAppHelper +import com.android.server.wm.flicker.helpers.SimpleAppHelper +import com.android.window.flags.Flags +import org.junit.After +import org.junit.Assume +import org.junit.Before +import org.junit.Ignore +import org.junit.Test + +/** Base scenario test for window drag CUJ with multiple windows. */ +@Ignore("Base Test Class") +abstract class DragAppWindowMultiWindow : DragAppWindowScenarioTestBase() +{ + private val imeAppHelper = ImeAppHelper(instrumentation) + private val testApp = DesktopModeAppHelper(SimpleAppHelper(instrumentation)) + private val mailApp = DesktopModeAppHelper(MailAppHelper(instrumentation)) + private val newTasksApp = DesktopModeAppHelper(NewTasksAppHelper(instrumentation)) + private val imeApp = DesktopModeAppHelper(ImeAppHelper(instrumentation)) + + @Before + fun setup() { + Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet) + testApp.enterDesktopWithDrag(wmHelper, device) + mailApp.launchViaIntent(wmHelper) + newTasksApp.launchViaIntent(wmHelper) + imeApp.launchViaIntent(wmHelper) + } + + @Test + override fun dragAppWindow() { + val (startXIme, startYIme) = getWindowDragStartCoordinate(imeAppHelper) + + imeApp.dragWindow(startXIme, startYIme, + endX = startXIme + 150, endY = startYIme + 150, + wmHelper, device) + } + + @After + fun teardown() { + testApp.exit(wmHelper) + mailApp.exit(wmHelper) + newTasksApp.exit(wmHelper) + imeApp.exit(wmHelper) + } +} diff --git a/libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/DragAppWindowScenarioTestBase.kt b/libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/DragAppWindowScenarioTestBase.kt new file mode 100644 index 000000000000..a613ca1660ea --- /dev/null +++ b/libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/DragAppWindowScenarioTestBase.kt @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.flicker.service.desktopmode.scenarios + +import android.app.Instrumentation +import android.tools.NavBar +import android.tools.Rotation +import android.tools.device.apphelpers.StandardAppHelper +import android.tools.traces.parsers.WindowManagerStateHelper +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.uiautomator.UiDevice +import com.android.launcher3.tapl.LauncherInstrumentation +import com.android.wm.shell.flicker.service.common.Utils +import org.junit.Ignore +import org.junit.Rule +import org.junit.Test + +/** Base test class for window drag CUJ. */ +@Ignore("Base Test Class") +abstract class DragAppWindowScenarioTestBase { + + val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation() + val tapl = LauncherInstrumentation() + val wmHelper = WindowManagerStateHelper(instrumentation) + val device = UiDevice.getInstance(instrumentation) + + @Rule + @JvmField + val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, Rotation.ROTATION_0) + + @Test abstract fun dragAppWindow() + + /** Return the top-center coordinate of the app header as the start coordinate. */ + fun getWindowDragStartCoordinate(appHelper: StandardAppHelper): Pair<Int, Int> { + val windowRect = wmHelper.getWindowRegion(appHelper).bounds + // Set start x-coordinate as center of app header. + val startX = windowRect.centerX() + val startY = windowRect.top + return Pair(startX, startY) + } +} diff --git a/libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/DragAppWindowSingleWindow.kt b/libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/DragAppWindowSingleWindow.kt new file mode 100644 index 000000000000..0655620d58b7 --- /dev/null +++ b/libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/DragAppWindowSingleWindow.kt @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.flicker.service.desktopmode.scenarios + +import com.android.server.wm.flicker.helpers.DesktopModeAppHelper +import com.android.server.wm.flicker.helpers.SimpleAppHelper +import com.android.window.flags.Flags +import org.junit.After +import org.junit.Assume +import org.junit.Before +import org.junit.Ignore +import org.junit.Test + +/** Base scenario test for window drag CUJ with single window. */ +@Ignore("Base Test Class") +abstract class DragAppWindowSingleWindow : DragAppWindowScenarioTestBase() +{ + private val simpleAppHelper = SimpleAppHelper(instrumentation) + private val testApp = DesktopModeAppHelper(simpleAppHelper) + + @Before + fun setup() { + Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet) + testApp.enterDesktopWithDrag(wmHelper, device) + } + + @Test + override fun dragAppWindow() { + val (startXTest, startYTest) = getWindowDragStartCoordinate(simpleAppHelper) + testApp.dragWindow(startXTest, startYTest, + endX = startXTest + 150, endY = startYTest + 150, + wmHelper, device) + } + + @After + fun teardown() { + testApp.exit(wmHelper) + } +} diff --git a/libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/EnterDesktopWithAppHandleMenu.kt b/libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/EnterDesktopWithAppHandleMenu.kt new file mode 100644 index 000000000000..47a215a97c00 --- /dev/null +++ b/libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/EnterDesktopWithAppHandleMenu.kt @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.flicker.service.desktopmode.scenarios + +import android.app.Instrumentation +import android.tools.traces.parsers.WindowManagerStateHelper +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.uiautomator.UiDevice +import com.android.launcher3.tapl.LauncherInstrumentation +import com.android.server.wm.flicker.helpers.DesktopModeAppHelper +import com.android.server.wm.flicker.helpers.SimpleAppHelper +import com.android.window.flags.Flags +import org.junit.After +import org.junit.Assume +import org.junit.Before +import org.junit.Ignore +import org.junit.Test + +/** Base test class for enter desktop with app handle menu CUJ. */ +@Ignore("Base Test Class") +abstract class EnterDesktopWithAppHandleMenu { + + private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation() + private val tapl = LauncherInstrumentation() + private val wmHelper = WindowManagerStateHelper(instrumentation) + private val device = UiDevice.getInstance(instrumentation) + private val simpleAppHelper = SimpleAppHelper(instrumentation) + private val testApp = DesktopModeAppHelper(simpleAppHelper) + + @Before + fun setup() { + Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet) + } + + @Test + open fun enterDesktopWithAppHandleMenu() { + simpleAppHelper.launchViaIntent(wmHelper) + testApp.enterDesktopModeFromAppHandleMenu(wmHelper, device) + } + + @After + fun teardown() { + testApp.exit(wmHelper) + } +} diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/CustomCrossActivityBackAnimationTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/CustomCrossActivityBackAnimationTest.kt index 8bf011192347..080ad901c656 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/CustomCrossActivityBackAnimationTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/CustomCrossActivityBackAnimationTest.kt @@ -25,7 +25,6 @@ import android.graphics.Rect import android.os.RemoteException import android.testing.AndroidTestingRunner import android.testing.TestableLooper -import android.view.Choreographer import android.view.RemoteAnimationTarget import android.view.SurfaceControl import android.view.SurfaceControl.Transaction @@ -37,8 +36,6 @@ import androidx.test.filters.SmallTest import com.android.internal.policy.TransitionAnimation import com.android.wm.shell.RootTaskDisplayAreaOrganizer import com.android.wm.shell.ShellTestCase -import java.util.concurrent.CountDownLatch -import java.util.concurrent.TimeUnit import junit.framework.TestCase.assertEquals import org.junit.Assert import org.junit.Before @@ -50,12 +47,13 @@ import org.mockito.ArgumentMatchers.anyFloat import org.mockito.ArgumentMatchers.anyInt import org.mockito.ArgumentMatchers.eq import org.mockito.Mock -import org.mockito.Mockito.mock import org.mockito.Mockito.never import org.mockito.Mockito.times import org.mockito.kotlin.spy import org.mockito.kotlin.verify import org.mockito.kotlin.whenever +import java.util.concurrent.CountDownLatch +import java.util.concurrent.TimeUnit @SmallTest @TestableLooper.RunWithLooper @@ -82,7 +80,6 @@ class CustomCrossActivityBackAnimationTest : ShellTestCase() { backAnimationBackground, rootTaskDisplayAreaOrganizer, transaction, - mock(Choreographer::class.java), customAnimationLoader ) diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleDataTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleDataTest.java index 93e405131a58..c138a2498d35 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleDataTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleDataTest.java @@ -27,6 +27,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; @@ -255,6 +256,45 @@ public class BubbleDataTest extends ShellTestCase { } @Test + public void testRemoveBubbleInLauncher_beforeBubbleUpdate_processedAfter_shouldNotBeRemoved() { + sendUpdatedEntryAtTime(mEntryA1, 1000); + sendUpdatedEntryAtTime(mEntryA2, 2000); + mBubbleData.setListener(mListener); + + sendUpdatedEntryAtTime(mEntryA2, 3000); + + verifyUpdateReceived(); + assertThat(mBubbleData.hasBubbleInStackWithKey(mEntryA2.getKey())).isTrue(); + assertThat(mBubbleData.getBubbleInStackWithKey(mEntryA2.getKey()).getLastActivity()) + .isEqualTo(3000); + + // dismiss the bubble with a timestamp in the past + mBubbleData.dismissBubbleWithKey( + mEntryA2.getKey(), Bubbles.DISMISS_USER_GESTURE_FROM_LAUNCHER, 2500); + + verifyNoMoreInteractions(mListener); + assertThat(mBubbleData.hasBubbleInStackWithKey(mEntryA2.getKey())).isTrue(); + } + + @Test + public void testRemoveBubbleInLauncher_isNotSentBackToLauncher() { + sendUpdatedEntryAtTime(mEntryA1, 1000); + sendUpdatedEntryAtTime(mEntryA2, 2000); + mBubbleData.setListener(mListener); + + mBubbleData.dismissBubbleWithKey( + mEntryA2.getKey(), Bubbles.DISMISS_USER_GESTURE_FROM_LAUNCHER, 4000); + verifyUpdateReceived(); + + BubbleData.Update update = mUpdateCaptor.getValue(); + assertThat(update.removedBubbles).hasSize(1); + assertThat(update.removedBubbles.getFirst().first.getKey()).isEqualTo(mBubbleA2.getKey()); + + BubbleBarUpdate bubbleBarUpdate = update.toBubbleBarUpdate(); + assertThat(bubbleBarUpdate.removedBubbles).isEmpty(); + } + + @Test public void ifSuppress_hideFlyout() { // Setup mBubbleData.setListener(mListener); @@ -1415,15 +1455,13 @@ public class BubbleDataTest extends ShellTestCase { sendUpdatedEntryAtTime(entry, postTime, true /* isTextChanged */); } - private void sendUpdatedEntryAtTime(BubbleEntry entry, long postTime, - boolean textChanged) { + private void sendUpdatedEntryAtTime(BubbleEntry entry, long postTime, boolean textChanged) { setPostTime(entry, postTime); // BubbleController calls this: Bubble b = mBubbleData.getOrCreateBubble(entry, null /* persistedBubble */); b.setTextChangedForTest(textChanged); // And then this - mBubbleData.notificationEntryUpdated(b, false /* suppressFlyout*/, - true /* showInShade */); + mBubbleData.notificationEntryUpdated(b, false /* suppressFlyout*/, true /* showInShade */); } private void changeExpandedStateAtTime(boolean shouldBeExpanded, long time) { diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/impl/DefaultCompatUIRepositoryTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/impl/DefaultCompatUIRepositoryTest.kt new file mode 100644 index 000000000000..1a86cfd6b69e --- /dev/null +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/impl/DefaultCompatUIRepositoryTest.kt @@ -0,0 +1,89 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.compatui.impl + +import android.platform.test.flag.junit.DeviceFlagsValueProvider +import android.testing.AndroidTestingRunner +import androidx.test.filters.SmallTest +import com.android.wm.shell.compatui.api.CompatUIRepository +import com.android.wm.shell.compatui.api.CompatUISpec +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +/** + * Tests for {@link DefaultCompatUIRepository}. + * + * Build/Install/Run: + * atest WMShellUnitTests:DefaultCompatUIRepositoryTest + */ +@RunWith(AndroidTestingRunner::class) +@SmallTest +class DefaultCompatUIRepositoryTest { + + lateinit var repository: CompatUIRepository + + @get:Rule + val mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule() + + @Before + fun setUp() { + repository = DefaultCompatUIRepository() + } + + @Test(expected = IllegalStateException::class) + fun `addSpec throws exception with specs with duplicate id`() { + repository.addSpec(CompatUISpec("one")) + repository.addSpec(CompatUISpec("one")) + } + + @Test + fun `iterateOn invokes the consumer`() { + with(repository) { + addSpec(CompatUISpec("one")) + addSpec(CompatUISpec("two")) + addSpec(CompatUISpec("three")) + val consumer = object : (CompatUISpec) -> Unit { + var acc = "" + override fun invoke(spec: CompatUISpec) { + acc += spec.name + } + } + iterateOn(consumer) + assertEquals("onetwothree", consumer.acc) + } + } + + @Test + fun `findSpec returns existing specs`() { + with(repository) { + val one = CompatUISpec("one") + val two = CompatUISpec("two") + val three = CompatUISpec("three") + addSpec(one) + addSpec(two) + addSpec(three) + assertEquals(findSpec("one"), one) + assertEquals(findSpec("two"), two) + assertEquals(findSpec("three"), three) + assertNull(findSpec("abc")) + } + } +}
\ No newline at end of file diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/impl/FakeCompatUIRepository.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/impl/FakeCompatUIRepository.kt new file mode 100644 index 000000000000..cdc524aff09f --- /dev/null +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/impl/FakeCompatUIRepository.kt @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.compatui.impl + +import com.android.wm.shell.compatui.api.CompatUIRepository +import com.android.wm.shell.compatui.api.CompatUISpec + +/** + * Fake implementation for {@link CompatUIRepository} + */ +class FakeCompatUIRepository : CompatUIRepository { + val allSpecs = mutableMapOf<String, CompatUISpec>() + override fun addSpec(spec: CompatUISpec) { + if (findSpec(spec.name) != null) { + throw IllegalStateException("Spec with name:${spec.name} already present") + } + allSpecs[spec.name] = spec + } + + override fun iterateOn(fn: (CompatUISpec) -> Unit) = + allSpecs.values.forEach(fn) + + override fun findSpec(name: String): CompatUISpec? = + allSpecs[name] +}
\ No newline at end of file diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepositoryTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepositoryTest.kt index 6612aee0cd12..18b08bfb0f47 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepositoryTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepositoryTest.kt @@ -337,65 +337,65 @@ class DesktopModeTaskRepositoryTest : ShellTestCase() { } @Test - fun getVisibleTaskCount() { + fun visibleTaskCount_defaultDisplay_returnsCorrectCount() { // No tasks, count is 0 - assertThat(repo.getVisibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(0) + assertThat(repo.visibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(0) // New task increments count to 1 repo.updateVisibleFreeformTasks(DEFAULT_DISPLAY, taskId = 1, visible = true) - assertThat(repo.getVisibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(1) + assertThat(repo.visibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(1) // Visibility update to same task does not increase count repo.updateVisibleFreeformTasks(DEFAULT_DISPLAY, taskId = 1, visible = true) - assertThat(repo.getVisibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(1) + assertThat(repo.visibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(1) // Second task visible increments count repo.updateVisibleFreeformTasks(DEFAULT_DISPLAY, taskId = 2, visible = true) - assertThat(repo.getVisibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(2) + assertThat(repo.visibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(2) // Hiding a task decrements count repo.updateVisibleFreeformTasks(DEFAULT_DISPLAY, taskId = 1, visible = false) - assertThat(repo.getVisibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(1) + assertThat(repo.visibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(1) // Hiding all tasks leaves count at 0 repo.updateVisibleFreeformTasks(DEFAULT_DISPLAY, taskId = 2, visible = false) - assertThat(repo.getVisibleTaskCount(displayId = 9)).isEqualTo(0) + assertThat(repo.visibleTaskCount(displayId = 9)).isEqualTo(0) // Hiding a not existing task, count remains at 0 repo.updateVisibleFreeformTasks(DEFAULT_DISPLAY, taskId = 999, visible = false) - assertThat(repo.getVisibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(0) + assertThat(repo.visibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(0) } @Test - fun getVisibleTaskCount_multipleDisplays() { - assertThat(repo.getVisibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(0) - assertThat(repo.getVisibleTaskCount(SECOND_DISPLAY)).isEqualTo(0) + fun visibleTaskCount_multipleDisplays_returnsCorrectCount() { + assertThat(repo.visibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(0) + assertThat(repo.visibleTaskCount(SECOND_DISPLAY)).isEqualTo(0) // New task on default display increments count for that display only repo.updateVisibleFreeformTasks(DEFAULT_DISPLAY, taskId = 1, visible = true) - assertThat(repo.getVisibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(1) - assertThat(repo.getVisibleTaskCount(SECOND_DISPLAY)).isEqualTo(0) + assertThat(repo.visibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(1) + assertThat(repo.visibleTaskCount(SECOND_DISPLAY)).isEqualTo(0) // New task on secondary display, increments count for that display only repo.updateVisibleFreeformTasks(SECOND_DISPLAY, taskId = 2, visible = true) - assertThat(repo.getVisibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(1) - assertThat(repo.getVisibleTaskCount(SECOND_DISPLAY)).isEqualTo(1) + assertThat(repo.visibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(1) + assertThat(repo.visibleTaskCount(SECOND_DISPLAY)).isEqualTo(1) // Marking task visible on another display, updates counts for both displays repo.updateVisibleFreeformTasks(SECOND_DISPLAY, taskId = 1, visible = true) - assertThat(repo.getVisibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(0) - assertThat(repo.getVisibleTaskCount(SECOND_DISPLAY)).isEqualTo(2) + assertThat(repo.visibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(0) + assertThat(repo.visibleTaskCount(SECOND_DISPLAY)).isEqualTo(2) // Marking task that is on secondary display, hidden on default display, does not affect // secondary display repo.updateVisibleFreeformTasks(DEFAULT_DISPLAY, taskId = 1, visible = false) - assertThat(repo.getVisibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(0) - assertThat(repo.getVisibleTaskCount(SECOND_DISPLAY)).isEqualTo(2) + assertThat(repo.visibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(0) + assertThat(repo.visibleTaskCount(SECOND_DISPLAY)).isEqualTo(2) // Hiding a task on that display, decrements count repo.updateVisibleFreeformTasks(SECOND_DISPLAY, taskId = 1, visible = false) - assertThat(repo.getVisibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(0) - assertThat(repo.getVisibleTaskCount(SECOND_DISPLAY)).isEqualTo(1) + assertThat(repo.visibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(0) + assertThat(repo.visibleTaskCount(SECOND_DISPLAY)).isEqualTo(1) } @Test @@ -494,28 +494,6 @@ class DesktopModeTaskRepositoryTest : ShellTestCase() { } @Test - fun isDesktopModeShowing_noActiveTasks_returnsFalse() { - assertThat(repo.isDesktopModeShowing(displayId = 0)).isFalse() - } - - @Test - fun isDesktopModeShowing_noTasksVisible_returnsFalse() { - repo.addActiveTask(displayId = 0, taskId = 1) - repo.addActiveTask(displayId = 0, taskId = 2) - - assertThat(repo.isDesktopModeShowing(displayId = 0)).isFalse() - } - - @Test - fun isDesktopModeShowing_tasksActiveAndVisible_returnsTrue() { - repo.addActiveTask(displayId = 0, taskId = 1) - repo.addActiveTask(displayId = 0, taskId = 2) - repo.updateVisibleFreeformTasks(displayId = 0, taskId = 1, visible = true) - - assertThat(repo.isDesktopModeShowing(displayId = 0)).isTrue() - } - - @Test fun getActiveNonMinimizedTasksOrderedFrontToBack_returnsFreeformTasksInCorrectOrder() { repo.addActiveTask(displayId = DEFAULT_DISPLAY, taskId = 1) repo.addActiveTask(displayId = DEFAULT_DISPLAY, taskId = 2) diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt index 8558a77e4e7e..6002c21ccb24 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt @@ -20,7 +20,6 @@ import android.app.ActivityManager.RecentTaskInfo import android.app.ActivityManager.RunningTaskInfo import android.app.KeyguardManager import android.app.WindowConfiguration.ACTIVITY_TYPE_HOME -import com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE import android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD import android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM import android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN @@ -68,6 +67,7 @@ import com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession import com.android.dx.mockito.inline.extended.ExtendedMockito.never import com.android.dx.mockito.inline.extended.StaticMockitoSession import com.android.window.flags.Flags +import com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE import com.android.wm.shell.MockToken import com.android.wm.shell.RootTaskDisplayAreaOrganizer import com.android.wm.shell.ShellTaskOrganizer @@ -125,11 +125,11 @@ import org.mockito.Mockito.clearInvocations import org.mockito.Mockito.mock import org.mockito.Mockito.spy import org.mockito.Mockito.verify -import org.mockito.Mockito.`when` as whenever import org.mockito.kotlin.anyOrNull import org.mockito.kotlin.atLeastOnce import org.mockito.kotlin.capture import org.mockito.quality.Strictness +import org.mockito.Mockito.`when` as whenever /** * Test class for {@link DesktopTasksController} @@ -311,6 +311,31 @@ class DesktopTasksControllerTest : ShellTestCase() { } @Test + fun isDesktopModeShowing_noTasks_returnsFalse() { + assertThat(controller.isDesktopModeShowing(displayId = 0)).isFalse() + } + + @Test + fun isDesktopModeShowing_noTasksVisible_returnsFalse() { + val task1 = setUpFreeformTask() + val task2 = setUpFreeformTask() + markTaskHidden(task1) + markTaskHidden(task2) + + assertThat(controller.isDesktopModeShowing(displayId = 0)).isFalse() + } + + @Test + fun isDesktopModeShowing_tasksActiveAndVisible_returnsTrue() { + val task1 = setUpFreeformTask() + val task2 = setUpFreeformTask() + markTaskVisible(task1) + markTaskHidden(task2) + + assertThat(controller.isDesktopModeShowing(displayId = 0)).isTrue() + } + + @Test @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY) fun showDesktopApps_onSecondaryDisplay_desktopWallpaperEnabled_shouldNotShowWallpaper() { val homeTask = setUpHomeTask(SECOND_DISPLAY) @@ -526,32 +551,32 @@ class DesktopTasksControllerTest : ShellTestCase() { } @Test - fun getVisibleTaskCount_noTasks_returnsZero() { - assertThat(controller.getVisibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(0) + fun visibleTaskCount_noTasks_returnsZero() { + assertThat(controller.visibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(0) } @Test - fun getVisibleTaskCount_twoTasks_bothVisible_returnsTwo() { + fun visibleTaskCount_twoTasks_bothVisible_returnsTwo() { setUpHomeTask() setUpFreeformTask().also(::markTaskVisible) setUpFreeformTask().also(::markTaskVisible) - assertThat(controller.getVisibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(2) + assertThat(controller.visibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(2) } @Test - fun getVisibleTaskCount_twoTasks_oneVisible_returnsOne() { + fun visibleTaskCount_twoTasks_oneVisible_returnsOne() { setUpHomeTask() setUpFreeformTask().also(::markTaskVisible) setUpFreeformTask().also(::markTaskHidden) - assertThat(controller.getVisibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(1) + assertThat(controller.visibleTaskCount(DEFAULT_DISPLAY)).isEqualTo(1) } @Test - fun getVisibleTaskCount_twoTasksVisibleOnDifferentDisplays_returnsOne() { + fun visibleTaskCount_twoTasksVisibleOnDifferentDisplays_returnsOne() { setUpHomeTask() setUpFreeformTask(DEFAULT_DISPLAY).also(::markTaskVisible) setUpFreeformTask(SECOND_DISPLAY).also(::markTaskVisible) - assertThat(controller.getVisibleTaskCount(SECOND_DISPLAY)).isEqualTo(1) + assertThat(controller.visibleTaskCount(SECOND_DISPLAY)).isEqualTo(1) } @Test @@ -1301,6 +1326,22 @@ class DesktopTasksControllerTest : ShellTestCase() { } @Test + fun handleRequest_freeformTask_relaunchActiveTask_taskBecomesUndefined() { + assumeTrue(ENABLE_SHELL_TRANSITIONS) + + val freeformTask = setUpFreeformTask() + markTaskHidden(freeformTask) + + val wct = + controller.handleRequest(Binder(), createTransition(freeformTask)) + + // Should become undefined as the TDA is set to fullscreen. It will inherit from the TDA. + assertNotNull(wct, "should handle request") + assertThat(wct.changes[freeformTask.token.asBinder()]?.windowingMode) + .isEqualTo(WINDOWING_MODE_UNDEFINED) + } + + @Test @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY) fun handleRequest_freeformTask_desktopWallpaperDisabled_freeformNotVisible_reorderedToTop() { assumeTrue(ENABLE_SHELL_TRANSITIONS) @@ -1451,7 +1492,7 @@ class DesktopTasksControllerTest : ShellTestCase() { .setActivityType(ACTIVITY_TYPE_STANDARD) .setWindowingMode(WINDOWING_MODE_FULLSCREEN) .build() - val transition = createTransition(task = task, type = WindowManager.TRANSIT_CLOSE) + val transition = createTransition(task = task, type = TRANSIT_CLOSE) val result = controller.handleRequest(Binder(), transition) assertThat(result).isNull() } @@ -1545,8 +1586,11 @@ class DesktopTasksControllerTest : ShellTestCase() { } @Test - @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY) - fun handleRequest_backTransition_singleActiveTaskNoTokenFlagDisabled_doesNotHandle() { + @DisableFlags( + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION, + ) + fun handleRequest_backTransition_singleTaskNoToken_noWallpaper_noBackNav_doesNotHandle() { val task = setUpFreeformTask() val result = controller.handleRequest(Binder(), createTransition(task, type = TRANSIT_TO_BACK)) @@ -1555,8 +1599,22 @@ class DesktopTasksControllerTest : ShellTestCase() { } @Test + @EnableFlags( + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION + ) + fun handleRequest_backTransition_singleTaskNoToken_withWallpaper_withBackNav_removesTask() { + val task = setUpFreeformTask() + + val result = controller.handleRequest(Binder(), createTransition(task, type = TRANSIT_TO_BACK)) + + assertNotNull(result, "Should handle request").assertRemoveAt(0, task.token) + } + + @Test @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY) - fun handleRequest_backTransition_singleActiveTaskNoTokenFlagEnabled_doesNotHandle() { + @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION) + fun handleRequest_backTransition_singleTaskNoToken_noBackNav_doesNotHandle() { val task = setUpFreeformTask() val result = controller.handleRequest(Binder(), createTransition(task, type = TRANSIT_TO_BACK)) @@ -1565,8 +1623,11 @@ class DesktopTasksControllerTest : ShellTestCase() { } @Test - @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY) - fun handleRequest_backTransition_singleActiveTaskWithTokenFlagDisabled_doesNotHandle() { + @DisableFlags( + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION + ) + fun handleRequest_backTransition_singleTaskWithToken_noWallpaper_noBackNav_doesNotHandle() { val task = setUpFreeformTask() desktopModeTaskRepository.wallpaperActivityToken = MockToken().token() @@ -1576,22 +1637,42 @@ class DesktopTasksControllerTest : ShellTestCase() { } @Test + @EnableFlags( + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION + ) + fun handleRequest_backTransition_singleTask_withWallpaper_withBackNav_removesWallpaperAndTask() { + val task = setUpFreeformTask() + val wallpaperToken = MockToken().token() + + desktopModeTaskRepository.wallpaperActivityToken = wallpaperToken + val result = controller.handleRequest(Binder(), createTransition(task, type = TRANSIT_TO_BACK)) + + // Should create remove wallpaper transaction + assertNotNull(result, "Should handle request").assertRemoveAt(index = 0, wallpaperToken) + result.assertRemoveAt(index = 1, task.token) + } + + @Test @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY) - fun handleRequest_backTransition_singleActiveTaskWithTokenFlagEnabled_handlesRequest() { + @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION) + fun handleRequest_backTransition_singleTaskWithToken_noBackNav_removesWallpaper() { val task = setUpFreeformTask() val wallpaperToken = MockToken().token() desktopModeTaskRepository.wallpaperActivityToken = wallpaperToken val result = controller.handleRequest(Binder(), createTransition(task, type = TRANSIT_TO_BACK)) - assertNotNull(result, "Should handle request") - // Should create remove wallpaper transaction - .assertRemoveAt(index = 0, wallpaperToken) + // Should create remove wallpaper transaction + assertNotNull(result, "Should handle request").assertRemoveAt(index = 0, wallpaperToken) } @Test - @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY) - fun handleRequest_backTransition_multipleActiveTasksFlagDisabled_doesNotHandle() { + @DisableFlags( + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION + ) + fun handleRequest_backTransition_multipleTasks_noWallpaper_noBackNav_doesNotHandle() { val task1 = setUpFreeformTask() setUpFreeformTask() @@ -1602,8 +1683,24 @@ class DesktopTasksControllerTest : ShellTestCase() { } @Test + @EnableFlags( + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION + ) + fun handleRequest_backTransition_multipleTasks_withWallpaper_withBackNav_removesTask() { + val task1 = setUpFreeformTask() + setUpFreeformTask() + + desktopModeTaskRepository.wallpaperActivityToken = MockToken().token() + val result = controller.handleRequest(Binder(), createTransition(task1, type = TRANSIT_TO_BACK)) + + assertNotNull(result, "Should handle request").assertRemoveAt(index = 0, task1.token) + } + + @Test @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY) - fun handleRequest_backTransition_multipleActiveTasksFlagEnabled_doesNotHandle() { + @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION) + fun handleRequest_backTransition_multipleTasks_noBackNav_doesNotHandle() { val task1 = setUpFreeformTask() setUpFreeformTask() @@ -1614,8 +1711,28 @@ class DesktopTasksControllerTest : ShellTestCase() { } @Test + @EnableFlags( + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION + ) + fun handleRequest_backTransition_multipleTasksSingleNonClosing_removesWallpaperAndTask() { + val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY) + val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY) + val wallpaperToken = MockToken().token() + + desktopModeTaskRepository.wallpaperActivityToken = wallpaperToken + desktopModeTaskRepository.addClosingTask(displayId = DEFAULT_DISPLAY, taskId = task2.taskId) + val result = controller.handleRequest(Binder(), createTransition(task1, type = TRANSIT_TO_BACK)) + + // Should create remove wallpaper transaction + assertNotNull(result, "Should handle request").assertRemoveAt(index = 0, wallpaperToken) + result.assertRemoveAt(index = 1, task1.token) + } + + @Test @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY) - fun handleRequest_backTransition_multipleActiveTasksSingleNonClosing_handlesRequest() { + @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION) + fun handleRequest_backTransition_multipleTasksSingleNonClosing_noBackNav_removesWallpaper() { val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY) val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY) val wallpaperToken = MockToken().token() @@ -1624,14 +1741,33 @@ class DesktopTasksControllerTest : ShellTestCase() { desktopModeTaskRepository.addClosingTask(displayId = DEFAULT_DISPLAY, taskId = task2.taskId) val result = controller.handleRequest(Binder(), createTransition(task1, type = TRANSIT_TO_BACK)) - assertNotNull(result, "Should handle request") - // Should create remove wallpaper transaction - .assertRemoveAt(index = 0, wallpaperToken) + // Should create remove wallpaper transaction + assertNotNull(result, "Should handle request").assertRemoveAt(index = 0, wallpaperToken) + } + + @Test + @EnableFlags( + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION + ) + fun handleRequest_backTransition_multipleTasksSingleNonMinimized_removesWallpaperAndTask() { + val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY) + val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY) + val wallpaperToken = MockToken().token() + + desktopModeTaskRepository.wallpaperActivityToken = wallpaperToken + desktopModeTaskRepository.minimizeTask(displayId = DEFAULT_DISPLAY, taskId = task2.taskId) + val result = controller.handleRequest(Binder(), createTransition(task1, type = TRANSIT_TO_BACK)) + + // Should create remove wallpaper transaction + assertNotNull(result, "Should handle request").assertRemoveAt(index = 0, wallpaperToken) + result.assertRemoveAt(index = 1, task1.token) } @Test @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY) - fun handleRequest_backTransition_multipleActiveTasksSingleNonMinimized_handlesRequest() { + @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION) + fun handleRequest_backTransition_multipleTasksSingleNonMinimized_noBackNav_removesWallpaper() { val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY) val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY) val wallpaperToken = MockToken().token() @@ -1640,14 +1776,36 @@ class DesktopTasksControllerTest : ShellTestCase() { desktopModeTaskRepository.minimizeTask(displayId = DEFAULT_DISPLAY, taskId = task2.taskId) val result = controller.handleRequest(Binder(), createTransition(task1, type = TRANSIT_TO_BACK)) - assertNotNull(result, "Should handle request") - // Should create remove wallpaper transaction - .assertRemoveAt(index = 0, wallpaperToken) + // Should create remove wallpaper transaction + assertNotNull(result, "Should handle request").assertRemoveAt(index = 0, wallpaperToken) } @Test - @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY) - fun handleRequest_closeTransition_singleActiveTaskNoTokenFlagDisabled_doesNotHandle() { + @EnableFlags( + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION + ) + fun handleRequest_backTransition_nonMinimizadTask_withWallpaper_withBackNav_removesWallpaper() { + val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY) + val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY) + val wallpaperToken = MockToken().token() + + desktopModeTaskRepository.wallpaperActivityToken = wallpaperToken + desktopModeTaskRepository.minimizeTask(displayId = DEFAULT_DISPLAY, taskId = task2.taskId) + // Task is being minimized so mark it as not visible. + desktopModeTaskRepository + .updateVisibleFreeformTasks(displayId = DEFAULT_DISPLAY, task2.taskId, false) + val result = controller.handleRequest(Binder(), createTransition(task2, type = TRANSIT_TO_BACK)) + + assertNull(result, "Should not handle request") + } + + @Test + @DisableFlags( + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION + ) + fun handleRequest_closeTransition_singleTaskNoToken_noWallpaper_noBackNav_doesNotHandle() { val task = setUpFreeformTask() val result = controller.handleRequest(Binder(), createTransition(task, type = TRANSIT_CLOSE)) @@ -1656,8 +1814,22 @@ class DesktopTasksControllerTest : ShellTestCase() { } @Test + @EnableFlags( + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION + ) + fun handleRequest_closeTransition_singleTaskNoToken_withWallpaper_withBackNav_removesTask() { + val task = setUpFreeformTask() + + val result = controller.handleRequest(Binder(), createTransition(task, type = TRANSIT_CLOSE)) + + assertNotNull(result, "Should handle request").assertRemoveAt(index = 0, task.token) + } + + @Test @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY) - fun handleRequest_closeTransition_singleActiveTaskNoTokenFlagEnabled_doesNotHandle() { + @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION) + fun handleRequest_closeTransition_singleTaskNoToken_noBackNav_doesNotHandle() { val task = setUpFreeformTask() val result = controller.handleRequest(Binder(), createTransition(task, type = TRANSIT_CLOSE)) @@ -1666,8 +1838,11 @@ class DesktopTasksControllerTest : ShellTestCase() { } @Test - @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY) - fun handleRequest_closeTransition_singleActiveTaskWithTokenFlagDisabled_doesNotHandle() { + @DisableFlags( + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION + ) + fun handleRequest_closeTransition_singleTaskWithToken_noWallpaper_noBackNav_doesNotHandle() { val task = setUpFreeformTask() desktopModeTaskRepository.wallpaperActivityToken = MockToken().token() @@ -1677,22 +1852,42 @@ class DesktopTasksControllerTest : ShellTestCase() { } @Test + @EnableFlags( + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION + ) + fun handleRequest_closeTransition_singleTaskWithToken_removesWallpaperAndTask() { + val task = setUpFreeformTask() + val wallpaperToken = MockToken().token() + + desktopModeTaskRepository.wallpaperActivityToken = wallpaperToken + val result = controller.handleRequest(Binder(), createTransition(task, type = TRANSIT_CLOSE)) + + // Should create remove wallpaper transaction + assertNotNull(result, "Should handle request").assertRemoveAt(index = 0, wallpaperToken) + result.assertRemoveAt(index = 1, task.token) + } + + @Test @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY) - fun handleRequest_closeTransition_singleActiveTaskWithTokenFlagEnabled_handlesRequest() { + @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION) + fun handleRequest_closeTransition_singleTaskWithToken_withWallpaper_noBackNav_removesWallpaper() { val task = setUpFreeformTask() val wallpaperToken = MockToken().token() desktopModeTaskRepository.wallpaperActivityToken = wallpaperToken val result = controller.handleRequest(Binder(), createTransition(task, type = TRANSIT_CLOSE)) - assertNotNull(result, "Should handle request") - // Should create remove wallpaper transaction - .assertRemoveAt(index = 0, wallpaperToken) + // Should create remove wallpaper transaction + assertNotNull(result, "Should handle request").assertRemoveAt(index = 0, wallpaperToken) } @Test - @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY) - fun handleRequest_closeTransition_multipleActiveTasksFlagDisabled_doesNotHandle() { + @DisableFlags( + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION + ) + fun handleRequest_closeTransition_multipleTasks_noWallpaper_noBackNav_doesNotHandle() { val task1 = setUpFreeformTask() setUpFreeformTask() @@ -1703,8 +1898,25 @@ class DesktopTasksControllerTest : ShellTestCase() { } @Test + @EnableFlags( + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION + ) + fun handleRequest_closeTransition_multipleTasks_withWallpaper_withBackNav_removesTask() { + val task1 = setUpFreeformTask() + setUpFreeformTask() + + desktopModeTaskRepository.wallpaperActivityToken = MockToken().token() + val result = controller.handleRequest(Binder(), createTransition(task1, type = TRANSIT_CLOSE)) + + assertNotNull(result, "Should handle request") + result.assertRemoveAt(index = 0, task1.token) + } + + @Test @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY) - fun handleRequest_closeTransition_multipleActiveTasksFlagEnabled_doesNotHandle() { + @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION) + fun handleRequest_closeTransition_multipleTasksFlagEnabled_noBackNav_doesNotHandle() { val task1 = setUpFreeformTask() setUpFreeformTask() @@ -1715,8 +1927,28 @@ class DesktopTasksControllerTest : ShellTestCase() { } @Test + @EnableFlags( + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION + ) + fun handleRequest_closeTransition_multipleTasksSingleNonClosing_removesWallpaperAndTask() { + val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY) + val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY) + val wallpaperToken = MockToken().token() + + desktopModeTaskRepository.wallpaperActivityToken = wallpaperToken + desktopModeTaskRepository.addClosingTask(displayId = DEFAULT_DISPLAY, taskId = task2.taskId) + val result = controller.handleRequest(Binder(), createTransition(task1, type = TRANSIT_CLOSE)) + + // Should create remove wallpaper transaction + assertNotNull(result, "Should handle request").assertRemoveAt(index = 0, wallpaperToken) + result.assertRemoveAt(index = 1, task1.token) + } + + @Test @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY) - fun handleRequest_closeTransition_multipleActiveTasksSingleNonClosing_handlesRequest() { + @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION) + fun handleRequest_closeTransition_multipleTasksSingleNonClosing_noBackNav_removesWallpaper() { val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY) val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY) val wallpaperToken = MockToken().token() @@ -1725,14 +1957,33 @@ class DesktopTasksControllerTest : ShellTestCase() { desktopModeTaskRepository.addClosingTask(displayId = DEFAULT_DISPLAY, taskId = task2.taskId) val result = controller.handleRequest(Binder(), createTransition(task1, type = TRANSIT_CLOSE)) - assertNotNull(result, "Should handle request") - // Should create remove wallpaper transaction - .assertRemoveAt(index = 0, wallpaperToken) + // Should create remove wallpaper transaction + assertNotNull(result, "Should handle request").assertRemoveAt(index = 0, wallpaperToken) + } + + @Test + @EnableFlags( + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION + ) + fun handleRequest_closeTransition_multipleTasksOneNonMinimized_removesWallpaperAndTask() { + val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY) + val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY) + val wallpaperToken = MockToken().token() + + desktopModeTaskRepository.wallpaperActivityToken = wallpaperToken + desktopModeTaskRepository.minimizeTask(displayId = DEFAULT_DISPLAY, taskId = task2.taskId) + val result = controller.handleRequest(Binder(), createTransition(task1, type = TRANSIT_CLOSE)) + + // Should create remove wallpaper transaction + assertNotNull(result, "Should handle request").assertRemoveAt(index = 0, wallpaperToken) + result.assertRemoveAt(index = 1, task1.token) } @Test @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY) - fun handleRequest_closeTransition_multipleActiveTasksSingleNonMinimized_handlesRequest() { + @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION) + fun handleRequest_closeTransition_multipleTasksSingleNonMinimized_noBackNav_removesWallpaper() { val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY) val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY) val wallpaperToken = MockToken().token() @@ -1741,9 +1992,28 @@ class DesktopTasksControllerTest : ShellTestCase() { desktopModeTaskRepository.minimizeTask(displayId = DEFAULT_DISPLAY, taskId = task2.taskId) val result = controller.handleRequest(Binder(), createTransition(task1, type = TRANSIT_CLOSE)) - assertNotNull(result, "Should handle request") - // Should create remove wallpaper transaction - .assertRemoveAt(index = 0, wallpaperToken) + // Should create remove wallpaper transaction + assertNotNull(result, "Should handle request").assertRemoveAt(index = 0, wallpaperToken) + } + + @Test + @EnableFlags( + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY, + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION + ) + fun handleRequest_closeTransition_minimizadTask_withWallpaper_withBackNav_removesWallpaper() { + val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY) + val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY) + val wallpaperToken = MockToken().token() + + desktopModeTaskRepository.wallpaperActivityToken = wallpaperToken + desktopModeTaskRepository.minimizeTask(displayId = DEFAULT_DISPLAY, taskId = task2.taskId) + // Task is being minimized so mark it as not visible. + desktopModeTaskRepository + .updateVisibleFreeformTasks(displayId = DEFAULT_DISPLAY, task2.taskId, false) + val result = controller.handleRequest(Binder(), createTransition(task2, type = TRANSIT_TO_BACK)) + + assertNull(result, "Should not handle request") } @Test |