From b8a2a026a59175f175580e35c13ec3abbca895a8 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Mon, 15 Aug 2022 23:44:42 +0000 Subject: [PATCH 01/12] Defer adding surface changed callback until view root is valid - It appears there are cases where the view root is not valid (in which case schedule() returns false and we don't wait to handle the callback) which causes an NPE, but in these cases we don't need to add the surface changed callback at all. Bug: 202776119 Bug: 242347940 Bug: 242897135 Test: Launch an app with sharesheet, swipe up and verify that screenshot callbacks Change-Id: Icc3afc604bd925c5d49c693b7de51755f5a8bd42 --- quickstep/src/com/android/quickstep/ViewUtils.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/quickstep/src/com/android/quickstep/ViewUtils.java b/quickstep/src/com/android/quickstep/ViewUtils.java index 1bb95b97f9..b1320674e6 100644 --- a/quickstep/src/com/android/quickstep/ViewUtils.java +++ b/quickstep/src/com/android/quickstep/ViewUtils.java @@ -53,13 +53,13 @@ public class ViewUtils { final Runnable mFinishCallback; final BooleanSupplier mCancelled; final Handler mHandler; + boolean mSurfaceCallbackRegistered = false; boolean mFinished; int mDeferFrameCount = 1; FrameHandler(View view, Runnable finishCallback, BooleanSupplier cancelled) { mViewRoot = view.getViewRootImpl(); - mViewRoot.addSurfaceChangedCallback(this); mFinishCallback = finishCallback; mCancelled = cancelled; mHandler = new Handler(); @@ -103,6 +103,10 @@ public class ViewUtils { private boolean schedule() { if (mViewRoot != null && mViewRoot.getView() != null) { + if (!mSurfaceCallbackRegistered) { + mSurfaceCallbackRegistered = true; + mViewRoot.addSurfaceChangedCallback(this); + } mViewRoot.registerRtFrameCallback(this); mViewRoot.getView().invalidate(); return true; @@ -119,7 +123,10 @@ public class ViewUtils { if (mFinishCallback != null) { mFinishCallback.run(); } - mViewRoot.removeSurfaceChangedCallback(this); + if (mViewRoot != null) { + mViewRoot.removeSurfaceChangedCallback(this); + mSurfaceCallbackRegistered = false; + } } } } From 664fde774464f8b41e3a7eef7af72612aacced8e Mon Sep 17 00:00:00 2001 From: Sam Dubey Date: Wed, 17 Aug 2022 12:59:16 +0000 Subject: [PATCH 02/12] Onboard tests in IW suite Adding annotations to test methods confirmed to perform CUJ steps in the bugs attached. Test: Forrest Bug: 239384214 Fix: 241945343, b/241845943, b/241845754, b/241848386 Change-Id: Ifc21339f4acf558003cb1db8ebd5e05df5134a55 --- tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java | 4 ++++ tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java index 03bf4af3de..d474c06d30 100644 --- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java +++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java @@ -18,6 +18,8 @@ package com.android.launcher3.ui; import static androidx.test.InstrumentationRegistry.getInstrumentation; +import android.platform.test.annotations.IwTest; + import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertEquals; @@ -203,6 +205,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { false /* tapRight */); } + @IwTest(focusArea="launcher") @Test @ScreenRecord // b/202433017 public void testWorkspace() throws Exception { @@ -330,6 +333,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { } } + @IwTest(focusArea="launcher") @Test @PortraitLandscape public void testDragAppIcon() throws Throwable { diff --git a/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java index 194ee4f1c9..561f3ccbf2 100644 --- a/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java +++ b/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java @@ -20,6 +20,8 @@ import static com.android.launcher3.ui.TaplTestsLauncher3.getAppPackageName; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import android.platform.test.annotations.IwTest; + import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; @@ -45,6 +47,7 @@ public class AddWidgetTest extends AbstractLauncherUiTest { @Rule public ShellCommandRule mGrantWidgetRule = ShellCommandRule.grantWidgetBind(); + @IwTest(focusArea="launcher") @Test @PortraitLandscape public void testDragIcon() throws Throwable { From 9092ef2227cf9030296294d0daa04782fae2276e Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Sun, 21 Aug 2022 23:15:39 -0700 Subject: [PATCH 03/12] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I7ff6db96a4819dc741c0fad9bfe6365f11604f7a --- quickstep/res/values-or/strings.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/quickstep/res/values-or/strings.xml b/quickstep/res/values-or/strings.xml index 6ab7c5efb8..d7246c4a11 100644 --- a/quickstep/res/values-or/strings.xml +++ b/quickstep/res/values-or/strings.xml @@ -31,11 +31,11 @@ "ଆଜି %1$s ବାକି ଅଛି" "ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକ" "ଆପଣ ପୂର୍ବାନୁମାନ କରିଥିବା ଆପ୍ସ" - "ଆପଣଙ୍କ ମୂଳ ସ୍କ୍ରିନର ତଳ ଧାଡ଼ିରେ ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକ ପାଆନ୍ତୁ" - "ଆପଣଙ୍କ ମୂଳ ସ୍କ୍ରିନର ପସନ୍ଦର ଧାଡ଼ିରେ ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକ ପାଆନ୍ତୁ" - "ଆପଣଙ୍କର ସବୁଠାରୁ ଅଧିକ-ବ୍ୟବହୃତ ଆପଗୁଡ଼ିକୁ ସିଧା ମୂଳ ସ୍କ୍ରିନରେ ସହଜରେ ଆକ୍ସେସ୍ କରନ୍ତୁ। ଆପଣଙ୍କ ରୁଟିନଗୁଡ଼ିକ ଆଧାରରେ ପରାମର୍ଶଗୁଡ଼ିକ ପରିବର୍ତ୍ତିତ ହେବ। ତଳ ଧାଡ଼ିରେ ଥିବା ଆପଗୁଡ଼ିକ ଆପଣଙ୍କ ମୂଳ ସ୍କ୍ରିନକୁ ମୁଭ୍ କରିଯିବ।" - "ମୂଳ ସ୍କ୍ରିନରେ ହିଁ ଆପଣଙ୍କର ସବୁଠାରୁ ଅଧିକ-ବ୍ୟବହୃତ ଆପଗୁଡ଼ିକୁ ସହଜରେ ଆକ୍ସେସ୍ କରନ୍ତୁ। ଆପଣଙ୍କ ରୁଟିନଗୁଡ଼ିକ ଆଧାରରେ ପରାମର୍ଶଗୁଡ଼ିକ ବଦଳିବ। ଆପଣଙ୍କ ମୂଳ ସ୍କ୍ରିନକୁ ପସନ୍ଦର ଧାଡ଼ିରେ ଥିବା ଆପଗୁଡ଼ିକ ମୁଭ୍ ହେବ।" - "ଆପଣଙ୍କର ସବୁଠାରୁ ଅଧିକ-ବ୍ୟବହୃତ ଆପଗୁଡ଼ିକୁ, ସିଧା ମୂଳ ସ୍କ୍ରିନରେ ସହଜରେ ଆକ୍ସେସ୍ କରନ୍ତୁ। ଆପଣଙ୍କ ରୁଟିନଗୁଡ଼ିକ ଆଧାରରେ ପରାମର୍ଶଗୁଡ଼ିକ ପରିବର୍ତ୍ତିତ ହେବ। ତଳ ଧାଡ଼ିରେ ଥିବା ଆପଗୁଡ଼ିକ ଏକ ନୂଆ ଫୋଲ୍ଡରକୁ ମୁଭ୍ କରିଯିବ।" + "ଆପଣଙ୍କ ହୋମ ସ୍କ୍ରିନର ତଳ ଧାଡ଼ିରେ ଆପ ପରାମର୍ଶଗୁଡ଼ିକ ପାଆନ୍ତୁ" + "ଆପଣଙ୍କ ହୋମ ସ୍କ୍ରିନର ପସନ୍ଦର ଧାଡ଼ିରେ ଆପ ପରାମର୍ଶଗୁଡ଼ିକ ପାଆନ୍ତୁ" + "ଆପଣଙ୍କର ସବୁଠାରୁ ଅଧିକ-ବ୍ୟବହୃତ ଆପ୍ସକୁ ସିଧା ହୋମ ସ୍କ୍ରିନରେ ସହଜରେ ଆକ୍ସେସ କରନ୍ତୁ। ଆପଣଙ୍କ ରୁଟିନଗୁଡ଼ିକ ଆଧାରରେ ପରାମର୍ଶଗୁଡ଼ିକ ପରିବର୍ତ୍ତିତ ହେବ। ତଳ ଧାଡ଼ିରେ ଥିବା ଆପ୍ସ ଆପଣଙ୍କ ହୋମ ସ୍କ୍ରିନକୁ ମୁଭ ହୋଇଯିବ।" + "ହୋମ ସ୍କ୍ରିନରେ ହିଁ ଆପଣଙ୍କର ସବୁଠାରୁ ଅଧିକ-ବ୍ୟବହୃତ ଆପ୍ସକୁ ସହଜରେ ଆକ୍ସେସ କରନ୍ତୁ। ଆପଣଙ୍କ ରୁଟିନଗୁଡ଼ିକ ଆଧାରରେ ପରାମର୍ଶଗୁଡ଼ିକ ବଦଳିବ। ଆପଣଙ୍କ ହୋମ ସ୍କ୍ରିନକୁ ପସନ୍ଦର ଧାଡ଼ିରେ ଥିବା ଆପ୍ସ ମୁଭ ହୋଇଯିବ।" + "ଆପଣଙ୍କର ସବୁଠାରୁ ଅଧିକ-ବ୍ୟବହୃତ ଆପ୍ସକୁ, ସିଧା ହୋମ ସ୍କ୍ରିନରେ ସହଜରେ ଆକ୍ସେସ କରନ୍ତୁ। ଆପଣଙ୍କ ରୁଟିନଗୁଡ଼ିକ ଆଧାରରେ ପରାମର୍ଶଗୁଡ଼ିକ ପରିବର୍ତ୍ତିତ ହେବ। ତଳ ଧାଡ଼ିରେ ଥିବା ଆପ୍ସ ଏକ ନୂଆ ଫୋଲ୍ଡରକୁ ମୁଭ ହୋଇଯିବ।" "ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକ ପାଆନ୍ତୁ" "ନାହିଁ, ଥାଉ" "ସେଟିଂସ" @@ -57,11 +57,11 @@ "ଆପଣ ସ୍କ୍ରିନର ତଳ ଧାରରୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।" "ଆପଣ ଛାଡ଼ିବା ପୂର୍ବରୁ ବିରତ କରୁନଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।" "ଆପଣ ସିଧା ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।" - "ଆପଣ \'ମୂଳପୃଷ୍ଠାକୁ ଯାଆନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି। ତା\'ପରେ, ପଛକୁ କିପରି ଫେରିବେ ତାହା ଜାଣନ୍ତୁ।" - "ଆପଣ \'ମୂଳପୃଷ୍ଠାକୁ ଯାଆନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି।" - "ମୂଳପୃଷ୍ଠାକୁ ଯିବା ପାଇଁ ସ୍ୱାଇପ୍ କରନ୍ତୁ" - "ଆପଣଙ୍କ ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ। ଏହି ଜେଶ୍ଚର୍ ସର୍ବଦା ଆପଣଙ୍କୁ ମୂଳସ୍କ୍ରିନକୁ ନେଇଥାଏ।" - "2ଟି ଆଙ୍ଗୁଠିରେ ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ କରନ୍ତୁ। ଏହି ଜେଶ୍ଚର ସର୍ବଦା ଆପଣଙ୍କୁ ମୂଳସ୍କ୍ରିନକୁ ନେଇଥାଏ।" + "ଆପଣ ହୋମ ଜେଶ୍ଚର ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି। ତା\'ପରେ, ପଛକୁ କିପରି ଫେରିବେ ତାହା ଜାଣନ୍ତୁ।" + "ଆପଣ ହୋମ ଜେଶ୍ଚର ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି।" + "ହୋମକୁ ଯିବା ପାଇଁ ସ୍ୱାଇପ କରନ୍ତୁ" + "ଆପଣଙ୍କ ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ କରନ୍ତୁ। ଏହି ଜେଶ୍ଚର ସର୍ବଦା ଆପଣଙ୍କୁ ହୋମ ସ୍କ୍ରିନକୁ ନେଇଥାଏ।" + "2ଟି ଆଙ୍ଗୁଠିରେ ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ କରନ୍ତୁ। ଏହି ଜେଶ୍ଚର ସର୍ବଦା ଆପଣଙ୍କୁ ହୋମ ସ୍କ୍ରିନକୁ ନେଇଥାଏ।" "ଆପଣ ସ୍କ୍ରିନର ତଳ ଧାରରୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।" "ୱିଣ୍ଡୋକୁ ରିଲିଜ୍ କରିବା ପୂର୍ବରୁ ଅଧିକ ସମୟ ଧରି ରଖିବାକୁ ଚେଷ୍ଟା କରନ୍ତୁ।" "ଆପଣ ସିଧା ଉପରକୁ ସ୍ୱାଇପ୍ କରି ତା\'ପରେ ବିରତ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।" @@ -77,7 +77,7 @@ "ବଢ଼ିଆ!" "ଟ୍ୟୁଟୋରିଆଲ୍ %1$d/%2$d" "ସମ୍ପୂର୍ଣ୍ଣ ଭାବେ ପ୍ରସ୍ତୁତ!" - "ମୂଳପୃଷ୍ଠାକୁ ଯିବା ପାଇଁ ଉପରକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ" + "ହୋମକୁ ଯିବା ପାଇଁ ଉପରକୁ ସ୍ୱାଇପ କରନ୍ତୁ" "ଆପଣ ଆପଣଙ୍କ ଫୋନ୍ ବ୍ୟବହାର କରିବା ପାଇଁ ପ୍ରସ୍ତୁତ ଅଛନ୍ତି" "ଆପଣ ଆପଣଙ୍କ ଟାବଲେଟ ବ୍ୟବହାର କରିବା ଆରମ୍ଭ କରିବାକୁ ପ୍ରସ୍ତୁତ ଅଛନ୍ତି" "ସିଷ୍ଟମ ନାଭିଗେସନ ସେଟିଂସ" @@ -101,7 +101,7 @@ "ପଛକୁ ଫେରନ୍ତୁ" "ବନ୍ଦ କରନ୍ତୁ" "ହୋଇଗଲା" - "ମୂଳପୃଷ୍ଠା" + "ହୋମ" "ଆକ୍ସେସିବିଲିଟୀ" "ପଛକୁ ଫେରନ୍ତୁ" "IME ସ୍ୱିଚର" From ad6d6d404f1180989598839805b6cf6d86da051d Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Sun, 21 Aug 2022 23:17:25 -0700 Subject: [PATCH 04/12] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I6e7b9c26fbfd4f1334431f4882b0ec617749d39d --- go/quickstep/res/values-am/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/go/quickstep/res/values-am/strings.xml b/go/quickstep/res/values-am/strings.xml index 1bfaf66b99..ed3479783a 100644 --- a/go/quickstep/res/values-am/strings.xml +++ b/go/quickstep/res/values-am/strings.xml @@ -9,12 +9,12 @@ "ይቅር" "ቅንብሮች" "በማያ ገጹ ላይ ጽሑፍን ይተረጉሙ ወይም ያዳምጡ" - "እንደ በማያ ገጽዎ ላይ ያለ ጽሑፍ፣ የድር አድራሻዎች እና ቅጽበታዊ ገጽ እይታዎች ያሉ መረጃዎች ለGoogle ሊጋሩ ይችላሉ።\n\nምን መረጃ እንደሚያጋሩ ለመቀየር ወደ ""ቅንብሮች > መተግበሪያዎች > ነባሪ መተግበሪያዎች > ዲጂታል ረዳት መተግበሪያ"" ይሂዱ።" + "እንደ በማያ ገጽዎ ላይ ያለ ጽሁፍ፣ የድር አድራሻዎች እና ቅጽበታዊ ገጽ እይታዎች ያሉ መረጃዎች ለGoogle ሊጋሩ ይችላሉ።\n\nምን መረጃ እንደሚያጋሩ ለመቀየር ወደ ""ቅንብሮች > መተግበሪያዎች > ነባሪ መተግበሪያዎች > ዲጂታል ረዳት መተግበሪያ"" ይሂዱ።" "ይህንን ባህሪ ለመጠቀም ረዳት ይምረጡ" "በማያ ገጽዎ ላይ ጽሑፍን ለማዳመጥ ወይም ለመተርጎም በቅንብሮች ውስጥ የዲጂታል ረዳት መተግበሪያን ይምረጡ" "ይህንን ባህሪ ለመጠቀም ረዳትዎን ይቀይሩ" "በማያ ገጽዎ ላይ ጽሑፍን ለማዳመጥ ወይም ለመተርጎም በቅንብሮች ውስጥ የዲጂታል ረዳት መተግበሪያዎን ይቀይሩ" - "በዚህ ማያ ገጽ ላይ ጽሑፍ ለማዳመጥ እዚህ መታ ያድርጉ" - "በዚህ ማያ ገጽ ላይ ጽሑፍ ለመተርጎም እዚህ መታ ያድርጉ" + "በዚህ ማያ ገጽ ላይ ጽሁፍ ለማዳመጥ እዚህ መታ ያድርጉ" + "በዚህ ማያ ገጽ ላይ ጽሁፍ ለመተርጎም እዚህ መታ ያድርጉ" "ይህ መተግበሪያ ሊጋራ አይችልም" From 99423fa67ef65ac56627825b1c2579bd839579d1 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Sun, 21 Aug 2022 23:19:25 -0700 Subject: [PATCH 05/12] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Ib99426b2542e64a0312c35d2f762f3b853a997c2 --- res/values-af/strings.xml | 2 +- res/values-as/strings.xml | 2 +- res/values-cs/strings.xml | 2 +- res/values-fr/strings.xml | 4 ++-- res/values-hi/strings.xml | 10 ++++----- res/values-hy/strings.xml | 2 +- res/values-ja/strings.xml | 4 ++-- res/values-ky/strings.xml | 2 +- res/values-mr/strings.xml | 6 +++--- res/values-my/strings.xml | 4 ++-- res/values-ne/strings.xml | 2 +- res/values-or/strings.xml | 40 +++++++++++++++++------------------ res/values-pa/strings.xml | 2 +- res/values-pt-rPT/strings.xml | 2 +- res/values-sk/strings.xml | 2 +- res/values-te/strings.xml | 2 +- res/values-th/strings.xml | 2 +- res/values-uk/strings.xml | 2 +- 18 files changed, 46 insertions(+), 46 deletions(-) diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index a699667cb0..500fce2a95 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -74,7 +74,7 @@ "Deïnstalleer" "Programinligting" "Installeer" - "Moenie program voorstel nie" + "Moenie voorstel nie" "Vasspeldvoorspelling" "installeer kortpaaie" "Laat \'n program toe om kortpaaie by te voeg sonder gebruikerinmenging." diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml index ba14e974a9..eee5ae27d0 100644 --- a/res/values-as/strings.xml +++ b/res/values-as/strings.xml @@ -74,7 +74,7 @@ "আনইনষ্টল কৰক" "এপ্‌ সম্পৰ্কীয় তথ্য" "ইনষ্টল কৰক" - "এপৰ পৰামৰ্শ নিদিব" + "পৰামৰ্শ নিদিব" "পূৰ্বানুমান কৰা এপ্‌টো পিন কৰক" "শ্বৰ্টকাট ইনষ্টল কৰিব পাৰে" "ব্য়ৱহাৰকাৰীৰ হস্তক্ষেপ অবিহনেই কোনো এপক শ্বৰ্টকাটবোৰ যোগ কৰাৰ অনুমতি দিয়ে।" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index e4d46e4c97..600d66f0a8 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -74,7 +74,7 @@ "Odinstalovat" "O aplikaci" "Nainstalovat" - "Aplikaci nenavrhovat" + "Nenavrhovat aplikaci" "Připnout předpověď" "instalace zástupce" "Umožňuje aplikaci přidat zástupce bez zásahu uživatele." diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index a6856fcf4b..b371067d15 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -157,8 +157,8 @@ "Ignorer" "Fermer" "Notification ignorée" - "Personnelles" - "Professionnelles" + "Personnel" + "Professionnel" "Profil professionnel" "Les applis professionnelles sont identifiées par un badge et votre administrateur informatique peut les voir" "OK" diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 5e71f33930..e90e63a480 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -158,16 +158,16 @@ "बंद करें" "सूचना को खारिज किया गया" "निजी ऐप" - "काम से जुड़े ऐप" + "वर्क ऐप्लिकेशन" "वर्क प्रोफ़ाइल" - "ऑफ़िस के काम से जुड़े ऐप्लिकेशन बैज किए गए हैं और आईटी एडमिन को दिख रहे हैं" + "वर्क ऐप्लिकेशन बैज किए गए हैं और आईटी एडमिन को दिख रहे हैं" "ठीक है" - "ऑफ़िस के काम से जुड़े ऐप्लिकेशन रोके गए" - "ऑफ़िस के काम से जुड़े आपके ऐप्लिकेशन, आपको सूचनाएं नहीं भेज सकते. साथ ही, आपकी बैटरी का इस्तेमाल या आपकी जगह की जानकारी को ऐक्सेस भी नहीं कर सकते" + "वर्क ऐप्लिकेशन रोके गए" + "आपके वर्क ऐप्लिकेशन, आपको सूचनाएं नहीं भेज सकते. साथ ही, आपकी बैटरी का इस्तेमाल या आपकी जगह की जानकारी को ऐक्सेस भी नहीं कर सकते" "ऑफ़िस के काम से जुड़े ऐप्लिकेशन बंद हैं. ये ऐप्लिकेशन, आपको सूचनाएं नहीं भेज सकते. साथ ही, आपकी बैटरी का इस्तेमाल या आपकी जगह की जानकारी को ऐक्सेस भी नहीं कर सकते" "ऑफ़िस के काम से जुड़े ऐप्लिकेशन बैज किए गए हैं और आईटी एडमिन को दिख रहे हैं" "ठीक है" - "ऑफ़िस के काम से जुड़े ऐप्लिकेशन रोकें" + "वर्क ऐप्लिकेशन रोकें" "ऑफ़िस के काम से जुड़े ऐप्लिकेशन चालू करें" "फ़िल्टर" "अपने फ़ोन में खोजें" diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml index 44c3a96dc4..b8f16437a1 100644 --- a/res/values-hy/strings.xml +++ b/res/values-hy/strings.xml @@ -74,7 +74,7 @@ "Ապատեղադրել" "Հավելվածի մասին" "Տեղադրել" - "Թաքցնել առաջարկը" + "Չառաջարկել" "Ամրացնել առաջարկվող հավելվածը" "Դյուրանցումների տեղադրում" "Հավելվածին թույլ է տալիս ավելացնել դյուրանցումներ՝ առանց օգտագործողի միջամտության:" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 484be1f486..1a442a89dd 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -74,7 +74,7 @@ "アンインストール" "アプリ情報" "インストール" - "アプリの候補を表示しない" + "アプリを表示しない" "アプリの候補を固定" "ショートカットのインストール" "ユーザー操作なしでショートカットを追加することをアプリに許可します。" @@ -170,7 +170,7 @@ "仕事用アプリを一時停止" "仕事用アプリを ON にする" "フィルタ" - "スマートフォンの検索" + "スマートフォンを検索" "タブレットを探す" "失敗: %1$s" diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml index 84b79932a9..709160db0d 100644 --- a/res/values-ky/strings.xml +++ b/res/values-ky/strings.xml @@ -74,7 +74,7 @@ "Чыгарып салуу" "Колдонмо тууралуу" "Орнотуу" - "Колдонмо сунушталбасын" + "Cунушталбасын" "Божомолдонгон колдонмону кадап коюу" "тез чакырмаларды орнотуу" "Колдонмого колдонуучуга кайрылбастан тез чакырма кошууга уруксат берет." diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml index d6535ce06b..48f7355d38 100644 --- a/res/values-mr/strings.xml +++ b/res/values-mr/strings.xml @@ -160,14 +160,14 @@ "वैयक्तिक" "कार्य" "कार्य प्रोफाइल" - "कामाशी संबंधित ॲप्स ही बॅज केलेली असून तुमच्या आयटी ॲडमिनला दृश्यमान आहेत" + "कार्य ॲप्स ही बॅज केलेली असून तुमच्या आयटी ॲडमिनला दृश्यमान आहेत" "समजले" "कार्य ॲप्स थांबवली आहेत" "तुमची कार्य ॲप्स तुम्हाला सूचना पाठवू शकत नाहीत, तुमची बॅटरी वापरू शकत नाहीत किंवा तुमचे स्थान अ‍ॅक्सेस करू शकत नाहीत" "कामाशी संबंधित ॲप्स बंद आहेत. तुमचे कामाशी संबंधित ॲप्स तुम्हाला सूचना पाठवू शकत नाहीत, तुमची बॅटरी वापरू शकत नाहीत किंवा तुमचे स्थान अ‍ॅक्सेस करू शकत नाहीत" - "Work apps ही बॅज केलेली असून तुमच्या IT ॲडमिनला दृश्यमान आहेत" + "कार्य ॲप्स ही बॅज केलेली असून तुमच्या आयटी ॲडमिनला दृश्यमान आहेत" "समजले" - "Work apps थांबवा" + "कार्य ॲप्स थांबवा" "कार्य ॲप्स सुरू करा" "फिल्टर" "तुमच्या फोनमध्ये शोधा" diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml index bf663991d0..3cec97d170 100644 --- a/res/values-my/strings.xml +++ b/res/values-my/strings.xml @@ -74,7 +74,7 @@ "ဖယ်ရှားရန်" "အက်ပ်အချက်အလက်" "ထည့်သွင်းရန်" - "အက်ပ်ကို အကြံမပြုပါနှင့်" + "အက်ပ်အကြံမပြုပါနှင့်" "ခန့်မှန်းချက်ကို ပင်ထိုးရန်" "ဖြတ်လမ်းလင့်ခ်များ ထည့်သွင်းခြင်း" "အသုံးပြုသူ လုပ်ဆောင်မှုမရှိပဲ အပ်ပလီကေးရှင်းကို အတိုကောက်မှတ်သားမှုများ ပြုလုပ်ခွင့် ပေးခြင်း" @@ -114,7 +114,7 @@ "ဆက်တင်များ ပြောင်းရန်" "အကြောင်းကြားချက် အစက်များ ပြရန်" "တီထွင်သူ ရွေးစရာများ" - "ပင်မစာမျက်နှာတွင် အက်ပ်သင်္ကေတထည့်ရန်" + "ပင်မစာမျက်နှာတွင် အက်ပ်သင်္ကေတထည့်ခြင်း" "အက်ပ်အသစ်များအတွက်" "မသိ" "ဖယ်ရှားရန်" diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index 8cef63d5c0..6d48969f76 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -74,7 +74,7 @@ "अनइन्स्टल गर्नुहोस्" "एपसम्बन्धी जानकारी" "स्थापना गर्नुहोस्" - "यो एप सिफारिस नगरियोस्" + "एप सिफारिस नगरियोस्" "सिफारिस गरिएको एप पिन गर्नुहोस्" "सर्टकट स्थापना गर्नेहोस्" "प्रयोगकर्ताको हस्तक्षेप बिना एउटा एपलाई सर्टकटमा थप्नको लागि अनुमति दिनुहोस्।" diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml index dd5561daa3..812d2499d6 100644 --- a/res/values-or/strings.xml +++ b/res/values-or/strings.xml @@ -26,7 +26,7 @@ "ନିରାପଦ ମୋଡରେ ଡାଉନଲୋଡ୍‌ ହେଇଥିବା ଆପ୍‌ ଅକ୍ଷମ କରାଗଲା" "ନିରାପଦ ମୋଡରେ ୱିଜେଟ୍‌ ଅକ୍ଷମ କରାଗଲା" "ଶର୍ଟକଟ୍‌ ଉପଲବ୍ଧ ନାହିଁ" - "ମୂଳପୃଷ୍ଠା" + "ହୋମ" "ସ୍କ୍ରିନ‌କୁ ସ୍ପ୍ଲିଟ୍ କରନ୍ତୁ" "ଶୀର୍ଷକୁ ସ୍ପ୍ଲିଟ କରନ୍ତୁ" "ବାମପତକୁ ସ୍ପ୍ଲିଟ କରନ୍ତୁ" @@ -37,9 +37,9 @@ "%1$d × %2$d" "%1$d ଓସାର ଓ %2$d ଉଚ୍ଚ" "%1$s ୱିଜେଟ୍" - "ମୂଳସ୍କ୍ରିନର ଆଖପାଖରେ ୱିଜେଟକୁ ମୁଭ କରିବା ପାଇଁ ଏହାକୁ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ" + "ହୋମ ସ୍କ୍ରିନର ଆଖପାଖରେ ୱିଜେଟକୁ ମୁଭ କରିବା ପାଇଁ ଏହାକୁ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ" "ହୋମ ସ୍କ୍ରିନରେ ଯୋଗ କରନ୍ତୁ" - "%1$sର ୱିଜେଟ୍ ମୂଳସ୍କ୍ରିନରେ ଯୋଡ଼ାଗଲା" + "%1$sର ୱିଜେଟ ହୋମ ସ୍କ୍ରିନରେ ଯୋଡ଼ାଗଲା" "{count,plural, =1{#ଟି ୱିଜେଟ୍}other{#ଟି ୱିଜେଟ୍}}" "{count,plural, =1{#ଟି ସର୍ଟକଟ୍}other{#ଟି ସର୍ଟକଟ୍}}" "%1$s, %2$s" @@ -52,7 +52,7 @@ "ୱାର୍କ" "ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ" "ଉପଯୋଗୀ ସୂଚନା ଆପଣଙ୍କ ପାଖରେ ସହଜରେ ଉପଲବ୍ଧ" - "ଆପ୍ସକୁ ନଖୋଲି ସୂଚନା ପାଇବା ପାଇଁ, ଆପଣ ଆପଣଙ୍କ ମୂଳସ୍କ୍ରିନରେ ୱିଜେଟଗୁଡ଼ିକୁ ଯୋଗ କରିପାରିବେ" + "ଆପ୍ସକୁ ନଖୋଲି ସୂଚନା ପାଇବା ପାଇଁ, ଆପଣ ଆପଣଙ୍କ ହୋମ ସ୍କ୍ରିନରେ ୱିଜେଟଗୁଡ଼ିକୁ ଯୋଗ କରିପାରିବେ" "ୱିଜେଟ ସେଟିଂସ ପରିବର୍ତ୍ତନ କରିବାକୁ ଟାପ କରନ୍ତୁ" "ବୁଝିଗଲି" "ୱିଜେଟ ସେଟିଂସ ପରିବର୍ତ୍ତନ କରନ୍ତୁ" @@ -64,7 +64,7 @@ "ବିଜ୍ଞପ୍ତି" "ଏକ ସର୍ଟକଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ।" "ଏକ ସର୍ଟକଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ଦୁଇଥର-ଟାପ୍ କରି ଧରି ରଖନ୍ତୁ କିମ୍ବା କଷ୍ଟମ୍ କାର୍ଯ୍ୟଗୁଡ଼ିକୁ ବ୍ୟବହାର କରନ୍ତୁ।" - "ଏହି ମୂଳସ୍କ୍ରିନରେ ଆଉ ଜାଗା ନାହିଁ" + "ଏହି ହୋମ ସ୍କ୍ରିନରେ ଆଉ ଜାଗା ନାହିଁ" "ମନପସନ୍ଦ ଟ୍ରେରେ ଆଉ କୋଠରୀ ନାହିଁ" "ଆପ୍‌ ତାଲିକା" "ସନ୍ଧାନ ଫଳାଫଳ" @@ -74,14 +74,14 @@ "ଅନଇନଷ୍ଟଲ୍‌ କରନ୍ତୁ" "ଆପ୍‌ ସୂଚନା" "ଇନଷ୍ଟଲ୍‌ କରନ୍ତୁ" - "ଆପ୍ ପରାମର୍ଶ ଦିଅନ୍ତୁ ନାହିଁ" + "ଆପ ପରାମର୍ଶ ଦିଅନ୍ତୁ ନାହିଁ" "ପୂର୍ବାନୁମାନକୁ ପିନ୍ କରନ୍ତୁ" "ସର୍ଟକଟ୍‍ ଇନଷ୍ଟଲ୍‌ କରନ୍ତୁ" "ୟୁଜରଙ୍କ ବିନା ହସ୍ତକ୍ଷେପରେ ଶର୍ଟକଟ୍‌ ଯୋଡ଼ିବାକୁ ଆପକୁ ଅନୁମତି ଦିଏ।" - "ମୂଳପୃଷ୍ଠା ସେଟିଂସ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକୁ ପଢ଼ନ୍ତୁ" - "ମୂଳପୃଷ୍ଠାରେ ଥିବା ସେଟିଂସ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକୁ ପଢ଼ିବା ପାଇଁ ଆପକୁ ଅନୁମତି ଦିଏ।" - "ମୂଳପୃଷ୍ଠା ସେଟିଂସ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକୁ ଲେଖନ୍ତୁ" - "ମୂଳପୃଷ୍ଠାରେ ଥିବା ସେଟିଂସ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକୁ ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ ଆପକୁ ଅନୁମତି ଦିଏ।" + "ହୋମ ସେଟିଂସ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକୁ ପଢ଼ନ୍ତୁ" + "ହୋମରେ ଥିବା ସେଟିଂସ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକୁ ପଢ଼ିବା ପାଇଁ ଆପକୁ ଅନୁମତି ଦିଏ।" + "ହୋମ ସେଟିଂସ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକୁ ଲେଖନ୍ତୁ" + "ହୋମରେ ଥିବା ସେଟିଂସ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକୁ ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ ଆପକୁ ଅନୁମତି ଦିଏ।" "ଫୋନ୍‌ କଲ୍‌ କରିବାକୁ %1$sକୁ ଅନୁମତି ଦିଆଯାଇ ନାହିଁ" "ୱିଜେଟ୍ ଲୋଡ୍ କରାଯାଇପାରିବ ନାହିଁ" "ୱିଜେଟ ସେଟିଂସ" @@ -91,8 +91,8 @@ "%1$s ଅକ୍ଷମ କରାଗଲା" "{count,plural, =1{{app_name}ର #ଟି ବିଜ୍ଞପ୍ତି ଅଛି}other{{app_name}ର #ଟି ବିଜ୍ଞପ୍ତି ଅଛି}}" "ମୋଟ %2$dରୁ %1$d ନମ୍ବର ପୃଷ୍ଠା" - "%2$dରୁ %1$d ହୋମ୍‌ ସ୍କ୍ରୀନ୍" - "ନୂଆ ହୋମ୍‌ ସ୍କ୍ରୀନ୍‌ ପୃଷ୍ଠା" + "%2$dରୁ %1$d ହୋମ ସ୍କ୍ରିନ" + "ନୂଆ ହୋମ ସ୍କ୍ରିନ ପେଜ" "%2$d / %1$dର ଫୋଲ୍ଡର ଖୋଲାଗଲା" "ଫୋଲ୍ଡର୍‌ ବନ୍ଦ କରିବାକୁ ଟାପ୍‌ କରନ୍ତୁ" "ନାମ ବଦଳାଇବା ସେଭ୍ କରିବାକୁ ଟାପ୍‌ କରନ୍ତୁ" @@ -104,7 +104,7 @@ "ୱାଲପେପର ଏବଂ ଷ୍ଟାଇଲ" "ହୋମ ସେଟିଂସ" "ଆପଣଙ୍କ ଆଡମିନଙ୍କ ଦ୍ୱାରା ଅକ୍ଷମ କରାଯାଇଛି" - "ମୂଳସ୍କ୍ରିନ ରୋଟେସନକୁ ଅନୁମତି ଦିଅନ୍ତୁ" + "ହୋମ ସ୍କ୍ରିନ ରୋଟେସନକୁ ଅନୁମତି ଦିଅନ୍ତୁ" "ଯେତେବେଳେ ଫୋନକୁ ବୁଲାଯାଇଥାଏ" "ବିଜ୍ଞପ୍ତି ଡଟ୍ସ" "ଚାଲୁ" @@ -114,7 +114,7 @@ "ସେଟିଂସ ପରିବର୍ତ୍ତନ କରନ୍ତୁ" "ବିଜ୍ଞପ୍ତି ଡଟ୍‌ଗୁଡ଼ିକୁ ଦେଖାନ୍ତୁ" "ଡେଭେଲପର ବିକଳ୍ପଗୁଡ଼ିକ" - "ମୂଳସ୍କ୍ରିନରେ ଆପ ଆଇକନଗୁଡ଼ିକୁ ଯୋଗ କରନ୍ତୁ" + "ହୋମ ସ୍କ୍ରିନରେ ଆପ ଆଇକନଗୁଡ଼ିକୁ ଯୋଗ କରନ୍ତୁ" "ନୂଆ ଆପ୍‌ ପାଇଁ" "ଅଜଣା" "କାଢ଼ି ଦିଅନ୍ତୁ" @@ -132,7 +132,7 @@ "ୱିଜେଟ୍ ତାଲିକା ବନ୍ଦ ହୋଇଛି" "ହୋମ ସ୍କ୍ରିନରେ ଯୋଗ କରନ୍ତୁ" "ଆଇଟମ୍‌କୁ ଏଠାକୁ ଘୁଞ୍ଚାନ୍ତୁ" - "ହୋମ୍‌ ସ୍କ୍ରୀନରେ ଆଇଟମ୍‌ ଯୋଡ଼ାଗଲା" + "ହୋମ ସ୍କ୍ରିନରେ ଆଇଟମ ଯୋଗ କରାଗଲା" "ଆଇଟମକୁ କାଢ଼ି ଦିଆଯାଇଛି" "ପୂର୍ବବତ୍‍" "ଆଇଟମ୍‌ ଘୁଞ୍ଚାନ୍ତୁ" @@ -145,7 +145,7 @@ "ଫୋଲ୍ଡରରେ ଆଇଟମ୍‌ ଯୋଡ଼ାଗଲା" "ଏହି ନାମରେ ଫୋଲ୍ଡର ତିଆରି କରନ୍ତୁ: %1$s" "ଫୋଲ୍ଡର ତିଆରି କରାଗଲା" - "ମୂଳସ୍କ୍ରିନକୁ ମୁଭ କରନ୍ତୁ" + "ହୋମ ସ୍କ୍ରିନକୁ ମୁଭ କରନ୍ତୁ" "ଆକାର ବଦଳାନ୍ତୁ" "ଚଉଡ଼ା ବଢ଼ାନ୍ତୁ" "ଉଚ୍ଚତା ବଢ଼ାନ୍ତୁ" @@ -160,14 +160,14 @@ "ବ୍ୟକ୍ତିଗତ" "ୱାର୍କ" "ୱର୍କ ପ୍ରୋଫାଇଲ୍‌" - "ୱାର୍କ ଆପଗୁଡ଼ିକୁ ବ୍ୟାଜ୍ କରାଯାଇଛି ଏବଂ ସେଗୁଡ଼ିକ ଆପଣଙ୍କ IT ଆଡମିନଙ୍କୁ ଦୃଶ୍ୟମାନ ହେଉଛି" + "ୱାର୍କ ଆପ୍ସ ବ୍ୟାଜ୍ କରାଯାଇଛି ଏବଂ ସେଗୁଡ଼ିକ ଆପଣଙ୍କ IT ଆଡମିନଙ୍କୁ ଦୃଶ୍ୟମାନ ହେଉଛି" "ବୁଝିଗଲି" "ୱାର୍କ ଆପ୍ସ ବିରତ କରାଯାଇଛି" - "ଆପଣଙ୍କ ୱାର୍କ ଆପଗୁଡ଼ିକ ଆପଣଙ୍କୁ ବିଜ୍ଞପ୍ତି ପଠାଇପାରିବ ନାହିଁ, ଆପଣଙ୍କ ବ୍ୟାଟେରୀକୁ ବ୍ୟବହାର କରିପାରିବ ନାହିଁ କିମ୍ବା ଆପଣଙ୍କର ଲୋକେସନକୁ ଆକ୍ସେସ୍ କରିପାରିବ ନାହିଁ" + "ଆପଣଙ୍କ ୱାର୍କ ଆପ୍ସ ଆପଣଙ୍କୁ ବିଜ୍ଞପ୍ତି ପଠାଇପାରିବ ନାହିଁ, ଆପଣଙ୍କ ବ୍ୟାଟେରୀକୁ ବ୍ୟବହାର କରିପାରିବ ନାହିଁ କିମ୍ବା ଆପଣଙ୍କର ଲୋକେସନକୁ ଆକ୍ସେସ କରିପାରିବ ନାହିଁ" "ୱାର୍କ ଆପଗୁଡ଼ିକ ବନ୍ଦ ଅଛି। ଆପଣଙ୍କ ୱାର୍କ ଆପଗୁଡ଼ିକ ଆପଣଙ୍କୁ ବିଜ୍ଞପ୍ତି ପଠାଇପାରିବ ନାହିଁ, ଆପଣଙ୍କ ବ୍ୟାଟେରୀକୁ ବ୍ୟବହାର କରିପାରିବ ନାହିଁ କିମ୍ବା ଆପଣଙ୍କର ଲୋକେସନକୁ ଆକ୍ସେସ୍ କରିପାରିବ ନାହିଁ" - "ୱାର୍କ ଆପଗୁଡ଼ିକୁ ବ୍ୟାଜ୍ କରାଯାଇଛି ଏବଂ ଆପଣଙ୍କ IT ଆଡମିନଙ୍କୁ ଦେଖାଯାଉଛି" + "ୱାର୍କ ଆପ୍ସ ବ୍ୟାଜ୍ କରାଯାଇଛି ଏବଂ ଆପଣଙ୍କ IT ଆଡମିନଙ୍କୁ ଦେଖାଯାଉଛି" "ବୁଝିଗଲି" - "ୱାର୍କ ଆପଗୁଡ଼ିକୁ ବିରତ କରନ୍ତୁ" + "ୱାର୍କ ଆପ୍ସ ବିରତ କରନ୍ତୁ" "ୱାର୍କ ଆପଗୁଡ଼ିକୁ ଚାଲୁ କରନ୍ତୁ" "ଫିଲ୍ଟର୍" "ଆପଣଙ୍କ ଫୋନରେ ସନ୍ଧାନ କରନ୍ତୁ" diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index a291a92cb1..8e55b87e3e 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -167,7 +167,7 @@ "ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਬੰਦ ਹਨ। ਤੁਹਾਡੀਆਂ ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਤੁਹਾਨੂੰ ਸੂਚਨਾਵਾਂ ਨਹੀਂ ਭੇਜ ਸਕਦੀਆਂ, ਤੁਹਾਡੀ ਬੈਟਰੀ ਨਹੀਂ ਵਰਤ ਸਕਦੀਆਂ ਜਾਂ ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਨਹੀਂ ਕਰ ਸਕਦੀਆਂ" "ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਨੂੰ ਬੈਜ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਅਤੇ ਇਹ ਤੁਹਾਡੇ ਆਈ.ਟੀ. ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਦਿਸਣਗੀਆਂ" "ਸਮਝ ਲਿਆ" - "ਕੰਮ ਸੰਬੰਧੀ ਐਪ ਰੋਕੋ" + "ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਰੋਕੋ" "ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਚਾਲੂ ਕਰੋ" "ਫਿਲਟਰ" "ਆਪਣਾ ਫ਼ੋਨ ਖੋਜੋ" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index e2d8c9d543..bb1fb36b77 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -167,7 +167,7 @@ "As apps de trabalho estão desativadas. As apps de trabalho não podem enviar-lhe notificações, utilizar a bateria ou aceder à sua localização" "As apps de trabalho têm um emblema e estão visíveis para o seu administrador de TI" "OK" - "Colocar apps de trabalho em pausa" + "Pausar apps de trabalho" "Ativar apps de trabalho" "Filtrar" "Pesquise no telemóvel" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index ff2c2266b2..69fa362567 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -114,7 +114,7 @@ "Zmeniť nastavenia" "Zobrazovať bodky upozornení" "Pre vývojárov" - "Pridať ikony aplikácií na plochu" + "Pridávať ikony aplikácií na plochu" "Pri inštalácii novej aplikácie" "Neznáme" "Odstrániť" diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml index 08bccadc4f..e70466f24b 100644 --- a/res/values-te/strings.xml +++ b/res/values-te/strings.xml @@ -74,7 +74,7 @@ "అన్ఇన్‌స్టాల్ చేయండి" "యాప్ సమాచారం" "ఇన్‌స్టాల్ చేయండి" - "యాప్‌ను సూచించవద్దు" + "యాప్ సూచించకు" "సూచనను పిన్ చేయండి" "షార్ట్‌కట్‌లను ఇన్‌స్టాల్ చేయడం" "వినియోగదారు ప్రమేయం లేకుండా షార్ట్‌కట్‌లను జోడించడానికి యాప్‌ను అనుమతిస్తుంది." diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index deb4834dc1..ffeb20c0d1 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -102,7 +102,7 @@ "โฟลเดอร์: %1$s, อย่างน้อย %2$d รายการ" "วอลเปเปอร์" "วอลเปเปอร์และรูปแบบ" - "การตั้งค่าหน้าแรก" + "การตั้งค่าหน้าจอหลัก" "ปิดใช้โดยผู้ดูแลระบบ" "อนุญาตให้หมุนหน้าจอหลัก" "เมื่อหมุนโทรศัพท์" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 70f8e95e74..2f79f23a4f 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -114,7 +114,7 @@ "Змінити налаштування" "Показувати значки сповіщень" "Параметри розробника" - "Розміщати значки додатків на головний екран" + "Розміщати значки додатків на головному екрані" "Для нових додатків" "Невідомо" "Прибрати" From 93c710b9aca224e5074d3b60df37ed8771e2cdf5 Mon Sep 17 00:00:00 2001 From: Sukesh Ram Date: Mon, 23 May 2022 18:59:03 +0000 Subject: [PATCH 06/12] Added debug menu option for testing secondary display. Test: manual Fix: 233639924 Change-Id: Iaca90a1391078d56bd57fa5de097f34ec0425866 (cherry picked from commit aed1b074f394a08f821d2fba86a0cba0e8c5c233) --- .../launcher3/settings/DeveloperOptionsFragment.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java index b06b8a10bf..6057586fca 100644 --- a/src/com/android/launcher3/settings/DeveloperOptionsFragment.java +++ b/src/com/android/launcher3/settings/DeveloperOptionsFragment.java @@ -63,6 +63,7 @@ import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.config.FlagTogglerPrefUi; +import com.android.launcher3.secondarydisplay.SecondaryDisplayLauncher; import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper; import com.android.launcher3.util.OnboardingPrefs; @@ -369,6 +370,16 @@ public class DeveloperOptionsFragment extends PreferenceFragmentCompat { return true; }); sandboxCategory.addPreference(launchSandboxModeTutorialPreference); + + Preference launchSecondaryDisplayPreference = new Preference(context); + launchSecondaryDisplayPreference.setKey("launchSecondaryDisplay"); + launchSecondaryDisplayPreference.setTitle("Launch Secondary Display"); + launchSecondaryDisplayPreference.setSummary("Launch secondary display activity"); + launchSecondaryDisplayPreference.setOnPreferenceClickListener(preference -> { + startActivity(new Intent(context, SecondaryDisplayLauncher.class)); + return true; + }); + sandboxCategory.addPreference(launchSecondaryDisplayPreference); } private void addOnboardingPrefsCatergory() { From 023b973d152d628383fc5ae015082d86d6571ccc Mon Sep 17 00:00:00 2001 From: Pinyao Ting Date: Fri, 19 Aug 2022 10:53:40 -0700 Subject: [PATCH 07/12] Explicit Nullbility in Launcher (Part 2) This CL updates the nullabality on methods associated with IconCache in Launcher. Bug: 242895652 Test: manual Change-Id: I4832c0950141c8a52c8a9e62659ccabb082897c8 --- .../appprediction/InstantAppItemInfo.java | 4 ++++ .../launcher3/icons/ComponentWithLabel.java | 14 +++++++++---- .../icons/ComponentWithLabelAndIcon.java | 3 ++- .../android/launcher3/icons/IconCache.java | 21 +++++++++++++------ .../icons/LauncherActivityCachingLogic.java | 14 +++++++++---- .../launcher3/icons/ShortcutCachingLogic.java | 19 +++++++++++------ .../android/launcher3/model/data/AppInfo.java | 4 ++-- .../model/CacheDataUpdatedTaskTest.java | 11 ++++++---- 8 files changed, 63 insertions(+), 27 deletions(-) diff --git a/quickstep/src/com/android/launcher3/appprediction/InstantAppItemInfo.java b/quickstep/src/com/android/launcher3/appprediction/InstantAppItemInfo.java index 9c3b8816cb..8baee004cc 100644 --- a/quickstep/src/com/android/launcher3/appprediction/InstantAppItemInfo.java +++ b/quickstep/src/com/android/launcher3/appprediction/InstantAppItemInfo.java @@ -22,6 +22,8 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import androidx.annotation.NonNull; + import com.android.launcher3.LauncherSettings; import com.android.launcher3.model.data.AppInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; @@ -33,11 +35,13 @@ public class InstantAppItemInfo extends AppInfo { this.componentName = new ComponentName(packageName, COMPONENT_CLASS_MARKER); } + @NonNull @Override public ComponentName getTargetComponent() { return componentName; } + @NonNull @Override public WorkspaceItemInfo makeWorkspaceItem(Context context) { WorkspaceItemInfo workspaceItemInfo = super.makeWorkspaceItem(context); diff --git a/src/com/android/launcher3/icons/ComponentWithLabel.java b/src/com/android/launcher3/icons/ComponentWithLabel.java index 372c59166e..30575fcbe5 100644 --- a/src/com/android/launcher3/icons/ComponentWithLabel.java +++ b/src/com/android/launcher3/icons/ComponentWithLabel.java @@ -20,6 +20,8 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.UserHandle; +import androidx.annotation.NonNull; + import com.android.launcher3.icons.cache.CachingLogic; public interface ComponentWithLabel { @@ -42,22 +44,26 @@ public interface ComponentWithLabel { } @Override - public ComponentName getComponent(T object) { + @NonNull + public ComponentName getComponent(@NonNull T object) { return object.getComponent(); } + @NonNull @Override - public UserHandle getUser(T object) { + public UserHandle getUser(@NonNull T object) { return object.getUser(); } + @NonNull @Override - public CharSequence getLabel(T object) { + public CharSequence getLabel(@NonNull T object) { return object.getLabel(mPackageManager); } + @NonNull @Override - public BitmapInfo loadIcon(Context context, T object) { + public BitmapInfo loadIcon(@NonNull Context context, @NonNull T object) { return BitmapInfo.LOW_RES_INFO; } diff --git a/src/com/android/launcher3/icons/ComponentWithLabelAndIcon.java b/src/com/android/launcher3/icons/ComponentWithLabelAndIcon.java index c8606b1002..0a52dd7191 100644 --- a/src/com/android/launcher3/icons/ComponentWithLabelAndIcon.java +++ b/src/com/android/launcher3/icons/ComponentWithLabelAndIcon.java @@ -41,7 +41,8 @@ public interface ComponentWithLabelAndIcon extends ComponentWithLabel { @NonNull @Override - public BitmapInfo loadIcon(Context context, ComponentWithLabelAndIcon object) { + public BitmapInfo loadIcon(@NonNull Context context, + @NonNull ComponentWithLabelAndIcon object) { Drawable d = object.getFullResIcon(LauncherAppState.getInstance(context) .getIconCache()); if (d == null) { diff --git a/src/com/android/launcher3/icons/IconCache.java b/src/com/android/launcher3/icons/IconCache.java index 7621dc206b..0b4a4a53d4 100644 --- a/src/com/android/launcher3/icons/IconCache.java +++ b/src/com/android/launcher3/icons/IconCache.java @@ -118,15 +118,16 @@ public class IconCache extends BaseIconCache { } @Override - protected long getSerialNumberForUser(UserHandle user) { + protected long getSerialNumberForUser(@NonNull UserHandle user) { return mUserManager.getSerialNumberForUser(user); } @Override - protected boolean isInstantApp(ApplicationInfo info) { + protected boolean isInstantApp(@NonNull ApplicationInfo info) { return mInstantAppResolver.isInstantApp(info); } + @NonNull @Override public BaseIconFactory getIconFactory() { return LauncherIcons.obtain(mContext); @@ -135,7 +136,8 @@ public class IconCache extends BaseIconCache { /** * Updates the entries related to the given package in memory and persistent DB. */ - public synchronized void updateIconsForPkg(String packageName, UserHandle user) { + public synchronized void updateIconsForPkg(@NonNull final String packageName, + @NonNull final UserHandle user) { removeIconsForPkg(packageName, user); try { PackageInfo info = mPackageManager.getPackageInfo(packageName, @@ -471,7 +473,7 @@ public class IconCache extends BaseIconCache { * Fill in {@param infoInOut} with the corresponding icon and label. */ public synchronized void getTitleAndIconForApp( - PackageItemInfo infoInOut, boolean useLowResIcon) { + @NonNull final PackageItemInfo infoInOut, final boolean useLowResIcon) { CacheEntry entry = getEntryForPackageLocked( infoInOut.packageName, infoInOut.user, useLowResIcon); applyCacheEntry(entry, infoInOut); @@ -510,10 +512,16 @@ public class IconCache extends BaseIconCache { return bitmap.withFlags(getUserFlagOpLocked(user)); } - protected void applyCacheEntry(CacheEntry entry, ItemInfoWithIcon info) { + protected void applyCacheEntry(@NonNull final CacheEntry entry, + @NonNull final ItemInfoWithIcon info) { info.title = Utilities.trim(entry.title); info.contentDescription = entry.contentDescription; - info.bitmap = (entry.bitmap == null) ? getDefaultIcon(info.user) : entry.bitmap; + info.bitmap = entry.bitmap; + if (entry.bitmap == null) { + // TODO: entry.bitmap can never be null, so this should not happen at all. + Log.wtf(TAG, "Cannot find bitmap from the cache, default icon was loaded."); + info.bitmap = getDefaultIcon(info.user); + } } public Drawable getFullResIcon(LauncherActivityInfo info) { @@ -526,6 +534,7 @@ public class IconCache extends BaseIconCache { } @Override + @NonNull protected String getIconSystemState(String packageName) { return mIconProvider.getSystemStateForPackage(mSystemState, packageName); } diff --git a/src/com/android/launcher3/icons/LauncherActivityCachingLogic.java b/src/com/android/launcher3/icons/LauncherActivityCachingLogic.java index 4b8c1ad590..406f69758c 100644 --- a/src/com/android/launcher3/icons/LauncherActivityCachingLogic.java +++ b/src/com/android/launcher3/icons/LauncherActivityCachingLogic.java @@ -20,6 +20,8 @@ import android.content.Context; import android.content.pm.LauncherActivityInfo; import android.os.UserHandle; +import androidx.annotation.NonNull; + import com.android.launcher3.LauncherAppState; import com.android.launcher3.R; import com.android.launcher3.icons.BaseIconFactory.IconOptions; @@ -40,23 +42,27 @@ public class LauncherActivityCachingLogic R.string.launcher_activity_logic_class); } + @NonNull @Override - public ComponentName getComponent(LauncherActivityInfo object) { + public ComponentName getComponent(@NonNull LauncherActivityInfo object) { return object.getComponentName(); } + @NonNull @Override - public UserHandle getUser(LauncherActivityInfo object) { + public UserHandle getUser(@NonNull LauncherActivityInfo object) { return object.getUser(); } + @NonNull @Override - public CharSequence getLabel(LauncherActivityInfo object) { + public CharSequence getLabel(@NonNull LauncherActivityInfo object) { return object.getLabel(); } + @NonNull @Override - public BitmapInfo loadIcon(Context context, LauncherActivityInfo object) { + public BitmapInfo loadIcon(@NonNull Context context, @NonNull LauncherActivityInfo object) { try (LauncherIcons li = LauncherIcons.obtain(context)) { return li.createBadgedIconBitmap(LauncherAppState.getInstance(context) .getIconProvider().getIcon(object, li.mFillResIconDpi), diff --git a/src/com/android/launcher3/icons/ShortcutCachingLogic.java b/src/com/android/launcher3/icons/ShortcutCachingLogic.java index 1e46344725..4890ba6d8a 100644 --- a/src/com/android/launcher3/icons/ShortcutCachingLogic.java +++ b/src/com/android/launcher3/icons/ShortcutCachingLogic.java @@ -29,6 +29,7 @@ import android.text.TextUtils; import android.util.Log; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.android.launcher3.LauncherAppState; import com.android.launcher3.icons.cache.CachingLogic; @@ -43,29 +44,34 @@ public class ShortcutCachingLogic implements CachingLogic { private static final String TAG = "ShortcutCachingLogic"; @Override - public ComponentName getComponent(ShortcutInfo info) { + @NonNull + public ComponentName getComponent(@NonNull ShortcutInfo info) { return ShortcutKey.fromInfo(info).componentName; } + @NonNull @Override - public UserHandle getUser(ShortcutInfo info) { + public UserHandle getUser(@NonNull ShortcutInfo info) { return info.getUserHandle(); } + @NonNull @Override - public CharSequence getLabel(ShortcutInfo info) { + public CharSequence getLabel(@NonNull ShortcutInfo info) { return info.getShortLabel(); } @Override - public CharSequence getDescription(ShortcutInfo object, CharSequence fallback) { + @NonNull + public CharSequence getDescription(@NonNull ShortcutInfo object, + @NonNull CharSequence fallback) { CharSequence label = object.getLongLabel(); return TextUtils.isEmpty(label) ? fallback : label; } @NonNull @Override - public BitmapInfo loadIcon(Context context, ShortcutInfo info) { + public BitmapInfo loadIcon(@NonNull Context context, @NonNull ShortcutInfo info) { try (LauncherIcons li = LauncherIcons.obtain(context)) { Drawable unbadgedDrawable = ShortcutCachingLogic.getIcon( context, info, LauncherAppState.getIDP(context).fillResIconDpi); @@ -76,7 +82,8 @@ public class ShortcutCachingLogic implements CachingLogic { } @Override - public long getLastUpdatedTime(ShortcutInfo shortcutInfo, PackageInfo info) { + public long getLastUpdatedTime(@Nullable ShortcutInfo shortcutInfo, + @NonNull PackageInfo info) { if (shortcutInfo == null) { return info.lastUpdateTime; } diff --git a/src/com/android/launcher3/model/data/AppInfo.java b/src/com/android/launcher3/model/data/AppInfo.java index 5b2bcf5819..24e7dd3c92 100644 --- a/src/com/android/launcher3/model/data/AppInfo.java +++ b/src/com/android/launcher3/model/data/AppInfo.java @@ -29,7 +29,6 @@ import android.os.UserHandle; import android.os.UserManager; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import com.android.launcher3.LauncherSettings; @@ -55,6 +54,7 @@ public class AppInfo extends ItemInfoWithIcon implements WorkspaceItemFactory { */ public Intent intent; + @NonNull public ComponentName componentName; // Section name used for indexing. @@ -151,7 +151,7 @@ public class AppInfo extends ItemInfoWithIcon implements WorkspaceItemFactory { | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED); } - @Nullable + @NonNull @Override public ComponentName getTargetComponent() { return componentName; diff --git a/tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java b/tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java index 960d27d27f..7d36740734 100644 --- a/tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java +++ b/tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java @@ -64,23 +64,26 @@ public class CacheDataUpdatedTaskTest { IconCache iconCache = LauncherAppState.getInstance(context).getIconCache(); CachingLogic placeholderLogic = new CachingLogic() { @Override - public ComponentName getComponent(ItemInfo info) { + @NonNull + public ComponentName getComponent(@NonNull ItemInfo info) { return info.getTargetComponent(); } + @NonNull @Override - public UserHandle getUser(ItemInfo info) { + public UserHandle getUser(@NonNull ItemInfo info) { return info.user; } + @NonNull @Override - public CharSequence getLabel(ItemInfo info) { + public CharSequence getLabel(@NonNull ItemInfo info) { return NEW_LABEL_PREFIX + info.id; } @NonNull @Override - public BitmapInfo loadIcon(Context context, ItemInfo info) { + public BitmapInfo loadIcon(@NonNull Context context, @NonNull ItemInfo info) { return BitmapInfo.of(Bitmap.createBitmap(1, 1, Config.ARGB_8888), Color.RED); } }; From d4a60b394f4fb3aa27f05e1df0c09508794d0545 Mon Sep 17 00:00:00 2001 From: Brandon Dayauon Date: Thu, 11 Aug 2022 19:46:51 +0000 Subject: [PATCH 08/12] Fix jumpiness when dragging surface down and up. Currently the overshoot only works when you first open all apps and try to extend the all apps to the top (making it overshoot). This pull works when you go mFromState:Normal -> mToState:AllApps. However once the all apps is set and you move the surface down then up..that overshoot animation jumps AFTER your finger goes all the way up and off the screen. At this point, once all apps is completely opened.. the states are mFromState:AllApps -> mToState:Normal. Now with this change, it addresses the jumpiness by considering the current states (mFromState==AllApps) by including the same onPull() but with different calculations bug: 240669628 test: manual - videos included in bug thread Change-Id: I7873f1ec22574f87fab3d2f11d1f5a5f81dfb5bc --- .../launcher3/touch/AbstractStateChangeTouchController.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java index 09b8228182..8f7a4ecfd1 100644 --- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java +++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java @@ -32,6 +32,7 @@ import static com.android.launcher3.util.window.RefreshRateTracker.getSingleFram import android.animation.Animator.AnimatorListener; import android.animation.ValueAnimator; +import android.util.Log; import android.view.MotionEvent; import com.android.launcher3.Launcher; @@ -211,6 +212,10 @@ public abstract class AbstractStateChangeTouchController mFlingBlockCheck.blockFling(); } } + if (mFromState == LauncherState.ALL_APPS) { + mAllAppsOvershootStarted = true; + mLauncher.getAppsView().onPull(-progress , -progress); + } } else if (progress >= 1) { if (reinitCurrentAnimation(true, isDragTowardPositive)) { mDisplacementShift = displacement; From 7d63654691749314132c429f673a8122de73ca5d Mon Sep 17 00:00:00 2001 From: hyunyoungs Date: Tue, 23 Aug 2022 11:03:04 -0700 Subject: [PATCH 09/12] Remove autofill from launcher edittext boxes Bug: 214482595 Test: notifyEnterOrExitForAutoFillIfNeeded not called Change-Id: I2a988b36d1f06036cb68255bb98aab13bb6d8b73 --- res/layout/search_container_all_apps.xml | 1 + res/layout/secondary_launcher.xml | 1 + res/layout/user_folder_icon_normalized.xml | 1 + res/layout/widgets_search_bar.xml | 1 + 4 files changed, 4 insertions(+) diff --git a/res/layout/search_container_all_apps.xml b/res/layout/search_container_all_apps.xml index e1646ba43e..b46298cfdb 100644 --- a/res/layout/search_container_all_apps.xml +++ b/res/layout/search_container_all_apps.xml @@ -26,6 +26,7 @@ android:gravity="center" android:hint="@string/all_apps_search_bar_hint" android:imeOptions="actionSearch|flagNoExtractUi" + android:importantForAutofill="no" android:inputType="text|textNoSuggestions|textCapWords" android:maxLines="1" android:padding="8dp" diff --git a/res/layout/secondary_launcher.xml b/res/layout/secondary_launcher.xml index 635db141dd..021325549b 100644 --- a/res/layout/secondary_launcher.xml +++ b/res/layout/secondary_launcher.xml @@ -119,6 +119,7 @@ android:gravity="center" android:hint="@string/all_apps_search_bar_hint" android:imeOptions="actionSearch|flagNoExtractUi" + android:importantForAutofill="no" android:inputType="text|textNoSuggestions|textCapWords" android:maxLines="1" android:padding="8dp" diff --git a/res/layout/user_folder_icon_normalized.xml b/res/layout/user_folder_icon_normalized.xml index 337014ace8..87bf33df8b 100644 --- a/res/layout/user_folder_icon_normalized.xml +++ b/res/layout/user_folder_icon_normalized.xml @@ -47,6 +47,7 @@ android:gravity="center_horizontal" android:hint="@string/folder_hint_text" android:imeOptions="flagNoExtractUi" + android:importantForAutofill="no" android:singleLine="true" android:textColor="?attr/folderTextColor" android:textColorHighlight="?android:attr/colorControlHighlight" diff --git a/res/layout/widgets_search_bar.xml b/res/layout/widgets_search_bar.xml index 9178a75076..6d44865ef0 100644 --- a/res/layout/widgets_search_bar.xml +++ b/res/layout/widgets_search_bar.xml @@ -23,6 +23,7 @@ android:layout_weight="1" android:inputType="text" android:imeOptions="actionSearch" + android:importantForAutofill="no" android:textColor="?android:attr/textColorPrimary" android:textColorHint="?android:attr/textColorSecondary"/> From 8fe224c90a5f76750f4e85ce38fc6603b051527a Mon Sep 17 00:00:00 2001 From: Nataniel Borges Date: Mon, 22 Aug 2022 13:43:12 +0000 Subject: [PATCH 10/12] Fix testDisableRotationCheck Move it to the NexusLauncherTests and launch app before rotation check Bug: 241017339 Test: testDisableRotationCheck Change-Id: Ia9b5d6738a8c725c68bb6422ab44cbed5ecbc0a6 --- .../android/quickstep/TaplTestsQuickstep.java | 24 +++++++++++++++++++ .../launcher3/ui/TaplTestsLauncher3.java | 16 ------------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java index 159b65fcd3..fc64df21e7 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java @@ -21,6 +21,7 @@ import static com.android.launcher3.ui.TaplTestsLauncher3.getAppPackageName; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeFalse; import static org.junit.Assume.assumeTrue; import android.content.Intent; @@ -32,6 +33,7 @@ import androidx.test.uiautomator.Until; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherState; +import com.android.launcher3.tapl.AllApps; import com.android.launcher3.tapl.LaunchedAppState; import com.android.launcher3.tapl.LauncherInstrumentation.NavigationModel; import com.android.launcher3.tapl.Overview; @@ -404,4 +406,26 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { launcher -> assertEquals("Still have tasks after dismissing all", 0, getTaskCount(launcher))); } + + @Test + public void testDisableRotationCheckForPhone() throws Exception { + assumeFalse(mLauncher.isTablet()); + try { + mLauncher.setExpectedRotationCheckEnabled(false); + mLauncher.setEnableRotation(false); + final AllApps allApps = mLauncher.getWorkspace().switchToAllApps(); + allApps.freeze(); + try { + allApps.getAppIcon("TestActivity7").launch(getAppPackageName()); + } finally { + allApps.unfreeze(); + } + mLauncher.getDevice().setOrientationLeft(); + mLauncher.goHome(); + } finally { + mLauncher.setExpectedRotationCheckEnabled(true); + mLauncher.setEnableRotation(true); + mLauncher.getDevice().setOrientationNatural(); + } + } } diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java index f46d78ff97..14e16ab7a0 100644 --- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java +++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java @@ -431,22 +431,6 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { waitForState("Launcher internal state didn't switch to Home", () -> LauncherState.NORMAL); } - @Test - public void testDisableRotationCheck() throws Exception { - try { - mLauncher.setExpectedRotationCheckEnabled(false); - mLauncher.setEnableRotation(false); - final AllApps allApps = mLauncher.getWorkspace().switchToAllApps(); - final AppIcon app = allApps.getAppIcon("TestActivity7"); - mLauncher.getDevice().setOrientationLeft(); - mLauncher.goHome(); - } finally { - mLauncher.setExpectedRotationCheckEnabled(true); - mLauncher.setEnableRotation(true); - mLauncher.getDevice().setOrientationNatural(); - } - } - @Test @PortraitLandscape public void testDeleteFromWorkspace() throws Exception { From 6e326cf205820ee5fa34b7876b9e166ec0047c54 Mon Sep 17 00:00:00 2001 From: Evan Rosky Date: Tue, 16 Aug 2022 21:49:53 +0000 Subject: [PATCH 11/12] Use SysUI/Shell's transaction apply token in Launcher Launcher and SysUI/Shell have a lot of interactions that require careful synchronization and ordering (at-least with shell-transitions). As a result, they need to share the same apply token or else some operations can end up out-of-order despite being applied in-order. Bug: 242193885 Test: Open an app, quickswitch repeatedly. Change-Id: I4cbe8b5db28516db7a08b4022f1199f3f6b89591 --- .../launcher3/QuickstepTransitionManager.java | 7 +++ .../com/android/quickstep/SystemUiProxy.java | 47 ++++++++++++++++++- 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java index d348cc3353..92dd22c9dd 100644 --- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java +++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java @@ -46,6 +46,7 @@ import static com.android.launcher3.statehandlers.DepthController.DEPTH; import static com.android.launcher3.util.window.RefreshRateTracker.getSingleFrameMs; import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION; import static com.android.launcher3.views.FloatingIconView.getFloatingIconView; +import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS; import static com.android.quickstep.TaskViewUtils.findTaskViewToLaunch; import static com.android.systemui.shared.system.QuickStepContract.getWindowCornerRadius; import static com.android.systemui.shared.system.QuickStepContract.supportsRoundedCornersOnWindows; @@ -1119,6 +1120,9 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener * Registers remote animations used when closing apps to home screen. */ public void registerRemoteTransitions() { + if (ENABLE_SHELL_TRANSITIONS) { + SystemUiProxy.INSTANCE.get(mLauncher).shareTransactionQueue(); + } if (SEPARATE_RECENTS_ACTIVITY.get()) { return; } @@ -1158,6 +1162,9 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener } private void unregisterRemoteTransitions() { + if (ENABLE_SHELL_TRANSITIONS) { + SystemUiProxy.INSTANCE.get(mLauncher).unshareTransactionQueue(); + } if (SEPARATE_RECENTS_ACTIVITY.get()) { return; } diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java index 0ec7e628b5..c2b8c8bd1b 100644 --- a/quickstep/src/com/android/quickstep/SystemUiProxy.java +++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java @@ -28,7 +28,6 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; -import android.graphics.Bitmap; import android.graphics.Insets; import android.graphics.Rect; import android.os.Bundle; @@ -101,6 +100,7 @@ public class SystemUiProxy implements ISystemUiProxy, DisplayController.DisplayI private ILauncherUnlockAnimationController mLauncherUnlockAnimationController; private IRecentTasksListener mRecentTasksListener; private final ArrayList mRemoteTransitions = new ArrayList<>(); + private IBinder mOriginalTransactionToken = null; private IOnBackInvokedCallback mBackToLauncherCallback; // Used to dedupe calls to SystemUI @@ -199,6 +199,7 @@ public class SystemUiProxy implements ISystemUiProxy, DisplayController.DisplayI for (int i = mRemoteTransitions.size() - 1; i >= 0; --i) { registerRemoteTransition(mRemoteTransitions.get(i)); } + setupTransactionQueue(); if (mRecentTasksListener != null && mRecentTasks != null) { registerRecentTasksListener(mRecentTasksListener); } @@ -721,6 +722,50 @@ public class SystemUiProxy implements ISystemUiProxy, DisplayController.DisplayI mRemoteTransitions.remove(remoteTransition); } + /** + * Use SystemUI's transaction-queue instead of Launcher's independent one. This is necessary + * if Launcher and SystemUI need to coordinate transactions (eg. for shell transitions). + */ + public void shareTransactionQueue() { + if (mOriginalTransactionToken == null) { + mOriginalTransactionToken = SurfaceControl.Transaction.getDefaultApplyToken(); + } + setupTransactionQueue(); + } + + /** + * Switch back to using Launcher's independent transaction queue. + */ + public void unshareTransactionQueue() { + if (mOriginalTransactionToken == null) { + return; + } + SurfaceControl.Transaction.setDefaultApplyToken(mOriginalTransactionToken); + mOriginalTransactionToken = null; + } + + private void setupTransactionQueue() { + if (mOriginalTransactionToken == null) { + return; + } + if (mShellTransitions == null) { + SurfaceControl.Transaction.setDefaultApplyToken(mOriginalTransactionToken); + return; + } + final IBinder shellApplyToken; + try { + shellApplyToken = mShellTransitions.getShellApplyToken(); + } catch (RemoteException e) { + Log.e(TAG, "Error getting Shell's apply token", e); + return; + } + if (shellApplyToken == null) { + Log.e(TAG, "Didn't receive apply token from Shell"); + return; + } + SurfaceControl.Transaction.setDefaultApplyToken(shellApplyToken); + } + // // Starting window // From 9f27fa3687f6189a54f63fd980ea0dc42c70a468 Mon Sep 17 00:00:00 2001 From: Jeff Chang Date: Thu, 18 Aug 2022 20:51:33 +0800 Subject: [PATCH 12/12] Launch split task with correct UserHandle PendingIntent#getActivity gets the owner UserHandle from the app context. That makes the activity launch fail since the app only exists in the work profile environment(secondary user). This CL gets the correct Userhandle from Launcher and use PendingIntent#getActivityAsUser to launch split task. Bug: 242039471 Test: Launch Google chat by shortcut to enter split (work-profile) Change-Id: Ie1db8a858bf9cee700cb3ff3a9e607a5d1dbad30 --- .../popup/QuickstepSystemShortcut.java | 7 +++++-- .../util/SplitSelectStateController.java | 17 +++++++++++++---- .../android/quickstep/views/RecentsView.java | 2 +- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/quickstep/src/com/android/launcher3/popup/QuickstepSystemShortcut.java b/quickstep/src/com/android/launcher3/popup/QuickstepSystemShortcut.java index 4e59790771..89c07f234b 100644 --- a/quickstep/src/com/android/launcher3/popup/QuickstepSystemShortcut.java +++ b/quickstep/src/com/android/launcher3/popup/QuickstepSystemShortcut.java @@ -19,6 +19,7 @@ import android.content.Intent; import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; +import android.os.UserHandle; import android.util.Log; import android.view.View; @@ -71,7 +72,7 @@ public interface QuickstepSystemShortcut { RecentsView recentsView = mTarget.getOverviewPanel(); recentsView.initiateSplitSelect( new SplitSelectSource(mOriginalView, new BitmapDrawable(bitmap), intent, - mPosition)); + mPosition, mItemInfo.user)); } } @@ -81,13 +82,15 @@ public interface QuickstepSystemShortcut { public final Drawable drawable; public final Intent intent; public final SplitPositionOption position; + public final UserHandle user; public SplitSelectSource(View view, Drawable drawable, Intent intent, - SplitPositionOption position) { + SplitPositionOption position, UserHandle user) { this.view = view; this.drawable = drawable; this.intent = intent; this.position = position; + this.user = user; } } } diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java index 0ca557443f..8f322140b8 100644 --- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java +++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java @@ -33,6 +33,7 @@ import android.content.Context; import android.content.Intent; import android.os.Handler; import android.os.IBinder; +import android.os.UserHandle; import android.text.TextUtils; import android.view.RemoteAnimationAdapter; import android.view.SurfaceControl; @@ -77,6 +78,8 @@ public class SplitSelectStateController { private int mSecondTaskId = INVALID_TASK_ID; private String mSecondTaskPackageName; private boolean mRecentsAnimationRunning; + @Nullable + private UserHandle mUser; /** If not null, this is the TaskView we want to launch from */ @Nullable private GroupedTaskView mLaunchingTaskView; @@ -97,12 +100,15 @@ public class SplitSelectStateController { mInitialTaskId = taskId; mStagePosition = stagePosition; mInitialTaskIntent = null; + mUser = null; } - public void setInitialTaskSelect(Intent intent, @StagePosition int stagePosition) { + public void setInitialTaskSelect(Intent intent, @StagePosition int stagePosition, + @Nullable UserHandle user) { mInitialTaskIntent = intent; mStagePosition = stagePosition; mInitialTaskId = INVALID_TASK_ID; + mUser = user; } /** @@ -120,9 +126,12 @@ public class SplitSelectStateController { } else { fillInIntent = null; } - final PendingIntent pendingIntent = - mInitialTaskIntent == null ? null : PendingIntent.getActivity(mContext, 0, - mInitialTaskIntent, FLAG_MUTABLE); + + final PendingIntent pendingIntent = mInitialTaskIntent == null ? null : (mUser != null + ? PendingIntent.getActivityAsUser(mContext, 0, mInitialTaskIntent, + FLAG_MUTABLE, null /* options */, mUser) + : PendingIntent.getActivity(mContext, 0, mInitialTaskIntent, FLAG_MUTABLE)); + launchTasks(mInitialTaskId, pendingIntent, fillInIntent, mSecondTaskId, mStagePosition, callback, false /* freezeTaskList */, DEFAULT_SPLIT_RATIO); } diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index a153f2676e..3bf044da7e 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -4161,7 +4161,7 @@ public abstract class RecentsView