From 02fc23c99354ce5e3f3e428ccb75557380f610d4 Mon Sep 17 00:00:00 2001 From: mtk20437 Date: Mon, 12 Oct 2020 21:07:56 +0530 Subject: [PATCH 1/6] Modifying screenshot button visibility Just like "Share" button, we are modifying Screenshot button visibility to gone. Bug: 168754258 Change-Id: Ie92552c931857eed5d11af130af5a79923ee72e8 --- quickstep/res/layout/overview_actions_container.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/quickstep/res/layout/overview_actions_container.xml b/quickstep/res/layout/overview_actions_container.xml index e05688eca3..6a3f865f4d 100644 --- a/quickstep/res/layout/overview_actions_container.xml +++ b/quickstep/res/layout/overview_actions_container.xml @@ -40,7 +40,8 @@ android:layout_height="wrap_content" android:drawableStart="@drawable/ic_screenshot" android:text="@string/action_screenshot" - android:theme="@style/ThemeControlHighlightWorkspaceColor" /> + android:theme="@style/ThemeControlHighlightWorkspaceColor" + android:visibility="gone" /> Date: Mon, 19 Apr 2021 03:45:07 +0000 Subject: [PATCH 2/6] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I6d0f6f7f02381791f1e53504ec1a675cf1529ccf --- quickstep/res/values-en-rAU/strings.xml | 3 +-- quickstep/res/values-en-rCA/strings.xml | 3 +-- quickstep/res/values-en-rGB/strings.xml | 3 +-- quickstep/res/values-en-rIN/strings.xml | 3 +-- quickstep/res/values-hy/strings.xml | 3 +-- quickstep/res/values-km/strings.xml | 3 +-- quickstep/res/values-lo/strings.xml | 3 +-- quickstep/res/values-sw/strings.xml | 3 +-- quickstep/res/values-uz/strings.xml | 3 +-- 9 files changed, 9 insertions(+), 18 deletions(-) diff --git a/quickstep/res/values-en-rAU/strings.xml b/quickstep/res/values-en-rAU/strings.xml index 79dfda0d41..487d6ccd77 100644 --- a/quickstep/res/values-en-rAU/strings.xml +++ b/quickstep/res/values-en-rAU/strings.xml @@ -78,8 +78,7 @@ "Screenshot" "This action isn\'t allowed by the app or your organisation" "Skip navigation tutorial?" - - + "You can find this later in the %1$s app" "Cancel" "Skip" diff --git a/quickstep/res/values-en-rCA/strings.xml b/quickstep/res/values-en-rCA/strings.xml index 79dfda0d41..487d6ccd77 100644 --- a/quickstep/res/values-en-rCA/strings.xml +++ b/quickstep/res/values-en-rCA/strings.xml @@ -78,8 +78,7 @@ "Screenshot" "This action isn\'t allowed by the app or your organisation" "Skip navigation tutorial?" - - + "You can find this later in the %1$s app" "Cancel" "Skip" diff --git a/quickstep/res/values-en-rGB/strings.xml b/quickstep/res/values-en-rGB/strings.xml index 79dfda0d41..487d6ccd77 100644 --- a/quickstep/res/values-en-rGB/strings.xml +++ b/quickstep/res/values-en-rGB/strings.xml @@ -78,8 +78,7 @@ "Screenshot" "This action isn\'t allowed by the app or your organisation" "Skip navigation tutorial?" - - + "You can find this later in the %1$s app" "Cancel" "Skip" diff --git a/quickstep/res/values-en-rIN/strings.xml b/quickstep/res/values-en-rIN/strings.xml index 79dfda0d41..487d6ccd77 100644 --- a/quickstep/res/values-en-rIN/strings.xml +++ b/quickstep/res/values-en-rIN/strings.xml @@ -78,8 +78,7 @@ "Screenshot" "This action isn\'t allowed by the app or your organisation" "Skip navigation tutorial?" - - + "You can find this later in the %1$s app" "Cancel" "Skip" diff --git a/quickstep/res/values-hy/strings.xml b/quickstep/res/values-hy/strings.xml index c09d728955..3ff9d0d5c2 100644 --- a/quickstep/res/values-hy/strings.xml +++ b/quickstep/res/values-hy/strings.xml @@ -78,8 +78,7 @@ "Սքրինշոթ անել" "Այս գործողությունն արգելված է հավելվածի կամ ձեր կազմակերպության կողմից" "Բաց թողնե՞լ նավիգացիայի ուղեցույցը" - - + "Հետագայում սա կարող եք գտնել «%1$s» հավելվածում" "Չեղարկել" "Բաց թողնել" diff --git a/quickstep/res/values-km/strings.xml b/quickstep/res/values-km/strings.xml index d44ac6743d..62858ba625 100644 --- a/quickstep/res/values-km/strings.xml +++ b/quickstep/res/values-km/strings.xml @@ -78,8 +78,7 @@ "រូបថតអេក្រង់" "សកម្មភាពនេះ​មិនត្រូវបានអនុញ្ញាតដោយកម្មវិធី​ ឬ​ស្ថាប័ន​របស់អ្នកទេ" "រំលង​មេរៀន​អំពី​ការរុករក​ឬ?" - - + "អ្នកអាចស្វែងរកមេរៀននេះនៅពេលក្រោយក្នុងកម្មវិធី %1$s" "បោះបង់" "រំលង" diff --git a/quickstep/res/values-lo/strings.xml b/quickstep/res/values-lo/strings.xml index 32937f637d..e05b18e613 100644 --- a/quickstep/res/values-lo/strings.xml +++ b/quickstep/res/values-lo/strings.xml @@ -78,8 +78,7 @@ "ຮູບໜ້າຈໍ" "ແອັບ ຫຼື ອົງການຂອງທ່ານບໍ່ອະນຸຍາດໃຫ້ໃຊ້ຄຳສັ່ງນີ້" "ຂ້າມການສອນການນຳໃຊ້ການນຳທາງບໍ?" - - + "ທ່ານສາມາດຊອກສ່ວນນີ້ພາຍຫຼັງໄດ້ໃນແອັບ %1$s" "ຍົກເລີກ" "ຂ້າມ" diff --git a/quickstep/res/values-sw/strings.xml b/quickstep/res/values-sw/strings.xml index 0a6f75cec6..b761caee7d 100644 --- a/quickstep/res/values-sw/strings.xml +++ b/quickstep/res/values-sw/strings.xml @@ -78,8 +78,7 @@ "Picha ya skrini" "Kitendo hiki hakiruhusiwi na programu au shirika lako" "Ungependa kuruka mafunzo ya usogezaji?" - - + "Utapata mafunzo haya baadaye katika programu ya %1$s" "Ghairi" "Ruka" diff --git a/quickstep/res/values-uz/strings.xml b/quickstep/res/values-uz/strings.xml index 577a4339ae..7272eddf51 100644 --- a/quickstep/res/values-uz/strings.xml +++ b/quickstep/res/values-uz/strings.xml @@ -78,8 +78,7 @@ "Skrinshot" "Bu amal ilova yoki tashkilotingiz tomonidan taqiqlangan" "Navigatsiya darsi yopilsinmi?" - - + "Bu darslar %1$s ilovasida chiqadi" "Bekor qilish" "Tashlab ketish" From e01c1f5354cee7efcfbdac13da72bf79398ab3e4 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Mon, 19 Apr 2021 03:45:43 +0000 Subject: [PATCH 3/6] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Idf2317e39764e840bd008282c629f8d863bc33a9 --- res/values-fi/strings.xml | 2 +- res/values-pa/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 2b1477c5bb..d7e3a5bcce 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -124,7 +124,7 @@ "Lisää aloitusnäytölle" "Siirrä kohde tänne" "Kohde lisättiin aloitusnäytölle." - "Kohde poistettiin." + "Kohde poistettiin" "Kumoa" "Siirrä kohde" "Siirrä rivin %1$s sarakkeeseen %2$s." diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index 4cfc924cb9..f97f2556b5 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -124,7 +124,7 @@ "ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਸ਼ਾਮਲ ਕਰੋ" "ਆਈਟਮ ਨੂੰ ਇੱਥੇ ਮੂਵ ਕਰੋ" "ਆਈਟਮ ਨੂੰ ਹੋਮ ਸਕ੍ਰੀਨ ਵਿੱਚ ਜੋੜਿਆ ਗਿਆ" - "ਅਈਟਮ ਹਟਾਈ ਗਈ" + "ਆਈਟਮ ਹਟਾਈ ਗਈ" "ਅਣਕੀਤਾ ਕਰੋ" "ਆਈਟਮ ਨੂੰ ਮੂਵ ਕਰੋ" "ਕਤਾਰ %1$s ਕਾਲਮ %2$s ਵਿੱਚ ਮੂਵ ਕਰੋ" From 6acba271098712d64d3977569f0dc1349a231e58 Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Wed, 14 Apr 2021 10:26:10 -0400 Subject: [PATCH 4/6] Default shell_starting_surface to true to match platform behavior. Bug: 177264697 Test: manual, cold/warm app launches Change-Id: I0b2f080ddc234f7b9f1432bb8cd80f85c176bc7a --- .../src/com/android/launcher3/QuickstepTransitionManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java index 009ca27603..b72cf394c5 100644 --- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java +++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java @@ -110,7 +110,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener private static final String TAG = "QuickstepTransition"; private static final boolean ENABLE_SHELL_STARTING_SURFACE = - SystemProperties.getBoolean("persist.debug.shell_starting_surface", false); + SystemProperties.getBoolean("persist.debug.shell_starting_surface", true); /** Duration of status bar animations. */ public static final int STATUS_BAR_TRANSITION_DURATION = 120; From a999e22560d477edfe98e83c62e3af4b9fbe8461 Mon Sep 17 00:00:00 2001 From: Steven Ng Date: Mon, 19 Apr 2021 18:17:15 +0100 Subject: [PATCH 5/6] Apply color extraction when dragging Bug: 185795141 Test: Drag the test color extraction widget and observe the change in the widget background. Change-Id: I17203fcb0d7579b1570c68f22248966c3a561c64 --- src/com/android/launcher3/CellLayout.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index fc09295d7b..bb83802d2a 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -1038,6 +1038,9 @@ public class CellLayout extends ViewGroup { mDragCellSpan[0] = spanX; mDragCellSpan[1] = spanY; + // Apply color extraction on a widget when dragging. + applyColorExtractionOnWidget(dragObject, mDragCell, spanX, spanY); + final int oldIndex = mDragOutlineCurrent; mDragOutlineAnims[oldIndex].animateOut(); mDragOutlineCurrent = (oldIndex + 1) % mDragOutlines.length; @@ -1059,8 +1062,8 @@ public class CellLayout extends ViewGroup { } /** Applies the local color extraction to a dragging widget object. */ - private void applyColorExtraction(DropTarget.DragObject dragObject, int[] targetCell, int spanX, - int spanY) { + private void applyColorExtractionOnWidget(DropTarget.DragObject dragObject, int[] targetCell, + int spanX, int spanY) { // Apply local extracted color if the DragView is an AppWidgetHostViewDrawable. Drawable drawable = dragObject.dragView.getDrawable(); if (drawable instanceof AppWidgetHostViewDrawable) { From 25ebb2d3c1e77cf89244812bc654aeaba5587e28 Mon Sep 17 00:00:00 2001 From: vadimt Date: Mon, 19 Apr 2021 11:01:45 -0700 Subject: [PATCH 6/6] Disable strictmode leak detection It doesn't work; the check was enabled by mistake. Test: presubmit Bug: 185786290 Change-Id: Ie049f1d6d7cef5acfa3ee29b5f9e9586fbeb24a5 --- tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java index e7e245f9aa..2a0f7bb6fd 100644 --- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java +++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java @@ -115,7 +115,6 @@ public abstract class AbstractLauncherUiTest { if (TestHelpers.isInLauncherProcess()) { StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder() - .detectActivityLeaks() .penaltyLog() .penaltyListener(Runnable::run, violation -> { if (sStrictmodeDetectedActivityLeak == null) {