[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 731b4a4b71 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14482550
Change-Id: Iff548beaf41017853a299b0a5c7cbb446bc5e7ea
diff --git a/go/quickstep/res/values-en-rAU/strings.xml b/go/quickstep/res/values-en-rAU/strings.xml
deleted file mode 100644
index 3a609b6..0000000
--- a/go/quickstep/res/values-en-rAU/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_share_drop_target_label" msgid="5804774105974539508">"Share app"</string>
- <string name="action_listen" msgid="2370304050784689486">"Listen"</string>
- <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
- <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-</resources>
diff --git a/go/quickstep/res/values-en-rCA/strings.xml b/go/quickstep/res/values-en-rCA/strings.xml
deleted file mode 100644
index 3a609b6..0000000
--- a/go/quickstep/res/values-en-rCA/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_share_drop_target_label" msgid="5804774105974539508">"Share app"</string>
- <string name="action_listen" msgid="2370304050784689486">"Listen"</string>
- <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
- <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-</resources>
diff --git a/go/quickstep/res/values-en-rGB/strings.xml b/go/quickstep/res/values-en-rGB/strings.xml
deleted file mode 100644
index 3a609b6..0000000
--- a/go/quickstep/res/values-en-rGB/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_share_drop_target_label" msgid="5804774105974539508">"Share app"</string>
- <string name="action_listen" msgid="2370304050784689486">"Listen"</string>
- <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
- <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-</resources>
diff --git a/go/quickstep/res/values-en-rIN/strings.xml b/go/quickstep/res/values-en-rIN/strings.xml
deleted file mode 100644
index 3a609b6..0000000
--- a/go/quickstep/res/values-en-rIN/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_share_drop_target_label" msgid="5804774105974539508">"Share app"</string>
- <string name="action_listen" msgid="2370304050784689486">"Listen"</string>
- <string name="action_translate" msgid="8028378961867277746">"Translate"</string>
- <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-</resources>
diff --git a/go/quickstep/res/values-uz/strings.xml b/go/quickstep/res/values-uz/strings.xml
deleted file mode 100644
index 4e375c7..0000000
--- a/go/quickstep/res/values-uz/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_share_drop_target_label" msgid="5804774105974539508">"Ilovani ulashish"</string>
- <string name="action_listen" msgid="2370304050784689486">"Tinglash"</string>
- <string name="action_translate" msgid="8028378961867277746">"Tarjimon"</string>
- <string name="action_search" msgid="6269564710943755464">"Lens"</string>
-</resources>
diff --git a/quickstep/res/values-en-rAU/strings.xml b/quickstep/res/values-en-rAU/strings.xml
index 5aae288..1040a03 100644
--- a/quickstep/res/values-en-rAU/strings.xml
+++ b/quickstep/res/values-en-rAU/strings.xml
@@ -74,10 +74,14 @@
<string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
<string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
<string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
- <string name="allset_title" msgid="5021126669778966707">"Ready!"</string>
- <string name="allset_hint" msgid="459504134589971527">"Swipe up to go home"</string>
- <string name="allset_description" msgid="6350320429953234580">"You’re ready to start using your phone"</string>
- <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigation settings for accessibility"</annotation></string>
+ <!-- no translation found for allset_title (5021126669778966707) -->
+ <skip />
+ <!-- no translation found for allset_hint (459504134589971527) -->
+ <skip />
+ <!-- no translation found for allset_description (6350320429953234580) -->
+ <skip />
+ <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+ <skip />
<string name="action_share" msgid="2648470652637092375">"Share"</string>
<string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
<string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
diff --git a/quickstep/res/values-en-rCA/strings.xml b/quickstep/res/values-en-rCA/strings.xml
index 5aae288..1040a03 100644
--- a/quickstep/res/values-en-rCA/strings.xml
+++ b/quickstep/res/values-en-rCA/strings.xml
@@ -74,10 +74,14 @@
<string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
<string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
<string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
- <string name="allset_title" msgid="5021126669778966707">"Ready!"</string>
- <string name="allset_hint" msgid="459504134589971527">"Swipe up to go home"</string>
- <string name="allset_description" msgid="6350320429953234580">"You’re ready to start using your phone"</string>
- <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigation settings for accessibility"</annotation></string>
+ <!-- no translation found for allset_title (5021126669778966707) -->
+ <skip />
+ <!-- no translation found for allset_hint (459504134589971527) -->
+ <skip />
+ <!-- no translation found for allset_description (6350320429953234580) -->
+ <skip />
+ <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+ <skip />
<string name="action_share" msgid="2648470652637092375">"Share"</string>
<string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
<string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
diff --git a/quickstep/res/values-en-rGB/strings.xml b/quickstep/res/values-en-rGB/strings.xml
index 5aae288..1040a03 100644
--- a/quickstep/res/values-en-rGB/strings.xml
+++ b/quickstep/res/values-en-rGB/strings.xml
@@ -74,10 +74,14 @@
<string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
<string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
<string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
- <string name="allset_title" msgid="5021126669778966707">"Ready!"</string>
- <string name="allset_hint" msgid="459504134589971527">"Swipe up to go home"</string>
- <string name="allset_description" msgid="6350320429953234580">"You’re ready to start using your phone"</string>
- <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigation settings for accessibility"</annotation></string>
+ <!-- no translation found for allset_title (5021126669778966707) -->
+ <skip />
+ <!-- no translation found for allset_hint (459504134589971527) -->
+ <skip />
+ <!-- no translation found for allset_description (6350320429953234580) -->
+ <skip />
+ <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+ <skip />
<string name="action_share" msgid="2648470652637092375">"Share"</string>
<string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
<string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
diff --git a/quickstep/res/values-en-rIN/strings.xml b/quickstep/res/values-en-rIN/strings.xml
index 5aae288..1040a03 100644
--- a/quickstep/res/values-en-rIN/strings.xml
+++ b/quickstep/res/values-en-rIN/strings.xml
@@ -74,10 +74,14 @@
<string name="gesture_tutorial_try_again" msgid="65962545858556697">"Try again"</string>
<string name="gesture_tutorial_nice" msgid="2936275692616928280">"Nice!"</string>
<string name="gesture_tutorial_step" msgid="1279786122817620968">"Tutorial <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
- <string name="allset_title" msgid="5021126669778966707">"Ready!"</string>
- <string name="allset_hint" msgid="459504134589971527">"Swipe up to go home"</string>
- <string name="allset_description" msgid="6350320429953234580">"You’re ready to start using your phone"</string>
- <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Navigation settings for accessibility"</annotation></string>
+ <!-- no translation found for allset_title (5021126669778966707) -->
+ <skip />
+ <!-- no translation found for allset_hint (459504134589971527) -->
+ <skip />
+ <!-- no translation found for allset_description (6350320429953234580) -->
+ <skip />
+ <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+ <skip />
<string name="action_share" msgid="2648470652637092375">"Share"</string>
<string name="action_screenshot" msgid="8171125848358142917">"Screenshot"</string>
<string name="blocked_by_policy" msgid="2071401072261365546">"This action isn\'t allowed by the app or your organisation"</string>
diff --git a/quickstep/res/values-uz/strings.xml b/quickstep/res/values-uz/strings.xml
index 8ca3898..4ddcae8 100644
--- a/quickstep/res/values-uz/strings.xml
+++ b/quickstep/res/values-uz/strings.xml
@@ -74,10 +74,14 @@
<string name="gesture_tutorial_try_again" msgid="65962545858556697">"Qayta urinish"</string>
<string name="gesture_tutorial_nice" msgid="2936275692616928280">"Yaxshi!"</string>
<string name="gesture_tutorial_step" msgid="1279786122817620968">"Darslik: <xliff:g id="CURRENT">%1$d</xliff:g>/<xliff:g id="TOTAL">%2$d</xliff:g>"</string>
- <string name="allset_title" msgid="5021126669778966707">"Hammasi tayyor!"</string>
- <string name="allset_hint" msgid="459504134589971527">"Boshiga qaytish uchun tepaga suring"</string>
- <string name="allset_description" msgid="6350320429953234580">"Telefoningiz xizmatga tayyor"</string>
- <string name="allset_navigation_settings" msgid="417773244979225071"><annotation id="link">"Maxsus imkoniyatlar uchun navigatsiya sozlamalari"</annotation></string>
+ <!-- no translation found for allset_title (5021126669778966707) -->
+ <skip />
+ <!-- no translation found for allset_hint (459504134589971527) -->
+ <skip />
+ <!-- no translation found for allset_description (6350320429953234580) -->
+ <skip />
+ <!-- no translation found for allset_navigation_settings (417773244979225071) -->
+ <skip />
<string name="action_share" msgid="2648470652637092375">"Ulashish"</string>
<string name="action_screenshot" msgid="8171125848358142917">"Skrinshot"</string>
<string name="blocked_by_policy" msgid="2071401072261365546">"Bu amal ilova yoki tashkilotingiz tomonidan taqiqlangan"</string>
diff --git a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
index 7c8041c..c8a72cd 100644
--- a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
+++ b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
@@ -111,11 +111,6 @@
public void initialize(Task task) {
mTask = task;
- if (task.key.userId != UserHandle.myUserId()) {
- setNoLimit();
- return;
- }
-
THREAD_POOL_EXECUTOR.execute(() -> {
final AppUsageLimit usageLimit = mLauncherApps.getAppUsageLimit(
task.getTopComponent().getPackageName(),