From 2877a2fb3fafca6655a7b804cc5bcc8c21aae5cc Mon Sep 17 00:00:00 2001 From: Toni Barzic Date: Tue, 8 Apr 2025 20:52:42 +0000 Subject: [PATCH 01/24] Use DesktopExperienceFlags for freeform display taskbar Bug: 390665752 Flag: com.android.window.flags.enable_desktop_taskbar_on_freeform_displays Test: None Change-Id: I40ac43f50c980e6076bb5a842ceaf15702e71738 --- .../com/android/quickstep/util/SystemWindowManagerProxy.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quickstep/src/com/android/quickstep/util/SystemWindowManagerProxy.java b/quickstep/src/com/android/quickstep/util/SystemWindowManagerProxy.java index 05eede3ef4..b6eccaf9e1 100644 --- a/quickstep/src/com/android/quickstep/util/SystemWindowManagerProxy.java +++ b/quickstep/src/com/android/quickstep/util/SystemWindowManagerProxy.java @@ -25,6 +25,7 @@ import android.view.DisplayCutout; import android.view.Surface; import android.view.WindowManager; import android.view.WindowMetrics; +import android.window.DesktopExperienceFlags; import com.android.internal.policy.SystemBarUtils; import com.android.launcher3.dagger.LauncherAppSingleton; @@ -33,7 +34,6 @@ import com.android.launcher3.util.WindowBounds; import com.android.launcher3.util.window.CachedDisplayInfo; import com.android.launcher3.util.window.WindowManagerProxy; import com.android.quickstep.SystemUiProxy; -import com.android.window.flags.Flags; import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; import java.util.List; @@ -103,7 +103,7 @@ public class SystemWindowManagerProxy extends WindowManagerProxy { return false; } - if (!Flags.enableDesktopTaskbarOnFreeformDisplays()) { + if (!DesktopExperienceFlags.ENABLE_DESKTOP_TASKBAR_ON_FREEFORM_DISPLAYS.isTrue()) { return false; } From d3c7eed166fbe9a03e3fafcfac685e7d70ea6c33 Mon Sep 17 00:00:00 2001 From: mpodolian Date: Wed, 9 Apr 2025 17:35:50 -0700 Subject: [PATCH 02/24] Maximised the taskbar window to the default size TaskbarViewController set window height to the too low value, so bubble bar was not visible in 3 - buttons navigation mode on foldable device. Fixes: 407708503 Test: Manual. Use foldable device, set navigation mode to the 3 buttons. Fold the device and trigger bubble. Lock screen. Unfold. Unlock screen. The bubble remains visible. Flag: EXEMPT bugfix Change-Id: I516eab4121c39fc2bec5e49cc3c9b0ad8e640f8b --- .../taskbar/TaskbarActivityContext.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java index ba1ce18893..40c54cc15a 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java @@ -1295,20 +1295,22 @@ public class TaskbarActivityContext extends BaseTaskbarContext { } /** - * Updates the TaskbarContainer size (pass {@link #getDefaultTaskbarWindowSize()} to reset). + * Updates the TaskbarContainer size, using the maximum of the provided {@code size} + * and the default size from {@link #getDefaultTaskbarWindowSize()}. */ public void setTaskbarWindowSize(int size) { // In landscape phone button nav mode, we should set the task bar width instead of height // because this is the only case in which the nav bar is not on the display bottom. + int windowSize = Math.max(size, getDefaultTaskbarWindowSize()); boolean landscapePhoneButtonNav = isPhoneButtonNavMode() && mDeviceProfile.isLandscape; if ((landscapePhoneButtonNav ? mWindowLayoutParams.width : mWindowLayoutParams.height) - == size || mIsDestroyed) { + == windowSize || mIsDestroyed) { return; } - if (size == MATCH_PARENT) { - size = mDeviceProfile.heightPx; + if (windowSize == MATCH_PARENT) { + windowSize = mDeviceProfile.heightPx; } else { - mLastRequestedNonFullscreenSize = size; + mLastRequestedNonFullscreenSize = windowSize; if (mIsFullscreen || mIsTaskbarSizeFrozenForAnimatingBubble) { // We either still need to be fullscreen or a bubble is still animating, so defer // any change to our height until setTaskbarWindowFullscreen(false) is called or @@ -1320,14 +1322,14 @@ public class TaskbarActivityContext extends BaseTaskbarContext { } } if (landscapePhoneButtonNav) { - mWindowLayoutParams.width = size; + mWindowLayoutParams.width = windowSize; for (int rot = Surface.ROTATION_0; rot <= Surface.ROTATION_270; rot++) { - mWindowLayoutParams.paramsForRotation[rot].width = size; + mWindowLayoutParams.paramsForRotation[rot].width = windowSize; } } else { - mWindowLayoutParams.height = size; + mWindowLayoutParams.height = windowSize; for (int rot = Surface.ROTATION_0; rot <= Surface.ROTATION_270; rot++) { - mWindowLayoutParams.paramsForRotation[rot].height = size; + mWindowLayoutParams.paramsForRotation[rot].height = windowSize; } } mControllers.runAfterInit( From a5505327dd3875f4068be7f4f7e03117bebbe763 Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Thu, 10 Apr 2025 15:36:42 -0700 Subject: [PATCH 03/24] Only enable taskbar snapshot if taskbar is present. Bug: 343194358 Bug: 409795053 Test: testDragDownNotificationShade Flag: com.android.launcher3.enable_taskbar_behind_shade Change-Id: I62f9cb2e5acde57cee866fc3dda21e4a709714be --- .../com/android/launcher3/taskbar/TaskbarActivityContext.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java index ba1ce18893..0ad66123b3 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java @@ -1138,7 +1138,8 @@ public class TaskbarActivityContext extends BaseTaskbarContext { } private void updateTaskbarSnapshot(AnimatorSet anim, boolean isExpanded) { - if (!ENABLE_TASKBAR_BEHIND_SHADE.isTrue()) { + if (!ENABLE_TASKBAR_BEHIND_SHADE.isTrue() + || isPhoneMode()) { return; } if (mTaskbarSnapshotView == null) { From c547affdc9ba3677f5a2234c0838fd5136f54d6b Mon Sep 17 00:00:00 2001 From: Stefan Andonian Date: Fri, 11 Apr 2025 15:31:36 -0700 Subject: [PATCH 04/24] Moved PageIndicatorDots to their own ImageViews. Previously, they were simply included in PageIndicatorDots via Canvas drawing. This worked well to keep behavior encapsulated within PageIndicatorDots class. But it didn't work for Accessibility Services which require an actual view in order to focus properly. Bug: 409629978 Test: Verified manually. See video on bug comment: https://b.corp.google.com/issues/394355070#comment23 Flag: com.android.launcher3.enable_launcher_visual_refresh Change-Id: I212bf3dbee82e449088536fa841b02a3644df7d3 --- res/drawable/ic_chevron_left_rounded_700.xml | 2 +- res/drawable/ic_chevron_right_rounded_700.xml | 11 --- res/layout/user_folder_icon_normalized.xml | 20 ++++ res/values/dimens.xml | 1 + res/values/strings.xml | 2 + src/com/android/launcher3/folder/Folder.java | 33 ++++++- .../launcher3/folder/FolderPagedView.java | 4 +- .../pageindicators/PageIndicator.java | 10 -- .../pageindicators/PageIndicatorDots.java | 93 ------------------- .../pageindicators/PaginationArrow.kt | 41 ++++++++ .../PersonalWorkSlidingTabStrip.java | 8 -- 11 files changed, 97 insertions(+), 128 deletions(-) delete mode 100644 res/drawable/ic_chevron_right_rounded_700.xml create mode 100644 src/com/android/launcher3/pageindicators/PaginationArrow.kt diff --git a/res/drawable/ic_chevron_left_rounded_700.xml b/res/drawable/ic_chevron_left_rounded_700.xml index 17cc7f89b4..c3730d3a57 100644 --- a/res/drawable/ic_chevron_left_rounded_700.xml +++ b/res/drawable/ic_chevron_left_rounded_700.xml @@ -6,6 +6,6 @@ android:tint="?attr/colorControlNormal" android:autoMirrored="true"> diff --git a/res/drawable/ic_chevron_right_rounded_700.xml b/res/drawable/ic_chevron_right_rounded_700.xml deleted file mode 100644 index 8125d64783..0000000000 --- a/res/drawable/ic_chevron_right_rounded_700.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/res/layout/user_folder_icon_normalized.xml b/res/layout/user_folder_icon_normalized.xml index 002e7b7eec..4c1464af56 100644 --- a/res/layout/user_folder_icon_normalized.xml +++ b/res/layout/user_folder_icon_normalized.xml @@ -53,6 +53,16 @@ android:textColorHighlight="?android:attr/colorControlHighlight" android:textColorHint="?attr/folderHintTextColor"/> + + + diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 2ec73c0564..88f542eb5c 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -545,6 +545,7 @@ 24dp 20dp + 32dp diff --git a/res/values/strings.xml b/res/values/strings.xml index 9426b923c8..ea1acffd66 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -272,6 +272,8 @@ Edit Name + Paginate left + Paginate right diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index af44391b7b..ecf1ff1336 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/folder/Folder.java @@ -28,6 +28,8 @@ import static com.android.launcher3.folder.FolderGridOrganizer.createFolderGridO import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_LABEL_UPDATED; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ITEM_DROP_COMPLETED; import static com.android.launcher3.model.data.FolderInfo.willAcceptItemType; +import static com.android.launcher3.pageindicators.PaginationArrow.DISABLED_ARROW_OPACITY; +import static com.android.launcher3.pageindicators.PaginationArrow.FULLY_OPAQUE; import static com.android.launcher3.testing.shared.TestProtocol.FOLDER_OPENED_MESSAGE; import static com.android.launcher3.util.window.RefreshRateTracker.getSingleFrameMs; @@ -97,6 +99,7 @@ import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.WorkspaceItemFactory; import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.pageindicators.PageIndicatorDots; +import com.android.launcher3.pageindicators.PaginationArrow; import com.android.launcher3.util.Executors; import com.android.launcher3.util.LauncherBindableItemsContainer; import com.android.launcher3.util.Thunk; @@ -204,6 +207,8 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo FolderPagedView mContent; private FolderNameEditText mFolderName; private PageIndicatorDots mPageIndicator; + private PaginationArrow mLeftArrow; + private PaginationArrow mRightArrow; protected View mFooter; private int mFooterHeight; @@ -312,6 +317,15 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo mFolderName.forceDisableSuggestions(true); mKeyboardInsetAnimationCallback = new KeyboardInsetAnimationCallback(this); setWindowInsetsAnimationCallback(mKeyboardInsetAnimationCallback); + + if (enableLauncherVisualRefresh()) { + mLeftArrow = findViewById(R.id.left_indicator_arrow); + mRightArrow = findViewById(R.id.right_indicator_arrow); + mRightArrow.setOnClickListener(v -> mContent.snapToPage( + mContent.getCurrentPage() + 1)); + mLeftArrow.setOnClickListener(v -> mContent.snapToPage( + mContent.getCurrentPage() - 1)); + } } /** If arrows are visible, replace the container padding with indicator padding */ @@ -320,13 +334,28 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo if (mPageIndicator.getVisibility() == View.VISIBLE) { // Replace the container padding with indicator padding for arrows mFooter.setPadding(0, 0, 0, 0); - mPageIndicator.setPadding(sidePadding, 0, sidePadding, 0); ((MarginLayoutParams) mFolderName.getLayoutParams()) .setMarginStart(sidePadding); + mLeftArrow.setVisibility(View.VISIBLE); + mRightArrow.setVisibility(View.VISIBLE); } else { mFooter.setPadding(sidePadding, 0, sidePadding, 0); - mPageIndicator.setPadding(0, 0, 0, 0); ((MarginLayoutParams) mFolderName.getLayoutParams()).setMarginStart(0); + mLeftArrow.setVisibility(View.GONE); + mRightArrow.setVisibility(View.GONE); + } + } + + /** + * Called when the page is switched. Sets arrow UX to a disabled appearance if the page is at + * one end or the other. + */ + public void updateArrowAlphas() { + if (enableLauncherVisualRefresh()) { + mLeftArrow.setAlpha( + 0 == mContent.getCurrentPage() ? DISABLED_ARROW_OPACITY : FULLY_OPAQUE); + mRightArrow.setAlpha(mContent.getPageCount() == mContent.getCurrentPage() + 1 + ? DISABLED_ARROW_OPACITY : FULLY_OPAQUE); } } diff --git a/src/com/android/launcher3/folder/FolderPagedView.java b/src/com/android/launcher3/folder/FolderPagedView.java index 4c86b09275..ceac72d5c4 100644 --- a/src/com/android/launcher3/folder/FolderPagedView.java +++ b/src/com/android/launcher3/folder/FolderPagedView.java @@ -48,7 +48,6 @@ import com.android.launcher3.keyboard.ViewGroupFocusHelper; import com.android.launcher3.model.data.AppPairInfo; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; -import com.android.launcher3.pageindicators.Direction; import com.android.launcher3.pageindicators.PageIndicatorDots; import com.android.launcher3.util.LauncherBindableItemsContainer.ItemOperator; import com.android.launcher3.util.Thunk; @@ -131,8 +130,6 @@ public class FolderPagedView extends PagedView implements Cli public void setFolder(Folder folder) { mFolder = folder; mPageIndicator = folder.findViewById(R.id.folder_page_indicator); - mPageIndicator.setArrowClickListener(direction -> snapToPage( - (Direction.END == direction) ? mCurrentPage + 1 : mCurrentPage - 1)); initParentViews(folder); } @@ -489,6 +486,7 @@ public class FolderPagedView extends PagedView implements Cli super.notifyPageSwitchListener(prevPage); if (mFolder != null) { mFolder.updateTextViewFocus(); + mFolder.updateArrowAlphas(); } } diff --git a/src/com/android/launcher3/pageindicators/PageIndicator.java b/src/com/android/launcher3/pageindicators/PageIndicator.java index a6f76c4d44..0640bf3672 100644 --- a/src/com/android/launcher3/pageindicators/PageIndicator.java +++ b/src/com/android/launcher3/pageindicators/PageIndicator.java @@ -15,8 +15,6 @@ */ package com.android.launcher3.pageindicators; -import java.util.function.Consumer; - /** * Base class for a page indicator. */ @@ -28,14 +26,6 @@ public interface PageIndicator { void setMarkersCount(int numMarkers); - /** - * This is only going to be used by the FolderPagedView's PageIndicator. A refactor is planned - * to separate the two purposes of this class, but in the meantime, this indicator will serve to - * let the folder snap to the page of its click, and also tell the PageIndicator not to draw - * arrows if the click listener is null (at least until after this is refactored). - */ - void setArrowClickListener(Consumer listener); - /** * Sets a flag indicating whether to pause scroll. *

Should be set to {@code true} while the screen is binding or new data is being applied, diff --git a/src/com/android/launcher3/pageindicators/PageIndicatorDots.java b/src/com/android/launcher3/pageindicators/PageIndicatorDots.java index b43a830cea..7ce410e2b8 100644 --- a/src/com/android/launcher3/pageindicators/PageIndicatorDots.java +++ b/src/com/android/launcher3/pageindicators/PageIndicatorDots.java @@ -27,39 +27,30 @@ import android.animation.ValueAnimator; import android.animation.ValueAnimator.AnimatorUpdateListener; import android.content.Context; import android.graphics.Canvas; -import android.graphics.ColorFilter; import android.graphics.Outline; import android.graphics.Paint; import android.graphics.Paint.Style; -import android.graphics.PorterDuff; -import android.graphics.PorterDuffColorFilter; import android.graphics.Rect; import android.graphics.RectF; -import android.graphics.drawable.VectorDrawable; import android.os.Handler; import android.os.Looper; import android.util.AttributeSet; import android.util.FloatProperty; import android.util.IntProperty; -import android.view.MotionEvent; import android.view.View; import android.view.ViewConfiguration; import android.view.ViewOutlineProvider; import android.view.animation.Interpolator; import android.view.animation.OvershootInterpolator; -import androidx.annotation.DrawableRes; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; -import androidx.core.content.ContextCompat; import com.android.launcher3.Insettable; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.util.Themes; -import java.util.function.Consumer; - /** * {@link PageIndicator} which shows dots per page. The active page is shown with the current * accent color. @@ -75,15 +66,12 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator private static final int PAGINATION_FADE_IN_DURATION = 83; private static final int PAGINATION_FADE_OUT_DURATION = 167; - private static final int DISABLED_ARROW_OPACITY = 97; // 38% - private static final int ENTER_ANIMATION_START_DELAY = 300; private static final int ENTER_ANIMATION_STAGGERED_DELAY = 150; private static final int ENTER_ANIMATION_DURATION = 400; private static final int HEIGHT_MULTIPLIER = 4; private static final int WIDTH_MULTIPLIER = 3; - private static final float ARROW_TOUCH_BOX_FACTOR = 2f; private static final int PAGE_INDICATOR_ALPHA = 255; private static final int DOT_ALPHA = 128; @@ -92,7 +80,6 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator private static final int VISIBLE_ALPHA = 255; private static final int INVISIBLE_ALPHA = 0; private Paint mPaginationPaint; - private @Nullable Consumer mOnArrowClickListener; // This value approximately overshoots to 1.5 times the original size. private static final float ENTER_ANIMATION_OVERSHOOT_TENSION = 4.9f; @@ -135,14 +122,6 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator private final float mGapWidth; private final float mCircleGap; private final boolean mIsRtl; - private final VectorDrawable mArrowRight; - private final VectorDrawable mArrowLeft; - private final Rect mArrowRightBounds = new Rect(); - private final Rect mArrowLeftBounds = new Rect(); - private final int mArrowTouchBoxExtraWidth; - private final int mArrowTouchBoxHeight; - private final int mArrowGapWidth; - private final int mArrowLength; private int mNumPages; private int mActivePage; @@ -194,23 +173,6 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator : DOT_GAP_FACTOR * mDotRadius; setOutlineProvider(new MyOutlineProver()); mIsRtl = Utilities.isRtl(getResources()); - mArrowRight = setupArrow(R.drawable.ic_chevron_right_rounded_700); - mArrowLeft = setupArrow(R.drawable.ic_chevron_left_rounded_700); - /* the width of the arrows themselves plus extra folder / touch padding. x2 for 2 arrows. */ - mArrowTouchBoxExtraWidth = 2 * ((int) ((5.5f) * mGapWidth) - + getResources().getDimensionPixelSize(R.dimen.folder_footer_horiz_padding)); - mArrowTouchBoxHeight = - getResources().getDimensionPixelSize(R.dimen.folder_footer_height_default); - mArrowLength = getResources().getDimensionPixelSize(R.dimen.folder_arrow_icon_length); - mArrowGapWidth = getResources().getDimensionPixelSize(R.dimen.folder_arrow_gap_width); - } - - private VectorDrawable setupArrow(@DrawableRes int resId) { - VectorDrawable icon = (VectorDrawable) ContextCompat.getDrawable(getContext(), resId); - ColorFilter arrowColorFilter = new PorterDuffColorFilter(mPaginationPaint.getColor(), - PorterDuff.Mode.SRC_ATOP); - icon.setColorFilter(arrowColorFilter); - return icon; } @Override @@ -448,11 +410,6 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator requestLayout(); } - @Override - public void setArrowClickListener(@Nullable Consumer listener) { - mOnArrowClickListener = listener; - } - @Override public void setPauseScroll(boolean pause, boolean isTwoPanels) { mIsTwoPanels = isTwoPanels; @@ -467,20 +424,13 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - // TODO(b/394355070): Verify Folder Entry Animation works correctly with visual updates // Add extra spacing of mDotRadius on all sides so than entry animation could be run - // and so the hitboxes of arrows can be clicked easier. int width = MeasureSpec.getMode(widthMeasureSpec) == MeasureSpec.EXACTLY ? MeasureSpec.getSize(widthMeasureSpec) : (int) ((mNumPages * WIDTH_MULTIPLIER + 2) * mDotRadius); int height = MeasureSpec.getMode(heightMeasureSpec) == MeasureSpec.EXACTLY ? MeasureSpec.getSize(heightMeasureSpec) : (int) (HEIGHT_MULTIPLIER * mDotRadius); - if (enableLauncherVisualRefresh() && mOnArrowClickListener != null) { - // Extra height and width and gaps for accessibility arrows. - width += mArrowTouchBoxExtraWidth; - height = mArrowTouchBoxHeight; - } setMeasuredDimension(width, height); } @@ -572,17 +522,6 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator float bounceProgress = (posDif > 1) ? posDif - 1 : 0; float bounceAdjustment = Math.abs(currentPosition - boundedPosition) * diameter; - if (mOnArrowClickListener != null) { - // Here we draw the Left Arrow - mArrowLeft.setAlpha(boundedPosition == 0 ? DISABLED_ARROW_OPACITY : alpha); - mArrowLeftBounds.left = (int) (sTempRect.left - mArrowGapWidth - mArrowLength); - mArrowLeftBounds.top = (int) (y - (float) mArrowLength / 2); - mArrowLeftBounds.right = mArrowLeftBounds.left + mArrowLength; - mArrowLeftBounds.bottom = mArrowLeftBounds.top + mArrowLength; - mArrowLeft.setBounds(mArrowLeftBounds); - mArrowLeft.draw(canvas); - } - // Here we draw the dots, one at a time from the left-most dot to the right-most dot // 1.0 => 000000 000000111111 000000 // 1.3 => 000000 0000001111 11000000 @@ -639,17 +578,6 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator sTempRect.left = sTempRect.right + mGapWidth; } - if (mOnArrowClickListener != null) { - // Here we draw the Right Arrow - mArrowRight.setAlpha(boundedPosition == (mNumPages - 1) - ? DISABLED_ARROW_OPACITY : alpha); - mArrowRightBounds.left = (int) (sTempRect.left - mGapWidth + mArrowGapWidth); - mArrowRightBounds.top = (int) (y - (float) mArrowLength / 2); - mArrowRightBounds.right = mArrowRightBounds.left + mArrowLength; - mArrowRightBounds.bottom = mArrowRightBounds.top + mArrowLength; - mArrowRight.setBounds(mArrowRightBounds); - mArrowRight.draw(canvas); - } } else { // Here we draw the dots mPaginationPaint.setAlpha((int) (alpha * DOT_ALPHA_FRACTION)); @@ -668,27 +596,6 @@ public class PageIndicatorDots extends View implements Insettable, PageIndicator } } - @Override - public boolean onTouchEvent(MotionEvent ev) { - if (mOnArrowClickListener == null) { - // No - Op. Don't care about touch events - } else if ((mIsRtl && withinExpandedBounds(mArrowRightBounds, ev)) - || (!mIsRtl && withinExpandedBounds(mArrowLeftBounds, ev))) { - mOnArrowClickListener.accept(Direction.START); - } else if ((mIsRtl && withinExpandedBounds(mArrowLeftBounds, ev)) - || (!mIsRtl && withinExpandedBounds(mArrowRightBounds, ev))) { - mOnArrowClickListener.accept(Direction.END); - } - return super.onTouchEvent(ev); - } - - // For larger Touch box - private boolean withinExpandedBounds(Rect rect, MotionEvent ev) { - RectF scaledRect = new RectF(rect); - scale(scaledRect, ARROW_TOUCH_BOX_FACTOR); - return scaledRect.contains(ev.getX(), ev.getY()); - } - private static void scale(RectF rect, float factor) { float horizontalAdjustment = rect.width() * (factor - 1) / 2; float verticalAdjustment = rect.height() * (factor - 1) / 2; diff --git a/src/com/android/launcher3/pageindicators/PaginationArrow.kt b/src/com/android/launcher3/pageindicators/PaginationArrow.kt new file mode 100644 index 0000000000..1ca21f9f4a --- /dev/null +++ b/src/com/android/launcher3/pageindicators/PaginationArrow.kt @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2025 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.launcher3.pageindicators + +import android.annotation.SuppressLint +import android.content.Context +import android.util.AttributeSet +import android.widget.ImageView +import androidx.core.content.ContextCompat +import com.android.launcher3.R + +/** + * Handles logic for the pagination arrow. The foreground and background images and the pressed / + * hovered state UX. + */ +@SuppressLint("AppCompatCustomView") +class PaginationArrow(context: Context, attrs: AttributeSet) : ImageView(context, attrs) { + + init { + foreground = ContextCompat.getDrawable(context, R.drawable.ic_chevron_left_rounded_700) + } + + companion object { + const val FULLY_OPAQUE = 1f + const val DISABLED_ARROW_OPACITY = .38f + } +} diff --git a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java index 185c3ee9ed..e94f3a065d 100644 --- a/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java +++ b/src/com/android/launcher3/workprofile/PersonalWorkSlidingTabStrip.java @@ -26,12 +26,9 @@ import androidx.annotation.Nullable; import com.android.launcher3.DeviceProfile; import com.android.launcher3.R; -import com.android.launcher3.pageindicators.Direction; import com.android.launcher3.pageindicators.PageIndicator; import com.android.launcher3.views.ActivityContext; -import java.util.function.Consumer; - /** * Supports two indicator colors, dedicated for personal and work tabs. */ @@ -80,11 +77,6 @@ public class PersonalWorkSlidingTabStrip extends LinearLayout implements PageInd public void setMarkersCount(int numMarkers) { } - @Override - public void setArrowClickListener(Consumer listener) { - // No-Op. All Apps doesn't need accessibility arrows for single click navigation. - } - @Override public boolean hasOverlappingRendering() { return false; From 71170e927638ec181d2756494347aa9ed390f962 Mon Sep 17 00:00:00 2001 From: Stefan Andonian Date: Fri, 11 Apr 2025 15:52:24 -0700 Subject: [PATCH 05/24] Implement Folder Pagination Arrow Hover / Pressed UX Bug: 394355070 Test: Verified locally that everything works. Check out bug for video test. Flag: com.android.launcher3.enable_launcher_visual_refresh Change-Id: Ief4b895d8eb31e6ed53b05aad4b733e8de41e4d9 --- res/drawable/ic_circle.xml | 26 +++++++++++++++++ res/values/attrs.xml | 1 + res/values/colors.xml | 3 ++ res/values/styles.xml | 2 ++ .../pageindicators/PaginationArrow.kt | 28 +++++++++++++++++++ 5 files changed, 60 insertions(+) create mode 100644 res/drawable/ic_circle.xml diff --git a/res/drawable/ic_circle.xml b/res/drawable/ic_circle.xml new file mode 100644 index 0000000000..2f5cf218e1 --- /dev/null +++ b/res/drawable/ic_circle.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 83c7ba3fd3..7d50d7dc02 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -48,6 +48,7 @@ + diff --git a/res/values/colors.xml b/res/values/colors.xml index 914ffd64c9..bfa588841e 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -75,6 +75,9 @@ #0B57D0 #A8C7FA + #000000 + #FFFFFF + #FFFFFFFF #FFFFFFFF #CCFFFFFF diff --git a/res/values/styles.xml b/res/values/styles.xml index e45176efac..b7e19e5aa9 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -60,6 +60,7 @@ #89000000 @style/WidgetContainerTheme @color/page_indicator_dot_color_light + @color/page_indicator_arrow_bg_light @color/materialColorSecondaryFixed @color/materialColorOnSecondaryFixedVariant @color/folder_preview_light @@ -130,6 +131,7 @@ @color/notification_dot_color_dark @style/WidgetContainerTheme.Dark @color/page_indicator_dot_color_dark + @color/page_indicator_arrow_bg_dark @color/folder_preview_dark @color/folder_background_dark ?android:attr/colorPrimary diff --git a/src/com/android/launcher3/pageindicators/PaginationArrow.kt b/src/com/android/launcher3/pageindicators/PaginationArrow.kt index 1ca21f9f4a..77a9e3c232 100644 --- a/src/com/android/launcher3/pageindicators/PaginationArrow.kt +++ b/src/com/android/launcher3/pageindicators/PaginationArrow.kt @@ -19,6 +19,7 @@ package com.android.launcher3.pageindicators import android.annotation.SuppressLint import android.content.Context import android.util.AttributeSet +import android.view.MotionEvent import android.widget.ImageView import androidx.core.content.ContextCompat import com.android.launcher3.R @@ -29,13 +30,40 @@ import com.android.launcher3.R */ @SuppressLint("AppCompatCustomView") class PaginationArrow(context: Context, attrs: AttributeSet) : ImageView(context, attrs) { + private val bgCircle = ContextCompat.getDrawable(context, R.drawable.ic_circle) init { foreground = ContextCompat.getDrawable(context, R.drawable.ic_chevron_left_rounded_700) } + override fun onTouchEvent(event: MotionEvent?): Boolean { + when (event?.action) { + MotionEvent.ACTION_DOWN -> { + background = bgCircle + background.alpha = BACKGROUND_PRESSED_OPACITY + } + MotionEvent.ACTION_UP -> background = null + } + return super.onTouchEvent(event) + } + + override fun onHoverEvent(event: MotionEvent?): Boolean { + when (event?.action) { + MotionEvent.ACTION_HOVER_ENTER -> { + background = bgCircle + background.alpha = BACKGROUND_HOVERED_OPACITY + } + MotionEvent.ACTION_HOVER_EXIT -> background = null + } + return super.onHoverEvent(event) + } + companion object { const val FULLY_OPAQUE = 1f const val DISABLED_ARROW_OPACITY = .38f + + // alpha ints are 0 - 255; the former being transparent and the latter being fully opaque + private const val BACKGROUND_HOVERED_OPACITY = 28 // 11% + private const val BACKGROUND_PRESSED_OPACITY = 38 // 15% } } From 7850221bdb05eee590718848c96756a1179e7cca Mon Sep 17 00:00:00 2001 From: Schneider Victor-Tulias Date: Thu, 10 Apr 2025 10:54:49 -0400 Subject: [PATCH 06/24] Clean up fully rolled out flag enable_additional_home_animations Flag: EXEMPT flag being removed Bug: 409610983 Test: None; flag is already fulled rolled out Change-Id: Ib2b20bd43868275c4059a6a4bc3c9319d37bc5c3 --- aconfig/launcher.aconfig | 10 ---------- .../com/android/quickstep/AbsSwipeUpHandler.java | 10 ++++------ .../android/quickstep/SwipeUpAnimationLogic.java | 14 ++++++-------- .../com/android/quickstep/views/RecentsView.java | 6 +----- src/com/android/launcher3/views/ClipIconView.java | 4 ---- .../android/launcher3/views/FloatingIconView.java | 4 +--- 6 files changed, 12 insertions(+), 36 deletions(-) diff --git a/aconfig/launcher.aconfig b/aconfig/launcher.aconfig index 269936179b..fa6879de02 100644 --- a/aconfig/launcher.aconfig +++ b/aconfig/launcher.aconfig @@ -254,16 +254,6 @@ flag { bug: "303471576" } -flag { - name: "enable_additional_home_animations" - namespace: "launcher" - description: "Enables custom home animations for non-running tasks" - bug: "237638627" - metadata { - purpose: PURPOSE_BUGFIX - } -} - flag { name: "enabled_folders_in_all_apps" namespace: "launcher" diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index 3079874ef2..e9b5e5e379 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -30,7 +30,6 @@ import static com.android.launcher3.BaseActivity.EVENT_DESTROYED; import static com.android.launcher3.BaseActivity.EVENT_STARTED; import static com.android.launcher3.BaseActivity.INVISIBLE_BY_STATE_HANDLER; import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS; -import static com.android.launcher3.Flags.enableAdditionalHomeAnimations; import static com.android.launcher3.Flags.enableGestureNavHorizontalTouchSlop; import static com.android.launcher3.Flags.enableScalingRevealHomeAnimation; import static com.android.launcher3.Flags.msdlFeedback; @@ -176,8 +175,6 @@ import com.android.wm.shell.shared.startingsurface.SplashScreenExitAnimationUtil import com.google.android.msdl.data.model.MSDLToken; -import kotlin.Unit; - import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -186,6 +183,8 @@ import java.util.Optional; import java.util.OptionalInt; import java.util.function.Consumer; +import kotlin.Unit; + /** * Handles the navigation gestures when Launcher is the default home activity. */ @@ -1691,10 +1690,9 @@ public abstract class AbsSwipeUpHandler< isTranslucent, appCanEnterPip, runningTaskTarget, - !enableAdditionalHomeAnimations() - || mRecentsView == null + mRecentsView == null || mRecentsView.getCurrentPage() == mRecentsView.getRunningTaskIndex() - ? null : mRecentsView.getCurrentPageTaskView()); + ? null : mRecentsView.getCurrentPageTaskView()); SwipePipToHomeAnimator swipePipToHomeAnimator = !mIsSwipeForSplit && appCanEnterPip ? createWindowAnimationToPip(homeAnimFactory, runningTaskTarget, start) : null; diff --git a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java index 0d7a892252..a01dfbebfe 100644 --- a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java +++ b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java @@ -17,7 +17,6 @@ package com.android.quickstep; import static com.android.app.animation.Interpolators.ACCELERATE_1_5; import static com.android.app.animation.Interpolators.LINEAR; -import static com.android.launcher3.Flags.enableAdditionalHomeAnimations; import static com.android.launcher3.PagedView.INVALID_PAGE; import android.animation.Animator; @@ -460,7 +459,7 @@ public abstract class SwipeUpAnimationLogic implements float alpha = mAnimationFactory.getWindowAlpha(progress); mHomeAnim.setPlayFraction(progress); - if (!enableAdditionalHomeAnimations() || mTargetTaskView == null) { + if (mTargetTaskView == null) { mHomeToWindowPositionMap.mapRect(mWindowCurrentRect, currentRect); mMatrix.setRectToRect(mCropRectF, mWindowCurrentRect, ScaleToFit.FILL); mLocalTransformParams @@ -480,10 +479,9 @@ public abstract class SwipeUpAnimationLogic implements currentRect, progress, mMatrix.mapRadius(cornerRadius), - !enableAdditionalHomeAnimations() || mTargetTaskView == null - ? 0 : (int) (alpha * 255)); + mTargetTaskView == null ? 0 : (int) (alpha * 255)); - if (!enableAdditionalHomeAnimations() || mTargetTaskView == null) { + if (mTargetTaskView == null) { return; } if (mAnimationFactory.isAnimatingIntoIcon() && mAnimationFactory.isAnimationReady()) { @@ -543,7 +541,7 @@ public abstract class SwipeUpAnimationLogic implements public void onAnimationStart(Animator animation) { setUp(); mHomeAnim.dispatchOnStart(); - if (!enableAdditionalHomeAnimations() || mTargetTaskView == null) { + if (mTargetTaskView == null) { return; } Rect thumbnailBounds = new Rect(); @@ -558,7 +556,7 @@ public abstract class SwipeUpAnimationLogic implements } private void setUp() { - if (!enableAdditionalHomeAnimations() || mTargetTaskView == null) { + if (mTargetTaskView == null) { return; } RecentsView recentsView = mTargetTaskView.getRecentsView(); @@ -579,7 +577,7 @@ public abstract class SwipeUpAnimationLogic implements } private void cleanUp() { - if (!enableAdditionalHomeAnimations() || mTargetTaskView == null) { + if (mTargetTaskView == null) { return; } RecentsView recentsView = mTargetTaskView.getRecentsView(); diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 1603f1f81c..6c007fb7ef 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -35,11 +35,9 @@ import static com.android.app.animation.Interpolators.LINEAR; import static com.android.app.animation.Interpolators.clampToProgress; import static com.android.launcher3.AbstractFloatingView.TYPE_REBIND_SAFE; import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS; -import static com.android.launcher3.Flags.enableAdditionalHomeAnimations; import static com.android.launcher3.Flags.enableDesktopExplodedView; import static com.android.launcher3.Flags.enableDesktopTaskAlphaAnimation; import static com.android.launcher3.Flags.enableExpressiveDismissTaskMotion; -import static com.android.launcher3.util.OverviewReleaseFlags.enableGridOnlyOverview; import static com.android.launcher3.Flags.enableLargeDesktopWindowingTile; import static com.android.launcher3.Flags.enableOverviewBackgroundWallpaperBlur; import static com.android.launcher3.Flags.enableRefactorTaskThumbnail; @@ -64,6 +62,7 @@ import static com.android.launcher3.touch.PagedOrientationHandler.CANVAS_TRANSLA import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; import static com.android.launcher3.util.MultiPropertyFactory.MULTI_PROPERTY_VALUE; +import static com.android.launcher3.util.OverviewReleaseFlags.enableGridOnlyOverview; import static com.android.launcher3.util.SystemUiController.UI_STATE_FULLSCREEN_TASK; import static com.android.quickstep.BaseContainerInterface.getTaskDimension; import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId; @@ -4863,9 +4862,6 @@ public abstract class RecentsView< * than the running task, when updating page offsets. */ public void setOffsetMidpointIndexOverride(int offsetMidpointIndexOverride) { - if (!enableAdditionalHomeAnimations()) { - return; - } mOffsetMidpointIndexOverride = offsetMidpointIndexOverride; updatePageOffsets(); } diff --git a/src/com/android/launcher3/views/ClipIconView.java b/src/com/android/launcher3/views/ClipIconView.java index 30a3c4540b..eb25003925 100644 --- a/src/com/android/launcher3/views/ClipIconView.java +++ b/src/com/android/launcher3/views/ClipIconView.java @@ -16,7 +16,6 @@ package com.android.launcher3.views; import static com.android.app.animation.Interpolators.LINEAR; -import static com.android.launcher3.Flags.enableAdditionalHomeAnimations; import static com.android.launcher3.Utilities.boundToRange; import static com.android.launcher3.Utilities.mapToRange; import static com.android.launcher3.anim.AnimatorListeners.forEndCallback; @@ -102,9 +101,6 @@ public class ClipIconView extends View implements ClipPathView { * within the clip bounds of this view. */ public void setTaskViewArtist(TaskViewArtist taskViewArtist) { - if (!enableAdditionalHomeAnimations()) { - return; - } mTaskViewArtist = taskViewArtist; invalidate(); } diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java index 5b3abc383a..e2b56bef10 100644 --- a/src/com/android/launcher3/views/FloatingIconView.java +++ b/src/com/android/launcher3/views/FloatingIconView.java @@ -18,7 +18,6 @@ package com.android.launcher3.views; import static android.view.Gravity.LEFT; import static com.android.app.animation.Interpolators.LINEAR; -import static com.android.launcher3.Flags.enableAdditionalHomeAnimations; import static com.android.launcher3.Utilities.getFullDrawable; import static com.android.launcher3.Utilities.mapToRange; import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; @@ -169,8 +168,7 @@ public class FloatingIconView extends FrameLayout implements // FIV hasn't fully laid out. During those frames, hide this FIV and continue drawing the // TaskView directly while transforming it in the place of this FIV. However, if we fade // the TaskView at all, we need to display this FIV regardless. - setAlpha(!enableAdditionalHomeAnimations() || isLaidOut() || taskViewDrawAlpha < 255 - ? alpha : 0f); + setAlpha(isLaidOut() || taskViewDrawAlpha < 255 ? alpha : 0f); mClipIconView.update(rect, progress, shapeProgressStart, cornerRadius, isOpening, this, mLauncher.getDeviceProfile(), taskViewDrawAlpha); From 01d3f6f210c958daa310499db99800d9943bc09a Mon Sep 17 00:00:00 2001 From: Adnan Begovic Date: Wed, 9 Apr 2025 13:37:23 -0700 Subject: [PATCH 07/24] launcher3: Introduce executors modules. The following change contains three parts: 1. Qualifiers for executor types. 2. A mapping of any provided-for-those-qualifier-types to executors, executor services, or scheduled executor servies. 3. The exposure of the existing dagger qualifiers as a specific build target. With this change, any host(launcher) can provide bindings for these annotations stipulating whatever pool or thread allocations as they see fit, while any dependent modules that want to isolate their code from launcher can build against the qualifiers library to ensure that they receive the right kind of executor at injection. Bug: 407593767 Test: N/A Flag: NONE - new module Change-Id: I7e6ba623c7f85ec11bb86d1d3a66486f68efe7f6 --- Android.bp | 1 + concurrent/Android.bp | 47 +++++++ .../launcher3/concurrent/ExecutorsModule.kt | 130 ++++++++++++++++++ .../concurrent/annotations/Background.kt | 37 +++++ .../annotations/LightweightBackground.kt | 65 +++++++++ .../concurrent/annotations/ThreadPool.kt | 38 +++++ .../launcher3/concurrent/annotations/Ui.kt | 35 +++++ dagger/Android.bp | 31 +++++ .../dagger/ActivityContextScope.java | 0 .../launcher3/dagger/ApplicationContext.java | 0 .../dagger/LauncherAppSingleton.java | 0 11 files changed, 384 insertions(+) create mode 100644 concurrent/Android.bp create mode 100644 concurrent/src/com/android/launcher3/concurrent/ExecutorsModule.kt create mode 100644 concurrent/src/com/android/launcher3/concurrent/annotations/Background.kt create mode 100644 concurrent/src/com/android/launcher3/concurrent/annotations/LightweightBackground.kt create mode 100644 concurrent/src/com/android/launcher3/concurrent/annotations/ThreadPool.kt create mode 100644 concurrent/src/com/android/launcher3/concurrent/annotations/Ui.kt create mode 100644 dagger/Android.bp rename {src => dagger/src}/com/android/launcher3/dagger/ActivityContextScope.java (100%) rename {src => dagger/src}/com/android/launcher3/dagger/ApplicationContext.java (100%) rename {src => dagger/src}/com/android/launcher3/dagger/LauncherAppSingleton.java (100%) diff --git a/Android.bp b/Android.bp index 9c2d97ba88..0203c136cf 100644 --- a/Android.bp +++ b/Android.bp @@ -402,6 +402,7 @@ android_library { "dagger2", "jsr330", "com_android_systemui_shared_flags_lib", + "launcher-dagger-qualifiers", ], manifest: "AndroidManifest-common.xml", sdk_version: "current", diff --git a/concurrent/Android.bp b/concurrent/Android.bp new file mode 100644 index 0000000000..a6132b9f6b --- /dev/null +++ b/concurrent/Android.bp @@ -0,0 +1,47 @@ +// Copyright (C) 2025 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 { + // See: http://go/android-license-faq + default_applicable_licenses: ["Android-Apache-2.0"], +} + +java_library { + name: "launcher-executor-qualifiers", + srcs: [ + "src/com/android/launcher3/concurrent/annotations/Background.kt", + "src/com/android/launcher3/concurrent/annotations/LightweightBackground.kt", + "src/com/android/launcher3/concurrent/annotations/ThreadPool.kt", + "src/com/android/launcher3/concurrent/annotations/Ui.kt", + ], + static_libs: [ + "androidx.annotation_annotation", + "jsr330", + ], +} + +java_library { + name: "launcher-executors-module", + srcs: [ + "src/com/android/launcher3/concurrent/ExecutorsModule.kt", + ], + plugins: ["dagger2-compiler"], + static_libs: [ + "androidx.annotation_annotation", + "dagger2", + "guava", + "jsr330", + "launcher-executor-qualifiers", + ], +} diff --git a/concurrent/src/com/android/launcher3/concurrent/ExecutorsModule.kt b/concurrent/src/com/android/launcher3/concurrent/ExecutorsModule.kt new file mode 100644 index 0000000000..0a761cb46b --- /dev/null +++ b/concurrent/src/com/android/launcher3/concurrent/ExecutorsModule.kt @@ -0,0 +1,130 @@ +/* + * Copyright (C) 2025 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.launcher3.concurrent + +import com.android.launcher3.concurrent.annotations.Background +import com.android.launcher3.concurrent.annotations.LightweightBackground +import com.android.launcher3.concurrent.annotations.LightweightBackgroundPriority +import com.android.launcher3.concurrent.annotations.ThreadPool +import com.android.launcher3.concurrent.annotations.Ui + +import com.google.common.util.concurrent.ListeningExecutorService + +import dagger.Binds +import dagger.Module +import dagger.Provides + +import java.util.concurrent.Executor +import java.util.concurrent.ExecutorService +import javax.inject.Singleton + +/** + * Module that stipulates the executors that are usable by common launcher + * modules. + * + * This module does not provide the executors directly, but rather provides + * the qualifiers that are used to inject the executors and their derivatives + * when modules themselves need to utilize them. + * + * The executors are provided as follows: + * - @ThreadPool: Provides an unordered background executor or derivative + * backed by a thread pool. + * - @Background: Provides an ordered background executor or derivative. + * - @LightweightBackground: Provides a lightweight background executor or + * derivative that is either time sensitive or not depending on the + * [LightweightBackgroundPriority] flag. + * - @Ui: Provides a UI executor or derivative. + * + * The executors are provided as [Executor], [ExecutorService] or + * [ListeningExecutorService]. + * + * Implementations for the executors should be provided as + * [ListeningExecutorService] by the host. + */ +@Module +interface ExecutorsModule { + + // Unordered background executors + @Binds + @ThreadPool + fun provideThreadPoolExecutor( + @ThreadPool listeningExecutorService: ListeningExecutorService + ): Executor + + @Binds + @ThreadPool + fun provideThreadPoolExecutorService( + @ThreadPool listeningExecutorService: ListeningExecutorService + ): ExecutorService + // end unordered background executors + + // Ordered background executors + @Binds + @Background + fun provideBackgroundExecutor( + @Background listeningExecutorService: ListeningExecutorService + ): Executor + + @Binds + @Background + fun provideBackgroundExecutorService( + @Background listeningExecutorService: ListeningExecutorService + ): ExecutorService + + @Binds + @LightweightBackground(LightweightBackgroundPriority.UI) + fun provideUiLightweightBackgroundExecutor( + @LightweightBackground(LightweightBackgroundPriority.UI) + listeningExecutorService: ListeningExecutorService + ): Executor + + @Binds + @LightweightBackground(LightweightBackgroundPriority.UI) + fun provideUiLightweightBackgroundExecutorService( + @LightweightBackground(LightweightBackgroundPriority.UI) + listeningExecutorService: ListeningExecutorService + ): ExecutorService + + @Binds + @LightweightBackground(LightweightBackgroundPriority.DATA) + fun provideDataLightweightBackgroundExecutor( + @LightweightBackground(LightweightBackgroundPriority.DATA) + listeningExecutorService: ListeningExecutorService + ): Executor + + @Binds + @LightweightBackground(LightweightBackgroundPriority.DATA) + fun provideDataLightweightBackgroundExecutorService( + @LightweightBackground(LightweightBackgroundPriority.DATA) + listeningExecutorService: ListeningExecutorService + ): ExecutorService + // end ordered background executors + + // UI executors + @Binds + @Ui + fun provideUiExecutor( + @Ui listeningExecutorService: ListeningExecutorService + ): Executor + + @Binds + @Ui + fun provideUiExecutorService( + @Ui listeningExecutorService: ListeningExecutorService + ): ExecutorService + // end UI executors +} \ No newline at end of file diff --git a/concurrent/src/com/android/launcher3/concurrent/annotations/Background.kt b/concurrent/src/com/android/launcher3/concurrent/annotations/Background.kt new file mode 100644 index 0000000000..2084568b67 --- /dev/null +++ b/concurrent/src/com/android/launcher3/concurrent/annotations/Background.kt @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2025 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.launcher3.concurrent.annotations + +import javax.inject.Qualifier + +/** + * Qualifier for an [Executor] or derivative that runs on a background thread. + * + * This is a background executor that is suitable for common system service + * interactions that could be time consuming. + * + * Usecases include: + * - Sequential system service interactions + * - Sequential I/O interactions + * - etc. + * + * Tasks submitted to this executor are guaranteed to be ordered, but are not + * guaranteed to be executed immediately. + */ +@Qualifier +@Retention(AnnotationRetention.RUNTIME) +annotation class Background \ No newline at end of file diff --git a/concurrent/src/com/android/launcher3/concurrent/annotations/LightweightBackground.kt b/concurrent/src/com/android/launcher3/concurrent/annotations/LightweightBackground.kt new file mode 100644 index 0000000000..3c856574a6 --- /dev/null +++ b/concurrent/src/com/android/launcher3/concurrent/annotations/LightweightBackground.kt @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2025 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.launcher3.concurrent.annotations + +import javax.inject.Qualifier + +/** + * Priority of the lightweight background executor. + */ +enum class LightweightBackgroundPriority { + + /** + * Priority definition for lightweight background work that is not time + * sensitive, typically for data transformations. + */ + DATA, + + /** + * Priority definition for lightweight background work that is time + * sensitive, typically for user interaction feedback. + */ + UI +} + +/** + * Qualifier for an [Executor] or derivative that runs on a lightweight + * background thread. + * + * This is a lightweight executor that is suitable for running cheap background + * tasks that can either be time sensitive or not depending on the + * [LightweightBackgroundPriority] flag. + * + * LighweightBackground is distinct from Background in that it will not pollute + * the other as to ensure responsiveness of either. + * + * Non priority usecases include: + * - Data transformations within repository layers + * + * Priority usecases include: + * - Responses to user interactions + * + * Tasks submitted to this executor are guaranteed to be ordered. + * + * @param priority The priority of the lightweight background executor. By + * default, this is [LightweightBackgroundPriority.DATA]. + */ +@Qualifier +@Retention(AnnotationRetention.RUNTIME) +annotation class LightweightBackground( + val priority: LightweightBackgroundPriority = LightweightBackgroundPriority.DATA +) \ No newline at end of file diff --git a/concurrent/src/com/android/launcher3/concurrent/annotations/ThreadPool.kt b/concurrent/src/com/android/launcher3/concurrent/annotations/ThreadPool.kt new file mode 100644 index 0000000000..cc3b192f32 --- /dev/null +++ b/concurrent/src/com/android/launcher3/concurrent/annotations/ThreadPool.kt @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2025 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.launcher3.concurrent.annotations + +import javax.inject.Qualifier + +/** + * Qualifier for an [Executor] or derivative that runs on a background thread + * pool. + * + * This is a background executor that provides execution of tasks that + * are not time sensitive and are time consuming. + * + * Usecases include: + * - Multiple disk I/O interactions + * - Network I/O interactions + * - etc. + * + * Tasks submitted to this executor are not guaranteed to be ordered and may be + * executed immediately or at a later time. + */ +@Qualifier +@Retention(AnnotationRetention.RUNTIME) +annotation class ThreadPool \ No newline at end of file diff --git a/concurrent/src/com/android/launcher3/concurrent/annotations/Ui.kt b/concurrent/src/com/android/launcher3/concurrent/annotations/Ui.kt new file mode 100644 index 0000000000..5580c428a0 --- /dev/null +++ b/concurrent/src/com/android/launcher3/concurrent/annotations/Ui.kt @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2025 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.launcher3.concurrent.annotations + +import javax.inject.Qualifier + +/** + * Qualifier for an [Executor] or derivative that runs on the UI thread. + * + * This is the main thread executor that is suitable for running tasks that are + * time sensitive and are expected to run on the UI thread immediately. + * + * Usecases include: + * - Responsive UI updates + * + * Tasks submitted to this executor are guaranteed to be ordered and executed + * immediately. + */ +@Qualifier +@Retention(AnnotationRetention.RUNTIME) +annotation class Ui \ No newline at end of file diff --git a/dagger/Android.bp b/dagger/Android.bp new file mode 100644 index 0000000000..4dbe868445 --- /dev/null +++ b/dagger/Android.bp @@ -0,0 +1,31 @@ +// Copyright (C) 2025 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 { + // See: http://go/android-license-faq + default_applicable_licenses: ["Android-Apache-2.0"], +} + +java_library { + name: "launcher-dagger-qualifiers", + srcs: [ + "src/com/android/launcher3/dagger/ActivityContextScope.java", + "src/com/android/launcher3/dagger/ApplicationContext.java", + "src/com/android/launcher3/dagger/LauncherAppSingleton.java", + ], + static_libs: [ + "androidx.annotation_annotation", + "jsr330", + ], +} diff --git a/src/com/android/launcher3/dagger/ActivityContextScope.java b/dagger/src/com/android/launcher3/dagger/ActivityContextScope.java similarity index 100% rename from src/com/android/launcher3/dagger/ActivityContextScope.java rename to dagger/src/com/android/launcher3/dagger/ActivityContextScope.java diff --git a/src/com/android/launcher3/dagger/ApplicationContext.java b/dagger/src/com/android/launcher3/dagger/ApplicationContext.java similarity index 100% rename from src/com/android/launcher3/dagger/ApplicationContext.java rename to dagger/src/com/android/launcher3/dagger/ApplicationContext.java diff --git a/src/com/android/launcher3/dagger/LauncherAppSingleton.java b/dagger/src/com/android/launcher3/dagger/LauncherAppSingleton.java similarity index 100% rename from src/com/android/launcher3/dagger/LauncherAppSingleton.java rename to dagger/src/com/android/launcher3/dagger/LauncherAppSingleton.java From 3b0dd9609391c478367dd049e909832b8d489fc2 Mon Sep 17 00:00:00 2001 From: Adnan Begovic Date: Fri, 11 Apr 2025 16:31:13 -0700 Subject: [PATCH 08/24] launcher3: Implement ExecutorsModule Implement the ExecutorsModule interface to provide the necessary dependencies needed for having injectable executors. Bug: 407593767 Test: N/A Flag: NONE - new module Change-Id: I4a53fc6be31664b7a6fa907761ea93a2d0377f08 --- Android.bp | 4 +- concurrent/Android.bp | 6 ++ .../dagger/LauncherConcurrencyModule.kt | 1 + .../quickstep/RecentTasksListTest.java | 5 +- .../launcher3/dagger/LauncherAppModule.java | 5 + .../graphics/LauncherPreviewRenderer.java | 4 + src/com/android/launcher3/util/Executors.java | 6 ++ .../android/launcher3/util/LooperExecutor.kt | 8 +- .../util/dagger/LauncherExecutorsModule.kt | 92 +++++++++++++++++++ 9 files changed, 125 insertions(+), 6 deletions(-) create mode 100644 src/com/android/launcher3/util/dagger/LauncherExecutorsModule.kt diff --git a/Android.bp b/Android.bp index 0203c136cf..cc8a8c875d 100644 --- a/Android.bp +++ b/Android.bp @@ -403,6 +403,8 @@ android_library { "jsr330", "com_android_systemui_shared_flags_lib", "launcher-dagger-qualifiers", + "launcher-executor-qualifiers", + "launcher-executors-module" ], manifest: "AndroidManifest-common.xml", sdk_version: "current", @@ -428,7 +430,7 @@ android_app { srcs: [ ":launcher-src", ":launcher-src_no_quickstep", - ":launcher-build-config", + ":launcher-build-config" ], optimize: { diff --git a/concurrent/Android.bp b/concurrent/Android.bp index a6132b9f6b..b3ed449990 100644 --- a/concurrent/Android.bp +++ b/concurrent/Android.bp @@ -25,6 +25,9 @@ java_library { "src/com/android/launcher3/concurrent/annotations/ThreadPool.kt", "src/com/android/launcher3/concurrent/annotations/Ui.kt", ], + sdk_version: "current", + min_sdk_version: min_launcher3_sdk_version, + target_sdk_version: "current", static_libs: [ "androidx.annotation_annotation", "jsr330", @@ -36,6 +39,9 @@ java_library { srcs: [ "src/com/android/launcher3/concurrent/ExecutorsModule.kt", ], + sdk_version: "current", + min_sdk_version: min_launcher3_sdk_version, + target_sdk_version: "current", plugins: ["dagger2-compiler"], static_libs: [ "androidx.annotation_annotation", diff --git a/quickstep/src/com/android/launcher3/dagger/LauncherConcurrencyModule.kt b/quickstep/src/com/android/launcher3/dagger/LauncherConcurrencyModule.kt index cb2220d589..2d8da22187 100644 --- a/quickstep/src/com/android/launcher3/dagger/LauncherConcurrencyModule.kt +++ b/quickstep/src/com/android/launcher3/dagger/LauncherConcurrencyModule.kt @@ -30,6 +30,7 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.SupervisorJob /** Dagger Module for per-display thread handling. */ +// TODO(b/407594919) - Adapt this to use new concurrency module. @Module object LauncherConcurrencyModule { // Slow BG executor can potentially affect UI if UI is waiting for an updated state from this diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentTasksListTest.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentTasksListTest.java index 867995ff8b..81f1485958 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentTasksListTest.java +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentTasksListTest.java @@ -50,6 +50,7 @@ import androidx.test.filters.SmallTest; import com.android.internal.R; import com.android.launcher3.statehandlers.DesktopVisibilityController; import com.android.launcher3.util.DaggerSingletonTracker; +import com.android.launcher3.util.Executors; import com.android.launcher3.util.LooperExecutor; import com.android.quickstep.util.DesktopTask; import com.android.quickstep.util.GroupTask; @@ -94,7 +95,7 @@ public class RecentTasksListTest { @Before public void setup() { MockitoAnnotations.initMocks(this); - LooperExecutor mockMainThreadExecutor = mock(LooperExecutor.class); + LooperExecutor mainThreadExecutor = Executors.MAIN_EXECUTOR; KeyguardManager mockKeyguardManager = mock(KeyguardManager.class); // Set desktop mode supported @@ -103,7 +104,7 @@ public class RecentTasksListTest { when(mResources.getBoolean(R.bool.config_canInternalDisplayHostDesktops)) .thenReturn(true); - mRecentTasksList = new RecentTasksList(mContext, mockMainThreadExecutor, + mRecentTasksList = new RecentTasksList(mContext, mainThreadExecutor, mockKeyguardManager, mSystemUiProxy, mTopTaskTracker, mock(DesktopVisibilityController.class), mock(DaggerSingletonTracker.class)); diff --git a/src/com/android/launcher3/dagger/LauncherAppModule.java b/src/com/android/launcher3/dagger/LauncherAppModule.java index ef20a616a6..eb3a17ca41 100644 --- a/src/com/android/launcher3/dagger/LauncherAppModule.java +++ b/src/com/android/launcher3/dagger/LauncherAppModule.java @@ -16,6 +16,9 @@ package com.android.launcher3.dagger; +import com.android.launcher3.concurrent.ExecutorsModule; +import com.android.launcher3.util.dagger.LauncherExecutorsModule; + import dagger.Module; @Module(includes = { @@ -27,6 +30,8 @@ import dagger.Module; AppModule.class, PerDisplayModule.class, LauncherConcurrencyModule.class, + ExecutorsModule.class, + LauncherExecutorsModule.class }) public class LauncherAppModule { } diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java index 12fc394eea..6438ddafbc 100644 --- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java +++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java @@ -74,6 +74,7 @@ import com.android.launcher3.Workspace; import com.android.launcher3.WorkspaceLayoutManager; import com.android.launcher3.celllayout.CellLayoutLayoutParams; import com.android.launcher3.celllayout.CellPosMapper; +import com.android.launcher3.concurrent.ExecutorsModule; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.dagger.ApiWrapperModule; import com.android.launcher3.dagger.AppModule; @@ -94,6 +95,7 @@ import com.android.launcher3.model.LoaderTask.LoaderTaskFactory; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.LauncherAppWidgetInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; +import com.android.launcher3.util.dagger.LauncherExecutorsModule; import com.android.launcher3.util.BaseContext; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.IntSet; @@ -558,6 +560,8 @@ public class LauncherPreviewRenderer extends BaseContext AppModule.class, PerDisplayModule.class, LauncherConcurrencyModule.class, + ExecutorsModule.class, + LauncherExecutorsModule.class }) public interface PreviewAppComponent extends LauncherAppComponent { diff --git a/src/com/android/launcher3/util/Executors.java b/src/com/android/launcher3/util/Executors.java index 296fc8ad27..23db7a1b28 100644 --- a/src/com/android/launcher3/util/Executors.java +++ b/src/com/android/launcher3/util/Executors.java @@ -66,6 +66,12 @@ public class Executors { public static final LooperExecutor UI_HELPER_EXECUTOR = new LooperExecutor("UiThreadHelper", Process.THREAD_PRIORITY_FOREGROUND); + /** + * A background executor for running tasks that are not time sensitive, typically for data + * transformations. + */ + public static final LooperExecutor DATA_HELPER_EXECUTOR = + new LooperExecutor("DataThreadHelper", Process.THREAD_PRIORITY_DEFAULT); /** A background executor to preinflate views. */ public static final ExecutorService VIEW_PREINFLATION_EXECUTOR = diff --git a/src/com/android/launcher3/util/LooperExecutor.kt b/src/com/android/launcher3/util/LooperExecutor.kt index 6ff528d264..aff46ec8d7 100644 --- a/src/com/android/launcher3/util/LooperExecutor.kt +++ b/src/com/android/launcher3/util/LooperExecutor.kt @@ -21,12 +21,14 @@ import android.os.Looper import android.os.Process import android.os.Process.THREAD_PRIORITY_FOREGROUND import androidx.annotation.IntDef -import java.util.concurrent.AbstractExecutorService + +import com.google.common.util.concurrent.AbstractListeningExecutorService + import java.util.concurrent.TimeUnit import kotlin.annotation.AnnotationRetention.SOURCE -/** Extension of [AbstractExecutorService] which executed on a provided looper. */ -class LooperExecutor(looper: Looper, private val defaultPriority: Int) : AbstractExecutorService() { +/** Extension of [AbstractListeningExecutorService] which executed on a provided looper. */ +class LooperExecutor(looper: Looper, private val defaultPriority: Int) : AbstractListeningExecutorService() { val handler: Handler = Handler(looper) @JvmOverloads diff --git a/src/com/android/launcher3/util/dagger/LauncherExecutorsModule.kt b/src/com/android/launcher3/util/dagger/LauncherExecutorsModule.kt new file mode 100644 index 0000000000..b80fa575cf --- /dev/null +++ b/src/com/android/launcher3/util/dagger/LauncherExecutorsModule.kt @@ -0,0 +1,92 @@ +/* + * Copyright (C) 2025 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.launcher3.util.dagger + +import com.android.launcher3.concurrent.annotations.Background +import com.android.launcher3.concurrent.annotations.LightweightBackground +import com.android.launcher3.concurrent.annotations.LightweightBackgroundPriority +import com.android.launcher3.concurrent.annotations.Ui +import com.android.launcher3.concurrent.annotations.ThreadPool + +import com.android.launcher3.concurrent.ExecutorsModule + +import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.util.Executors +import com.android.launcher3.util.LooperExecutor + +import com.google.common.util.concurrent.ListeningExecutorService +import com.google.common.util.concurrent.MoreExecutors + +import dagger.Module +import dagger.Binds +import dagger.Provides + +import java.util.concurrent.Executor +import java.util.concurrent.ExecutorService + +/** + * Module that provides the executors for Launcher3 as per the [ExecutorsModule] + * interface. + */ +@Module +abstract class LauncherExecutorsModule { + + // Include UI LooperExecutor bindings here since they're not provided + // by the ExecutorsModule interface. + @Binds + @LauncherAppSingleton + @Ui + abstract fun provideUiExecutor( + @Ui executor: LooperExecutor + ): ListeningExecutorService + + companion object { + @Provides + @LauncherAppSingleton + @Ui + fun provideUiLooperExecutor(): LooperExecutor { + return Executors.MAIN_EXECUTOR + } + + @Provides + @LauncherAppSingleton + @LightweightBackground(LightweightBackgroundPriority.UI) + fun provideUiExecutorService(): ListeningExecutorService { + return Executors.UI_HELPER_EXECUTOR + } + + @Provides + @LauncherAppSingleton + @LightweightBackground(LightweightBackgroundPriority.DATA) + fun provideDataExecutorService(): ListeningExecutorService { + return Executors.DATA_HELPER_EXECUTOR + } + + @Provides + @LauncherAppSingleton + @Background + fun provideBackgroundExecutorService(): ListeningExecutorService { + return Executors.ORDERED_BG_EXECUTOR + } + + @Provides + @LauncherAppSingleton + @ThreadPool + fun provideThreadPoolExecutorService(): ListeningExecutorService { + return MoreExecutors.listeningDecorator(Executors.THREAD_POOL_EXECUTOR) + } + } +} \ No newline at end of file From d6c2964922f6984760893bf28059fc4707f93548 Mon Sep 17 00:00:00 2001 From: Ajinkya Chalke Date: Mon, 14 Apr 2025 11:49:34 +0000 Subject: [PATCH 09/24] Sort flattened tasks based on last active time Test: m Flag: com.android.launcher3.enable_alt_tab_kqs_flatenning Bug: 382769617 Change-Id: I1b7de34fbef9dd90c8d99ae9893ba71dcf565bc7 --- .../taskbar/KeyboardQuickSwitchController.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java index 4738c0ff9e..a434cd1b37 100644 --- a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java +++ b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java @@ -45,6 +45,7 @@ import com.android.systemui.shared.system.ActivityManagerWrapper; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.List; import java.util.Set; import java.util.function.Consumer; @@ -271,13 +272,23 @@ public final class KeyboardQuickSwitchController implements .filter(task -> !shouldExcludeTask(task, taskIdsToExclude)) .toList(); - // TODO(b/382769617): Sort tasks, including desktop and split, before limiting to max. mTasks = allTasks.stream() + .sorted(combinedTasksComparator()) .limit(MAX_TASKS) .toList(); mNumHiddenTasks = Math.max(0, allTasks.size() - MAX_TASKS); } + private static Comparator combinedTasksComparator() { + return Comparator.comparingLong((GroupTask groupTask) -> + groupTask.getTasks().stream() + .map(task -> task.key.lastActiveTime) + .max(Comparator.naturalOrder()) + // Empty tasks list shouldn't be possible so return -1 in that case. + .orElse(-1L)) + .reversed(); + } + private void processLoadedTasksOutsideDesktop(List tasks, Set taskIdsToExclude) { // Only store MAX_TASK tasks, from most to least recent From b4c610492594556be6e400fda2d8190287babb42 Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Mon, 14 Apr 2025 15:32:45 +0100 Subject: [PATCH 10/24] Injrect WindowContext into RecentsWindowManager - Also inject SystemUiProxy and RecentsModel - Also creates a DesktopRecentsTransitionController to avoid crashing when launching desktop tasks - Minor clean-up to use this instead of injected context in RecentsWindowManager Bug: 408988616 Test: manual Flag: com.android.launcher3.enable_fallback_overview_in_window Flag: com.android.launcher3.enable_launcher_overview_in_window Change-Id: I0691d5266f3eae1376ffadd6b29e3ec635b0354b --- .../launcher3/dagger/PerDisplayModule.kt | 34 +++++++++++++++++++ .../fallback/window/RecentsWindowManager.kt | 34 ++++++++++++------- .../quickstep/LauncherSwipeHandlerV2Test.kt | 10 ++++-- .../launcher3/dagger/WindowContext.java | 32 +++++++++++++++++ 4 files changed, 95 insertions(+), 15 deletions(-) create mode 100644 src/com/android/launcher3/dagger/WindowContext.java diff --git a/quickstep/src/com/android/launcher3/dagger/PerDisplayModule.kt b/quickstep/src/com/android/launcher3/dagger/PerDisplayModule.kt index 05f19ed56e..51db1c6648 100644 --- a/quickstep/src/com/android/launcher3/dagger/PerDisplayModule.kt +++ b/quickstep/src/com/android/launcher3/dagger/PerDisplayModule.kt @@ -21,6 +21,7 @@ import android.hardware.display.DisplayManager import android.os.Handler import android.util.Log import android.view.Display.DEFAULT_DISPLAY +import android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY import com.android.app.displaylib.DefaultDisplayOnlyInstanceRepositoryImpl import com.android.app.displaylib.DisplayLibBackground import com.android.app.displaylib.DisplayLibComponent @@ -178,6 +179,39 @@ object PerDisplayRepositoriesModule { ) } } + + @Provides + @LauncherAppSingleton + @WindowContext + fun provideWindowContext( + repositoryFactory: PerDisplayInstanceRepositoryImpl.Factory, + displayRepository: DisplayRepository, + @ApplicationContext context: Context, + ): PerDisplayRepository { + return if (enableOverviewOnConnectedDisplays()) { + repositoryFactory.create( + "DisplayContextRepo", + { displayId -> + displayRepository.getDisplay(displayId)?.let { + context.createWindowContext( + it, + TYPE_APPLICATION_OVERLAY, + /* options=*/ null, + ) + } + }, + ) + } else { + SingleInstanceRepositoryImpl( + "DisplayContextRepo", + context.createWindowContext( + displayRepository.getDisplay(DEFAULT_DISPLAY)!!, + TYPE_APPLICATION_OVERLAY, + /* options=*/ null, + ), + ) + } + } } /** diff --git a/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt b/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt index 91ab561b47..6250384245 100644 --- a/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt +++ b/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt @@ -31,7 +31,6 @@ import android.view.RemoteAnimationTarget import android.view.SurfaceControl import android.view.View import android.view.WindowManager -import android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY import android.window.RemoteTransition import com.android.app.displaylib.PerDisplayInstanceProviderWithTeardown import com.android.app.displaylib.PerDisplayRepository @@ -42,8 +41,9 @@ import com.android.launcher3.LauncherAnimationRunner.RemoteAnimationFactory import com.android.launcher3.LauncherState import com.android.launcher3.R import com.android.launcher3.compat.AccessibilityManagerCompat -import com.android.launcher3.dagger.DisplayContext import com.android.launcher3.dagger.LauncherAppSingleton +import com.android.launcher3.dagger.WindowContext +import com.android.launcher3.desktop.DesktopRecentsTransitionController import com.android.launcher3.statemanager.StateManager import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory import com.android.launcher3.statemanager.StatefulContainer @@ -104,8 +104,13 @@ import javax.inject.Inject */ class RecentsWindowManager @AssistedInject -constructor(@Assisted context: Context, wallpaperColorHints: WallpaperColorHints) : - RecentsWindowContext(context, wallpaperColorHints.hints), +constructor( + @Assisted windowContext: Context, + wallpaperColorHints: WallpaperColorHints, + private val systemUiProxy: SystemUiProxy, + private val recentsModel: RecentsModel, +) : + RecentsWindowContext(windowContext, wallpaperColorHints.hints), RecentsViewContainer, StatefulContainer { @@ -132,9 +137,7 @@ constructor(@Assisted context: Context, wallpaperColorHints: WallpaperColorHints } protected var recentsView: FallbackRecentsView? = null - private val windowContext: Context = createWindowContext(TYPE_APPLICATION_OVERLAY, null) - private val windowManager: WindowManager = - windowContext.getSystemService(WindowManager::class.java)!! + private val windowManager: WindowManager = getSystemService(WindowManager::class.java)!! private var layoutInflater: LayoutInflater = LayoutInflater.from(this).cloneInContext(this) private var stateManager: StateManager = StateManager(this, RecentsState.BG_LAUNCHER) @@ -262,11 +265,16 @@ constructor(@Assisted context: Context, wallpaperColorHints: WallpaperColorHints stateManager, /* depthController= */ null, statsLogManager, - SystemUiProxy.INSTANCE[this@RecentsWindowManager], - RecentsModel.INSTANCE[this@RecentsWindowManager], + systemUiProxy, + recentsModel, /* activityBackCallback= */ null, ), - /* desktopRecentsTransitionController= */ null, + DesktopRecentsTransitionController( + stateManager, + systemUiProxy, + iApplicationThread, + /* depthController= */ null, + ), ) } actionsView?.apply { @@ -498,7 +506,7 @@ constructor(@Assisted context: Context, wallpaperColorHints: WallpaperColorHints @AssistedFactory interface Factory { /** Creates a new instance of [RecentsWindowManager] for a given [context]. */ - fun create(@DisplayContext context: Context): RecentsWindowManager + fun create(@WindowContext context: Context): RecentsWindowManager } } @@ -507,10 +515,10 @@ class RecentsWindowManagerInstanceProvider @Inject constructor( private val factory: RecentsWindowManager.Factory, - @DisplayContext private val displayContextRepository: PerDisplayRepository, + @WindowContext private val windowContextRepository: PerDisplayRepository, ) : PerDisplayInstanceProviderWithTeardown { override fun createInstance(displayId: Int) = - displayContextRepository[displayId]?.let { factory.create(it) } + windowContextRepository[displayId]?.let { factory.create(it) } override fun destroyInstance(instance: RecentsWindowManager) { instance.destroy() diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/LauncherSwipeHandlerV2Test.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/LauncherSwipeHandlerV2Test.kt index c596847089..8a7361f325 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/LauncherSwipeHandlerV2Test.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/LauncherSwipeHandlerV2Test.kt @@ -60,6 +60,8 @@ class LauncherSwipeHandlerV2Test { @Mock(answer = RETURNS_DEEP_STUBS) private lateinit var systemUiProxy: SystemUiProxy + @Mock(answer = RETURNS_DEEP_STUBS) private lateinit var recentsModel: RecentsModel + @Mock private lateinit var msdlPlayerWrapper: MSDLPlayerWrapper @Mock private lateinit var rotationTouchHelper: RotationTouchHelper @@ -88,7 +90,9 @@ class LauncherSwipeHandlerV2Test { whenever(displayManager.displays).thenReturn(arrayOf(display)) sandboxContext.initDaggerComponent( - DaggerTestComponent.builder().bindSystemUiProxy(systemUiProxy) + DaggerTestComponent.builder() + .bindSystemUiProxy(systemUiProxy) + .bindRecentsModel(recentsModel) ) gestureState = spy( @@ -135,7 +139,9 @@ class LauncherSwipeHandlerV2Test { interface TestComponent : LauncherAppComponent { @Component.Builder interface Builder : LauncherAppComponent.Builder { - @BindsInstance fun bindSystemUiProxy(proxy: SystemUiProxy): Builder + @BindsInstance fun bindSystemUiProxy(systemUiProxy: SystemUiProxy): Builder + + @BindsInstance fun bindRecentsModel(recentsModel: RecentsModel): Builder override fun build(): TestComponent } diff --git a/src/com/android/launcher3/dagger/WindowContext.java b/src/com/android/launcher3/dagger/WindowContext.java new file mode 100644 index 0000000000..74f6997f68 --- /dev/null +++ b/src/com/android/launcher3/dagger/WindowContext.java @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2025 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.launcher3.dagger; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +import javax.inject.Qualifier; + +/** + * Qualifier for per window context created using [createWindowContext]. + */ +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Qualifier +public @interface WindowContext { +} From aaea18bafe4ea128de20aae1164f122a69c67a56 Mon Sep 17 00:00:00 2001 From: Andy Wickham Date: Thu, 10 Apr 2025 09:49:06 +0000 Subject: [PATCH 11/24] Improve blur performance on Launcher. - Disable workspace blurs for non-all apps transitions. E.g. app to home, home to overview, quickswitch from home. Bug: 408219095 Test: abtd Flag: EXEMPT performance fix Change-Id: I9f512b1e652ed4dc5632fd12ea10f075e5f5fe25 --- .../com/android/launcher3/uioverrides/states/HintState.java | 5 +++++ .../android/launcher3/uioverrides/states/OverviewState.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/HintState.java b/quickstep/src/com/android/launcher3/uioverrides/states/HintState.java index 3c7ae2a035..6545fddef7 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/HintState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/HintState.java @@ -62,6 +62,11 @@ public class HintState extends LauncherState { } } + @Override + public boolean shouldBlurWorkspace() { + return false; + } + @Override public int getWorkspaceScrimColor(Launcher launcher) { return enableOverviewBackgroundWallpaperBlur() && BlurUtils.supportsBlursOnWindows() diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java index c774143328..234454933f 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java @@ -218,6 +218,11 @@ public class OverviewState extends LauncherState { } } + @Override + public boolean shouldBlurWorkspace() { + return false; + } + @Override public void onBackInvoked(Launcher launcher) { RecentsView recentsView = launcher.getOverviewPanel(); From 6abaca4e036b57cc8f818c55ad996e191cb7fea9 Mon Sep 17 00:00:00 2001 From: Randy Pfohl Date: Wed, 9 Apr 2025 22:48:56 +0000 Subject: [PATCH 12/24] Moving RecentsWindowManager away from taskstackchangelistener Test: Built and ran locally, tested against various cases, verified with logs Flag: com.android.launcher3.enable_fallback_overview_in_window com.android.launcher3.enable_launcher_overview_in_window Bug: 292269949 Change-Id: If90b1f98ad18286fa0c9b9625077237823197967 --- .../uioverrides/QuickstepLauncher.java | 3 ++- .../fallback/window/RecentsWindowManager.kt | 24 +++++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java index 9ebbb9b0fa..6b16d0bf2e 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java @@ -865,10 +865,11 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer, if (overviewCommandHelper != null) { overviewCommandHelper.clearPendingCommands(); } + PerDisplayRepository recentsWindowManagerRepository = RecentsWindowManager.REPOSITORY_INSTANCE.get(this); recentsWindowManagerRepository.forEach(/* createIfAbsent= */ true, recentsWindowManager -> { - recentsWindowManager.onNewIntent(); + recentsWindowManager.cleanupRecentsWindow(); }); } diff --git a/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt b/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt index 91ab561b47..0d04dec1f8 100644 --- a/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt +++ b/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt @@ -39,7 +39,7 @@ import com.android.launcher3.AbstractFloatingView import com.android.launcher3.BaseActivity import com.android.launcher3.LauncherAnimationRunner import com.android.launcher3.LauncherAnimationRunner.RemoteAnimationFactory -import com.android.launcher3.LauncherState +import com.android.launcher3.LauncherState.NORMAL import com.android.launcher3.R import com.android.launcher3.compat.AccessibilityManagerCompat import com.android.launcher3.dagger.DisplayContext @@ -59,6 +59,7 @@ import com.android.launcher3.util.SystemUiController import com.android.launcher3.util.WallpaperColorHints import com.android.launcher3.views.BaseDragLayer import com.android.launcher3.views.ScrimView +import com.android.quickstep.HomeVisibilityState import com.android.quickstep.OverviewComponentObserver import com.android.quickstep.RecentsAnimationCallbacks import com.android.quickstep.RecentsAnimationCallbacks.RecentsAnimationListener @@ -194,10 +195,11 @@ constructor(@Assisted context: Context, wallpaperColorHints: WallpaperColorHints TestLogging.recordEvent(SEQUENCE_MAIN, "onBackInvoked") } - private val taskStackChangeListener = - object : TaskStackChangeListener { - override fun onTaskMovedToFront(taskId: Int) { - if ((isShowing() && isInState(DEFAULT))) { + private val homeVisibilityState = SystemUiProxy.INSTANCE.get(this).homeVisibilityState + private val homeVisibilityListener = + object : HomeVisibilityState.VisibilityChangeListener { + override fun onHomeVisibilityChanged(isVisible: Boolean) { + if (isShowing() && !isVisible && isInState(DEFAULT)) { // handling state where we end recents animation by swiping livetile away // TODO: animate this switch. cleanupRecentsWindow() @@ -217,7 +219,7 @@ constructor(@Assisted context: Context, wallpaperColorHints: WallpaperColorHints } init { - TaskStackChangeListeners.getInstance().registerTaskStackListener(taskStackChangeListener) + homeVisibilityState.addListener(homeVisibilityListener) } override fun handleConfigurationChanged(configuration: Configuration?) { @@ -234,8 +236,8 @@ constructor(@Assisted context: Context, wallpaperColorHints: WallpaperColorHints super.destroy() Executors.MAIN_EXECUTOR.execute { onViewDestroyed() } cleanupRecentsWindow() - TaskStackChangeListeners.getInstance().unregisterTaskStackListener(taskStackChangeListener) callbacks?.removeListener(recentsAnimationListener) + homeVisibilityState.removeListener(homeVisibilityListener) recentsWindowTracker.onContextDestroyed(this) recentsView?.destroy() } @@ -325,11 +327,7 @@ constructor(@Assisted context: Context, wallpaperColorHints: WallpaperColorHints stateManager.moveToRestState() } - fun onNewIntent() { - cleanupRecentsWindow() - } - - private fun cleanupRecentsWindow() { + fun cleanupRecentsWindow() { RecentsWindowProtoLogProxy.logCleanup(isShowing()) if (isShowing()) { windowManager.removeViewImmediate(windowView) @@ -389,7 +387,7 @@ constructor(@Assisted context: Context, wallpaperColorHints: WallpaperColorHints override fun onStateSetEnd(state: RecentsState) { super.onStateSetEnd(state) RecentsWindowProtoLogProxy.logOnStateSetEnd(state.toString()) - if (state.toLauncherState() == LauncherState.NORMAL) { + if (state.toLauncherState() == NORMAL) { cleanupRecentsWindow() } AccessibilityManagerCompat.sendStateEventToTest(baseContext, state.toLauncherStateOrdinal()) From b0487db434d41e738afc8f0c3538cd597a1e27ee Mon Sep 17 00:00:00 2001 From: Randy Pfohl Date: Wed, 9 Apr 2025 22:49:17 +0000 Subject: [PATCH 13/24] fixing splitview issue not receiving callback in recents in window Test: Built and ran locally. Verified cycling back to default state. Flag: com.android.launcher3.enable_fallback_overview_in_window com.android.launcher3.enable_launcher_overview_in_window Bug: 292269949 Change-Id: I3054ef815baf1a852c365a07cad5e66a168f88c5 --- .../quickstep/fallback/window/RecentsWindowManager.kt | 2 -- .../src/com/android/quickstep/views/RecentsView.java | 8 ++++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt b/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt index 0d04dec1f8..613ca3969b 100644 --- a/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt +++ b/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowManager.kt @@ -87,8 +87,6 @@ import com.android.quickstep.views.OverviewActionsView import com.android.quickstep.views.RecentsView import com.android.quickstep.views.RecentsViewContainer import com.android.systemui.shared.recents.model.ThumbnailData -import com.android.systemui.shared.system.TaskStackChangeListener -import com.android.systemui.shared.system.TaskStackChangeListeners import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index fd215674d1..e5507603ae 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -201,6 +201,7 @@ import com.android.quickstep.TaskViewUtils; import com.android.quickstep.TopTaskTracker; import com.android.quickstep.ViewUtils; import com.android.quickstep.fallback.window.RecentsWindowFlags; +import com.android.quickstep.fallback.window.RecentsWindowManager; import com.android.quickstep.orientation.RecentsPagedOrientationHandler; import com.android.quickstep.recents.data.AppTimersRepository; import com.android.quickstep.recents.data.AppTimersRepositoryImpl; @@ -5503,6 +5504,13 @@ public abstract class RecentsView< } mSplitHiddenTaskView = null; } + + if (RecentsWindowFlags.getEnableOverviewInWindow()) { + // Recents doesn't receive activity callback, so we cleanup manually + if (mContainer instanceof RecentsWindowManager manager) { + manager.cleanupRecentsWindow(); + } + } } private void safeRemoveDragLayerView(@Nullable View viewToRemove) { From c08c7de5e3349da00e38ba5ffef9187180c3c489 Mon Sep 17 00:00:00 2001 From: Sebastian Franco Date: Thu, 10 Apr 2025 13:09:16 -0700 Subject: [PATCH 14/24] No-op change, remove methods from BaseLauncherActivityTest into Utilities Bug: 324261526 Test: all test that inherit BaseLauncherActivityTest Flag: TEST_ONLY Change-Id: I0851373d179f064721a3a618853a05796cc1379f --- .../quickstep/DigitalWellBeingToastTest.java | 2 +- .../android/launcher3/LauncherIntentTest.java | 12 ++-- .../launcher3/compat/PromiseIconUiTest.java | 7 +- .../android/launcher3/ui/WorkProfileTest.java | 9 ++- .../ui/widget/AddConfigWidgetTest.java | 2 +- .../ui/widget/RequestPinItemTest.java | 2 +- .../ui/workspace/ThemeIconsTest.java | 8 +-- .../util/BaseLauncherActivityTest.kt | 45 +----------- .../util/LauncherActivityInteractor.kt | 71 +++++++++++++++++++ 9 files changed, 101 insertions(+), 57 deletions(-) create mode 100644 tests/src/com/android/launcher3/util/LauncherActivityInteractor.kt diff --git a/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java b/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java index 1b71d965fb..42f9ac2d9a 100644 --- a/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java +++ b/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java @@ -61,7 +61,7 @@ public class DigitalWellBeingToastTest extends BaseLauncherActivityTest { // Highlights the search bar, then fills text to display the SearchView. private void moveToSearchView() { // All Apps view should be loaded - assertTrue("Launcher internal state is not All Apps", - isInState(() -> LauncherState.ALL_APPS)); + assertTrue( + "Launcher internal state is not All Apps", + getLauncherInteractor().isInState(LauncherState.ALL_APPS) + ); getLauncherActivity().executeOnLauncher( launcher -> launcher.getAppsView().getSearchView().requestFocus() ); @@ -83,8 +85,10 @@ public class LauncherIntentTest extends BaseLauncherActivityTest { // Checks if main adapter view is selected, search bar is out of focus and scroller is at start. private void assertOnMainAdapterAToZView() { // All Apps State should be loaded - assertTrue("Launcher internal state is not All Apps", - isInState(() -> LauncherState.ALL_APPS)); + assertTrue( + "Launcher internal state is not All Apps", + getLauncherInteractor().isInState(LauncherState.ALL_APPS) + ); // A-Z recycler view should be active. waitForLauncherCondition("A-Z view not active.", diff --git a/tests/src/com/android/launcher3/compat/PromiseIconUiTest.java b/tests/src/com/android/launcher3/compat/PromiseIconUiTest.java index 67b13794ee..9e90f92dcc 100644 --- a/tests/src/com/android/launcher3/compat/PromiseIconUiTest.java +++ b/tests/src/com/android/launcher3/compat/PromiseIconUiTest.java @@ -18,6 +18,8 @@ package com.android.launcher3.compat; import static android.os.Process.myUserHandle; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; + import static com.android.launcher3.Flags.FLAG_ENABLE_SUPPORT_FOR_ARCHIVING; import static com.google.common.truth.Truth.assertThat; @@ -32,6 +34,7 @@ import android.text.TextUtils; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.LargeTest; +import androidx.test.uiautomator.UiDevice; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherState; @@ -64,6 +67,8 @@ public class PromiseIconUiTest extends BaseLauncherActivityTest { public static final String DUMMY_PACKAGE = "com.example.android.aardwolf"; public static final String DUMMY_LABEL = "Aardwolf"; + public UiDevice uiDevice = UiDevice.getInstance(getInstrumentation()); + private int mSessionId = -1; @Before @@ -136,7 +141,7 @@ public class PromiseIconUiTest extends BaseLauncherActivityTest { @RequiresFlagsEnabled(FLAG_ENABLE_SUPPORT_FOR_ARCHIVING) public void testPromiseIcon_addedArchivedApp() throws Throwable { installDummyAppAndWaitForUIUpdate(); - assertThat(executeShellCommand( + assertThat(uiDevice.executeShellCommand( String.format("pm archive --user %d %s", myUserHandle().getIdentifier(), DUMMY_PACKAGE))) .isEqualTo("Success\n"); diff --git a/tests/src/com/android/launcher3/ui/WorkProfileTest.java b/tests/src/com/android/launcher3/ui/WorkProfileTest.java index c191760f5d..6b2065f077 100644 --- a/tests/src/com/android/launcher3/ui/WorkProfileTest.java +++ b/tests/src/com/android/launcher3/ui/WorkProfileTest.java @@ -15,6 +15,8 @@ */ package com.android.launcher3.ui; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; + import static com.android.launcher3.LauncherPrefs.WORK_EDU_STEP; import static com.android.launcher3.LauncherState.ALL_APPS; import static com.android.launcher3.allapps.AllAppsStore.DEFER_UPDATES_TEST; @@ -33,6 +35,7 @@ import android.view.View; import androidx.recyclerview.widget.RecyclerView.ViewHolder; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.LargeTest; +import androidx.test.uiautomator.UiDevice; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherPrefs; @@ -68,13 +71,15 @@ public class WorkProfileTest extends BaseLauncherActivityTest { @Rule public TestStabilityRule mTestStabilityRule = new TestStabilityRule(); + public UiDevice uiDevice = UiDevice.getInstance(getInstrumentation()); + private int mProfileUserId; private boolean mWorkProfileSetupSuccessful; private static final String TAG = "WorkProfileTest"; @Before public void setUp() throws Exception { - String output = executeShellCommand(String.format( + String output = uiDevice.executeShellCommand(String.format( "pm create-user --profileOf %d --managed TestProfile", Process.myUserHandle().getIdentifier())); updateWorkProfileSetupSuccessful("pm create-user", output); @@ -99,7 +104,7 @@ public class WorkProfileTest extends BaseLauncherActivityTest { @After public void removeWorkProfile() throws Exception { TestUtil.uninstallDummyApp(); - executeShellCommand("pm remove-user --wait " + mProfileUserId); + uiDevice.executeShellCommand("pm remove-user --wait " + mProfileUserId); } private void waitForWorkTabSetup() { diff --git a/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java index f777049f0a..152ea2c4ed 100644 --- a/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java +++ b/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java @@ -123,7 +123,7 @@ public class AddConfigWidgetTest extends BaseLauncherActivityTest { v instanceof WidgetCell && v.getTag() instanceof PendingAddWidgetInfo pawi && mWidgetInfo.provider.equals(pawi.componentName))); - addWidgetToWorkspace(widgetView); + getLauncherInteractor().addWidgetToWorkspace(widgetView); // Widget id for which the config activity was opened mWidgetId = monitor.getWidgetId(); diff --git a/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java b/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java index 91ad341440..a52a5af9da 100644 --- a/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java +++ b/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java @@ -151,7 +151,7 @@ public class RequestPinItemTest extends BaseLauncherActivityTest { BlockingBroadcastReceiver openMonitor = new BlockingBroadcastReceiver( RequestPinItemActivity.class.getName()); Context testContext = getInstrumentation().getContext(); - startAppFast( + getLauncherInteractor().startAppFast( testContext.getPackageName(), new Intent(testContext, RequestPinItemActivity.class)); assertNotNull(openMonitor.blockingGetExtraIntent()); diff --git a/tests/src/com/android/launcher3/ui/workspace/ThemeIconsTest.java b/tests/src/com/android/launcher3/ui/workspace/ThemeIconsTest.java index 5e4b9c8c34..a1181f3732 100644 --- a/tests/src/com/android/launcher3/ui/workspace/ThemeIconsTest.java +++ b/tests/src/com/android/launcher3/ui/workspace/ThemeIconsTest.java @@ -66,7 +66,7 @@ public class ThemeIconsTest extends BaseLauncherActivityTest { scrollToAppIcon(APP_NAME); BubbleTextView btv = getLauncherActivity().getFromLauncher( l -> verifyIconTheme(APP_NAME, l.getAppsView(), false)); - addToWorkspace(btv); + getLauncherInteractor().addToWorkspace(btv); getLauncherActivity().executeOnLauncher( l -> verifyIconTheme(APP_NAME, l.getWorkspace(), false) ); @@ -87,7 +87,7 @@ public class ThemeIconsTest extends BaseLauncherActivityTest { BubbleTextView menuItem = getOnceNotNull("Popup menu not open", l -> (AbstractFloatingView.getOpenView(l, TYPE_ACTION_POPUP) instanceof ArrowPopup ap) ? findBtv(SHORTCUT_NAME, ap) : null); - addToWorkspace(menuItem); + getLauncherInteractor().addToWorkspace(menuItem); getLauncherActivity().executeOnLauncher( l -> verifyIconTheme(SHORTCUT_NAME, l.getWorkspace(), false)); } @@ -104,7 +104,7 @@ public class ThemeIconsTest extends BaseLauncherActivityTest { l -> verifyIconTheme(APP_NAME, l.getAppsView(), false) ); - addToWorkspace(btv); + getLauncherInteractor().addToWorkspace(btv); getLauncherActivity().executeOnLauncher( l -> verifyIconTheme(APP_NAME, l.getWorkspace(), true)); } @@ -123,7 +123,7 @@ public class ThemeIconsTest extends BaseLauncherActivityTest { BubbleTextView menuItem = getOnceNotNull("Popup menu not open", l -> (AbstractFloatingView.getOpenView(l, TYPE_ACTION_POPUP) instanceof ArrowPopup ap) ? findBtv(SHORTCUT_NAME, ap) : null); - addToWorkspace(menuItem); + getLauncherInteractor().addToWorkspace(menuItem); getLauncherActivity().executeOnLauncher( l -> verifyIconTheme(SHORTCUT_NAME, l.getWorkspace(), true)); } diff --git a/tests/src/com/android/launcher3/util/BaseLauncherActivityTest.kt b/tests/src/com/android/launcher3/util/BaseLauncherActivityTest.kt index ecf4606956..dd28f5acb6 100644 --- a/tests/src/com/android/launcher3/util/BaseLauncherActivityTest.kt +++ b/tests/src/com/android/launcher3/util/BaseLauncherActivityTest.kt @@ -16,7 +16,6 @@ package com.android.launcher3.util import android.content.Context -import android.content.Intent import android.os.SystemClock import android.view.InputDevice import android.view.KeyCharacterMap @@ -29,15 +28,12 @@ import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation import androidx.test.uiautomator.UiDevice import com.android.launcher3.Launcher import com.android.launcher3.LauncherAppState -import com.android.launcher3.LauncherState -import com.android.launcher3.R import com.android.launcher3.allapps.AllAppsStore.DEFER_UPDATES_TEST import com.android.launcher3.integration.util.LauncherActivityScenarioRule import com.android.launcher3.util.ModelTestExtensions.loadModelSync import com.android.launcher3.util.Wait.atMost import java.util.function.Function import java.util.function.Predicate -import java.util.function.Supplier import org.junit.Rule /** @@ -51,6 +47,8 @@ open class BaseLauncherActivityTest { var launcherActivity = LauncherActivityScenarioRule(getInstrumentation().targetContext) + val launcherInteractor = LauncherActivityInteractor(launcherActivity) + @JvmField val uiDevice = UiDevice.getInstance(getInstrumentation()) protected fun loadLauncherSync() { @@ -60,9 +58,6 @@ open class BaseLauncherActivityTest { protected fun targetContext(): Context = getInstrumentation().targetContext - protected fun isInState(state: Supplier): Boolean = - launcherActivity.getFromLauncher { it.stateManager.state == state.get() }!! - protected fun waitForLauncherCondition(message: String, condition: (LAUNCHER_TYPE) -> Boolean) = atMost(message, { launcherActivity.getFromLauncher(condition)!! }) @@ -105,47 +100,11 @@ open class BaseLauncherActivityTest { launcherActivity.executeOnLauncher { it.dispatchKeyEvent(event) } } - @JvmOverloads - fun startAppFast( - packageName: String, - intent: Intent = targetContext().packageManager.getLaunchIntentForPackage(packageName)!!, - ) { - intent.addCategory(Intent.CATEGORY_LAUNCHER) - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) - targetContext().startActivity(intent) - uiDevice.waitForIdle() - } - fun freezeAllApps() = launcherActivity.executeOnLauncher { it.appsView.appsStore.enableDeferUpdates(DEFER_UPDATES_TEST) } - fun executeShellCommand(cmd: String) = uiDevice.executeShellCommand(cmd) - - fun addToWorkspace(view: View) { - TestUtil.runOnExecutorSync(Executors.MAIN_EXECUTOR) { - view.accessibilityDelegate.performAccessibilityAction( - view, - R.id.action_add_to_workspace, - null, - ) - } - UiDevice.getInstance(getInstrumentation()).waitForIdle() - } - - /** - * Match the behavior with how widget is added in reality with "tap to add" (even with screen - * readers). - */ - fun addWidgetToWorkspace(view: View) { - launcherActivity.executeOnLauncher { - view.performClick() - UiDevice.getInstance(getInstrumentation()).waitForIdle() - view.findViewById(R.id.widget_add_button).performClick() - } - } - fun ViewGroup.searchView(filter: Predicate): View? { if (filter.test(this)) return this for (child in children) { diff --git a/tests/src/com/android/launcher3/util/LauncherActivityInteractor.kt b/tests/src/com/android/launcher3/util/LauncherActivityInteractor.kt new file mode 100644 index 0000000000..d2c7df298a --- /dev/null +++ b/tests/src/com/android/launcher3/util/LauncherActivityInteractor.kt @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2025 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.launcher3.util + +import android.content.Intent +import android.view.View +import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation +import androidx.test.uiautomator.UiDevice +import com.android.launcher3.Launcher +import com.android.launcher3.LauncherState +import com.android.launcher3.R +import com.android.launcher3.integration.util.LauncherActivityScenarioRule + +class LauncherActivityInteractor( + val launcherActivity: LauncherActivityScenarioRule +) { + + val uiDevice = UiDevice.getInstance(getInstrumentation()) + + @JvmOverloads + fun startAppFast( + packageName: String, + intent: Intent = + launcherActivity.context.packageManager.getLaunchIntentForPackage(packageName)!!, + ) = + launcherActivity.context + .startActivity( + intent + .addCategory(Intent.CATEGORY_LAUNCHER) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + ) + .run { uiDevice.waitForIdle() } + + fun addToWorkspace(view: View) = + TestUtil.runOnExecutorSync(Executors.MAIN_EXECUTOR) { + view.accessibilityDelegate.performAccessibilityAction( + view, + R.id.action_add_to_workspace, + null, + ) + } + .run { uiDevice.waitForIdle() } + + /** + * Match the behavior with how widget is added in reality with "tap to add" (even with screen + * readers). + */ + fun addWidgetToWorkspace(view: View) = + launcherActivity.executeOnLauncher { + view.performClick() + UiDevice.getInstance(getInstrumentation()).waitForIdle() + view.findViewById(R.id.widget_add_button).performClick() + } + + fun isInState(state: LauncherState): Boolean = + launcherActivity.getFromLauncher { it.stateManager.state == state }!! +} From 0f1ee360b934a00eef41356d029e65f332d70121 Mon Sep 17 00:00:00 2001 From: Li Lin Date: Wed, 19 Mar 2025 11:53:25 -0700 Subject: [PATCH 15/24] Add Growth Framework nudge view. The current layout is a placeholder. UX Mock is still being finalized and will be updated in follow up CLs. Bug: 398033012 Test: Manual Flag: com.android.launcher3.enable_growth_nudge Change-Id: I44a8fa2e77009fabd037524d8b662d8199df4370 --- .../launcher3/taskbar/growth/NudgeView.kt | 180 ++++++++++++++++++ .../launcher3/AbstractFloatingView.java | 9 +- 2 files changed, 186 insertions(+), 3 deletions(-) create mode 100644 quickstep/src/com/android/launcher3/taskbar/growth/NudgeView.kt diff --git a/quickstep/src/com/android/launcher3/taskbar/growth/NudgeView.kt b/quickstep/src/com/android/launcher3/taskbar/growth/NudgeView.kt new file mode 100644 index 0000000000..17ee50e367 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/growth/NudgeView.kt @@ -0,0 +1,180 @@ +/* + * Copyright (C) 2025 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.launcher3.taskbar.growth + +import android.animation.AnimatorSet +import android.animation.ValueAnimator +import android.content.Context +import android.util.AttributeSet +import android.view.MotionEvent +import android.view.ViewGroup +import android.view.animation.Interpolator +import android.window.OnBackInvokedDispatcher +import androidx.core.view.updateLayoutParams +import com.android.app.animation.Interpolators +import com.android.launcher3.AbstractFloatingView +import com.android.launcher3.R +import com.android.launcher3.anim.AnimatorListeners +import com.android.launcher3.views.ActivityContext + +private const val ENTER_DURATION_MS = 300L +private const val EXIT_DURATION_MS = 150L + +/** Floating nudge. */ +class NudgeView +@JvmOverloads +constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : + AbstractFloatingView(context, attrs, defStyleAttr) { + + private val activityContext: ActivityContext = ActivityContext.lookupContext(context) + + private val enterYDelta = resources.getDimension(R.dimen.nudge_enter_y_delta) + private val exitYDelta = resources.getDimension(R.dimen.nudge_exit_y_delta) + + /** Container where the nudge's body should be inflated. */ + lateinit var content: ViewGroup + private set + + /** Callback invoked when the nudge is being closed. */ + var onCloseCallback: () -> Unit = {} + private var openCloseAnimator: AnimatorSet? = null + /** Used to set whether users can tap outside the current nudge window to dismiss it */ + var allowTouchDismissal = true + + /** Animates the nudge into view. */ + fun show() { + if (isOpen) { + return + } + + mIsOpen = true + activityContext.dragLayer.addView(this) + + // Make sure we have enough height to display all of the content, which can be an issue on + // large text and display scaling configurations. If we run out of height, remove the width + // constraint to reduce the number of lines of text and hopefully free up some height. + activityContext.dragLayer.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED) + if ( + measuredHeight + activityContext.deviceProfile.taskbarHeight >= + activityContext.deviceProfile.availableHeightPx + ) { + updateLayoutParams { width = LayoutParams.MATCH_PARENT } + } + + openCloseAnimator = createOpenCloseAnimator(isOpening = true).apply { start() } + } + + override fun onFinishInflate() { + super.onFinishInflate() + + content = requireViewById(R.id.content) + } + + override fun handleClose(animate: Boolean) { + if (!isOpen) { + return + } + + onCloseCallback() + if (!animate) { + return closeComplete() + } + + openCloseAnimator?.cancel() + openCloseAnimator = createOpenCloseAnimator(isOpening = false) + openCloseAnimator?.apply { + addListener(AnimatorListeners.forEndCallback(this@NudgeView::closeComplete)) + start() + } + } + + override fun isOfType(type: Int): Boolean = type and TYPE_NUDGE != 0 + + override fun onControllerInterceptTouchEvent(ev: MotionEvent?): Boolean { + if ( + ev?.action == MotionEvent.ACTION_DOWN && + !activityContext.dragLayer.isEventOverView(this, ev) && + allowTouchDismissal + ) { + close(true) + } + return false + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + findOnBackInvokedDispatcher() + ?.registerOnBackInvokedCallback(OnBackInvokedDispatcher.PRIORITY_DEFAULT, this) + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + findOnBackInvokedDispatcher()?.unregisterOnBackInvokedCallback(this) + // TODO: b/396507770 - investigate and coordinate with letterbox flow. + } + + private fun closeComplete() { + openCloseAnimator?.cancel() + openCloseAnimator = null + mIsOpen = false + activityContext.dragLayer.removeView(this) + } + + private fun createOpenCloseAnimator(isOpening: Boolean): AnimatorSet { + val duration: Long + val alphaValues: FloatArray + val translateYValues: FloatArray + val fadeInterpolator: Interpolator + val translateYInterpolator: Interpolator + + if (isOpening) { + duration = ENTER_DURATION_MS + alphaValues = floatArrayOf(0f, 1f) + translateYValues = floatArrayOf(enterYDelta, 0f) + fadeInterpolator = Interpolators.STANDARD + translateYInterpolator = Interpolators.EMPHASIZED_DECELERATE + } else { + duration = EXIT_DURATION_MS + alphaValues = floatArrayOf(1f, 0f) + translateYValues = floatArrayOf(0f, exitYDelta) + fadeInterpolator = Interpolators.EMPHASIZED_ACCELERATE + translateYInterpolator = Interpolators.EMPHASIZED_ACCELERATE + } + + val fade = + ValueAnimator.ofFloat(*alphaValues).apply { + interpolator = fadeInterpolator + addUpdateListener { + val alpha = it.animatedValue as Float + content.alpha = alpha + } + } + + val translateY = + ValueAnimator.ofFloat(*translateYValues).apply { + interpolator = translateYInterpolator + addUpdateListener { + val translationY = it.animatedValue as Float + content.translationY = translationY + } + } + + return AnimatorSet().apply { + this.duration = duration + playTogether(fade, translateY) + } + } +} diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java index b90200b88c..1e403633f7 100644 --- a/src/com/android/launcher3/AbstractFloatingView.java +++ b/src/com/android/launcher3/AbstractFloatingView.java @@ -77,6 +77,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch TYPE_TASKBAR_PINNING_POPUP, TYPE_PIN_IME_POPUP, TYPE_ONE_GRID_MIGRATION_EDU, + TYPE_NUDGE, }) @Retention(RetentionPolicy.SOURCE) public @interface FloatingViewType {} @@ -106,6 +107,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch public static final int TYPE_TASKBAR_PINNING_POPUP = 1 << 21; public static final int TYPE_PIN_IME_POPUP = 1 << 22; public static final int TYPE_ONE_GRID_MIGRATION_EDU = 1 << 23; + public static final int TYPE_NUDGE = 1 << 24; public static final int TYPE_ALL = TYPE_FOLDER | TYPE_ACTION_POPUP | TYPE_WIDGETS_BOTTOM_SHEET | TYPE_WIDGET_RESIZE_FRAME | TYPE_WIDGETS_FULL_SHEET @@ -114,14 +116,15 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch | TYPE_ICON_SURFACE | TYPE_DRAG_DROP_POPUP | TYPE_PIN_WIDGET_FROM_EXTERNAL_POPUP | TYPE_TASKBAR_EDUCATION_DIALOG | TYPE_TASKBAR_ALL_APPS | TYPE_OPTIONS_POPUP_DIALOG | TYPE_ADD_TO_HOME_CONFIRMATION | TYPE_TASKBAR_OVERLAY_PROXY - | TYPE_TASKBAR_PINNING_POPUP | TYPE_PIN_IME_POPUP | TYPE_ONE_GRID_MIGRATION_EDU; + | TYPE_TASKBAR_PINNING_POPUP | TYPE_PIN_IME_POPUP | TYPE_ONE_GRID_MIGRATION_EDU + | TYPE_NUDGE; // Type of popups which should be kept open during launcher rebind public static final int TYPE_REBIND_SAFE = TYPE_WIDGETS_FULL_SHEET | TYPE_WIDGETS_BOTTOM_SHEET | TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE | TYPE_ALL_APPS_EDU | TYPE_ICON_SURFACE | TYPE_TASKBAR_EDUCATION_DIALOG | TYPE_TASKBAR_ALL_APPS | TYPE_OPTIONS_POPUP_DIALOG | TYPE_TASKBAR_OVERLAY_PROXY - | TYPE_PIN_IME_POPUP | TYPE_ONE_GRID_MIGRATION_EDU; + | TYPE_PIN_IME_POPUP | TYPE_ONE_GRID_MIGRATION_EDU | TYPE_NUDGE; /** Type of popups that should get exclusive accessibility focus. */ public static final int TYPE_ACCESSIBLE = TYPE_ALL & ~TYPE_DISCOVERY_BOUNCE & ~TYPE_LISTENER @@ -136,7 +139,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch // Floating views that are exclusive to the taskbar overlay window. public static final int TYPE_TASKBAR_OVERLAYS = - TYPE_TASKBAR_ALL_APPS | TYPE_TASKBAR_EDUCATION_DIALOG; + TYPE_TASKBAR_ALL_APPS | TYPE_TASKBAR_EDUCATION_DIALOG | TYPE_NUDGE; // Floating views that a TouchController should not try to intercept touches from. public static final int TYPE_TOUCH_CONTROLLER_NO_INTERCEPT = TYPE_ALL & ~TYPE_DISCOVERY_BOUNCE From a9f1bd967d0692e734c86261ac99ef216117d8ee Mon Sep 17 00:00:00 2001 From: Suhua Lei Date: Fri, 11 Apr 2025 05:49:33 +0000 Subject: [PATCH 16/24] Fix addDeskButton visibility for quick switch home Bug: 409575334 Flag: com.android.window.flags.enable_multiple_desktops_frontend Flag: com.android.window.flags.enable_multiple_desktops_backend Test: quick switch home Change-Id: Ia6f47c2db3bbcffe41ea53fa0160c839ff45611f --- .../src/com/android/quickstep/views/RecentsView.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 2abb8a7284..c448d6ae7c 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -1337,7 +1337,13 @@ public abstract class RecentsView< if (child instanceof TaskView) { mTaskViewCount++; } - child.setAlpha(mContentAlpha); + if (mAddDesktopButton != null && child instanceof AddDesktopButton) { + mAddDesktopButton.setContentAlpha(mContentAlpha); + } else if (child instanceof ClearAllButton) { + mClearAllButton.setContentAlpha(mContentAlpha); + } else { + child.setAlpha(mContentAlpha); + } // RecentsView is set to RTL in the constructor when system is using LTR. Here we set the // child direction back to match system settings. child.setLayoutDirection(mIsRtl ? View.LAYOUT_DIRECTION_LTR : View.LAYOUT_DIRECTION_RTL); From 38d57bf6744cab006e6856bab4f50f09f68c928d Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 15 Apr 2025 04:17:42 +0000 Subject: [PATCH 17/24] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I91a8868789991096a90858d4b97a7844d8f77739 --- quickstep/res/values-af/strings.xml | 17 ++++++----------- quickstep/res/values-am/strings.xml | 2 +- quickstep/res/values-ar/strings.xml | 17 ++++++----------- quickstep/res/values-as/strings.xml | 17 ++++++----------- quickstep/res/values-az/strings.xml | 2 +- quickstep/res/values-b+sr+Latn/strings.xml | 2 +- quickstep/res/values-be/strings.xml | 2 +- quickstep/res/values-bg/strings.xml | 2 +- quickstep/res/values-bn/strings.xml | 2 +- quickstep/res/values-bs/strings.xml | 4 ++-- quickstep/res/values-ca/strings.xml | 2 +- quickstep/res/values-cs/strings.xml | 2 +- quickstep/res/values-da/strings.xml | 2 +- quickstep/res/values-de/strings.xml | 2 +- quickstep/res/values-el/strings.xml | 2 +- quickstep/res/values-en-rAU/strings.xml | 2 +- quickstep/res/values-en-rCA/strings.xml | 2 +- quickstep/res/values-en-rGB/strings.xml | 2 +- quickstep/res/values-en-rIN/strings.xml | 2 +- quickstep/res/values-es-rUS/strings.xml | 2 +- quickstep/res/values-es/strings.xml | 2 +- quickstep/res/values-et/strings.xml | 2 +- quickstep/res/values-eu/strings.xml | 2 +- quickstep/res/values-fa/strings.xml | 2 +- quickstep/res/values-fi/strings.xml | 2 +- quickstep/res/values-fr-rCA/strings.xml | 2 +- quickstep/res/values-fr/strings.xml | 6 +++--- quickstep/res/values-gl/strings.xml | 2 +- quickstep/res/values-gu/strings.xml | 17 ++++++----------- quickstep/res/values-hi/strings.xml | 2 +- quickstep/res/values-hr/strings.xml | 2 +- quickstep/res/values-hu/strings.xml | 2 +- quickstep/res/values-hy/strings.xml | 2 +- quickstep/res/values-in/strings.xml | 2 +- quickstep/res/values-is/strings.xml | 2 +- quickstep/res/values-it/strings.xml | 2 +- quickstep/res/values-iw/strings.xml | 2 +- quickstep/res/values-ja/strings.xml | 2 +- quickstep/res/values-ka/strings.xml | 2 +- quickstep/res/values-kk/strings.xml | 2 +- quickstep/res/values-km/strings.xml | 2 +- quickstep/res/values-kn/strings.xml | 2 +- quickstep/res/values-ko/strings.xml | 2 +- quickstep/res/values-ky/strings.xml | 2 +- quickstep/res/values-lo/strings.xml | 2 +- quickstep/res/values-lt/strings.xml | 2 +- quickstep/res/values-lv/strings.xml | 2 +- quickstep/res/values-mk/strings.xml | 17 ++++++----------- quickstep/res/values-ml/strings.xml | 2 +- quickstep/res/values-mn/strings.xml | 2 +- quickstep/res/values-mr/strings.xml | 2 +- quickstep/res/values-ms/strings.xml | 2 +- quickstep/res/values-my/strings.xml | 2 +- quickstep/res/values-nb/strings.xml | 2 +- quickstep/res/values-ne/strings.xml | 2 +- quickstep/res/values-nl/strings.xml | 2 +- quickstep/res/values-or/strings.xml | 17 ++++++----------- quickstep/res/values-pa/strings.xml | 2 +- quickstep/res/values-pl/strings.xml | 2 +- quickstep/res/values-pt-rPT/strings.xml | 2 +- quickstep/res/values-pt/strings.xml | 17 ++++++----------- quickstep/res/values-ro/strings.xml | 2 +- quickstep/res/values-ru/strings.xml | 2 +- quickstep/res/values-si/strings.xml | 17 ++++++----------- quickstep/res/values-sk/strings.xml | 4 ++-- quickstep/res/values-sl/strings.xml | 2 +- quickstep/res/values-sq/strings.xml | 2 +- quickstep/res/values-sr/strings.xml | 2 +- quickstep/res/values-sv/strings.xml | 6 +++--- quickstep/res/values-sw/strings.xml | 2 +- quickstep/res/values-ta/strings.xml | 2 +- quickstep/res/values-te/strings.xml | 2 +- quickstep/res/values-th/strings.xml | 2 +- quickstep/res/values-tl/strings.xml | 2 +- quickstep/res/values-tr/strings.xml | 17 ++++++----------- quickstep/res/values-uk/strings.xml | 17 ++++++----------- quickstep/res/values-ur/strings.xml | 2 +- quickstep/res/values-uz/strings.xml | 2 +- quickstep/res/values-vi/strings.xml | 2 +- quickstep/res/values-zh-rCN/strings.xml | 2 +- quickstep/res/values-zh-rHK/strings.xml | 2 +- quickstep/res/values-zh-rTW/strings.xml | 2 +- quickstep/res/values-zu/strings.xml | 17 ++++++----------- 83 files changed, 144 insertions(+), 199 deletions(-) diff --git a/quickstep/res/values-af/strings.xml b/quickstep/res/values-af/strings.xml index d314a89e55..bdf3306a98 100644 --- a/quickstep/res/values-af/strings.xml +++ b/quickstep/res/values-af/strings.xml @@ -91,7 +91,7 @@ "Swiep op om na die tuisskerm toe te gaan" "Tik op die tuisknoppie om na jou tuisskerm toe te gaan" "Jy is gereed om jou %1$s te begin gebruik" - "toestel" + "Jy is gereed om jou toestel te begin gebruik" "Stelselnavigasie-instellings" "Deel" "Skermskoot" @@ -109,16 +109,11 @@ "Kanselleer" "Slaan oor" "Draai skerm" - - - - - - - - - - + "Animasie wat wys hoe die taakbalk vanaf die onderkant van die skerm sigbaar word en outomaties versteek as dit nie gebruik word nie" + "Animasie wat wys hoe om jou taakbalk met ’n wisselfunksie vas te speld sodat die taakbalk permanent onderaan die skerm sigbaar bly" + "Animasie wat wys hoe om ’n verdeelde skerm te skep deur ’n app vanaf die taakbalk bo ’n oop app te sleep en los" + "Animasie wat wys hoe om toegang tot voorgestelde apps op jou toestel te kry" + "Animasie wat wys hoe om ’n item op die skerm te soek deur die handelingsleutel te raak en hou en die area waarin die item is, te kies" "Taakbalkopvoeding" "Sleep ’n app na die kant toe om 2 apps tegelyk te gebruik" "Stadigswiep op om die Taakbalk te wys" diff --git a/quickstep/res/values-am/strings.xml b/quickstep/res/values-am/strings.xml index dd2491a786..83b094585d 100644 --- a/quickstep/res/values-am/strings.xml +++ b/quickstep/res/values-am/strings.xml @@ -91,7 +91,7 @@ "ወደ መነሻ ለመሄድ በጣት ወደ ላይ ይጥረጉ" "ወደ መነሻ ማያ ገጽዎ ለመሄድ የመነሻ አዝራሩን መታ ያድርጉ" "የእርስዎን %1$s መጠቀም ለመጀመር ዝግጁ ነዎት" - "መሣሪያ" + "የእርስዎን መሣሪያ መጠቀም ለመጀመር ዝግጁ ነዎት" "የስርዓት አሰሳ ቅንብሮች" "አጋራ" "ቅጽበታዊ ገፅ ዕይታ" diff --git a/quickstep/res/values-ar/strings.xml b/quickstep/res/values-ar/strings.xml index 96ade0904e..c17401ff57 100644 --- a/quickstep/res/values-ar/strings.xml +++ b/quickstep/res/values-ar/strings.xml @@ -91,7 +91,7 @@ "مرّر سريعًا للأعلى للانتقال إلى الشاشة الرئيسية" "انقر على زر الشاشة الرئيسية للانتقال إلى الشاشة الرئيسية." "يمكنك الآن بدء استخدام %1$s" - "الجهاز" + "يمكنك الآن بدء استخدام جهازك" "إعدادات التنقّل داخل النظام" "مشاركة" "لقطة شاشة" @@ -109,16 +109,11 @@ "إلغاء" "التخطي" "تدوير الشاشة" - - - - - - - - - - + "صورة متحركة توضّح كيفية إظهار شريط التطبيقات من أسفل الشاشة وإخفائه تلقائيًا عند عدم استخدامه" + "صورة متحركة توضّح كيفية تثبيت شريط التطبيقات باستخدام زر تبديل، بحيث يظل الشريط ظاهرًا بشكل دائم في أسفل الشاشة" + "صورة متحركة توضّح كيفية إنشاء شاشة مقسَّمة عن طريق سحب تطبيق وإفلاته من شريط التطبيقات فوق تطبيق مفتوح" + "صورة متحركة توضّح كيفية الوصول إلى التطبيقات المقترَحة على جهازك" + "صورة متحركة توضّح كيفية البحث عن عنصر على الشاشة من خلال النقر على مفتاح الإجراء مع الاستمرار وتحديد المنطقة التي يظهر فيها العنصر" "التعريف بشريط التطبيقات" "اسحب تطبيقًا إلى جانب الشاشة لاستخدام تطبيقََين في آنٍ واحد" "مرِّر ببطء للأعلى لإظهار شريط التطبيقات" diff --git a/quickstep/res/values-as/strings.xml b/quickstep/res/values-as/strings.xml index c7afe61b25..1eaacb4a07 100644 --- a/quickstep/res/values-as/strings.xml +++ b/quickstep/res/values-as/strings.xml @@ -91,7 +91,7 @@ "গৃহ স্ক্ৰীনলৈ যাবলৈ ওপৰলৈ ছোৱাইপ কৰক" "আপোনাৰ গৃহ স্ক্ৰীনলৈ যাবলৈ গৃহপৃষ্ঠা বুটামটো টিপক" "আপুনি আপোনাৰ %1$sটো ব্যৱহাৰ কৰিবলৈ সাজু" - "ডিভাইচ" + "আপুনি আপোনাৰ ডিভাইচটো ব্যৱহাৰ কৰিবলৈ সাজু" "ছিষ্টেম নেভিগেশ্বনৰ ছেটিং" "শ্বেয়াৰ কৰক" "স্ক্ৰীনশ্বট" @@ -109,16 +109,11 @@ "বাতিল কৰক" "এৰি যাওক" "স্ক্ৰীনখন ঘূৰাওক" - - - - - - - - - - + "স্ক্ৰীনখনৰ একেবাৰে তলৰ পৰা টাস্কবাৰ কেনেকৈ দেখা পোৱা যায় আৰু ব্যৱহাৰ হৈ নথকা অৱস্থাত কেনেকৈ স্বয়ংক্ৰিয়ভাৱে লুকাই থাকে সেয়া দেখুওৱা এনিমেশ্বন" + "স্ক্ৰীনখনৰ একেবাৰে তলত টাস্কবাৰডাল স্থায়ীভাৱে দৃশ্যমান হৈ থাকিবৰ বাবে এটা ট’গল ব্যৱহাৰ কৰি আপোনাৰ টাস্কবাৰ কেনেকৈ পিন কৰিব সেয়া দেখুওৱা এনিমেশ্বন" + "এটা খুলি থোৱা এপৰ ওপৰত টাস্কবাৰৰ পৰা এটা এপ্‌ টানি আনি এৰি দি এখন বিভাজিত স্ক্ৰীন কেনেকৈ সৃষ্টি কৰিব পাৰি সেয়া দেখুওৱা এনিমেশ্বন" + "আপোনাৰ ডিভাইচত পৰামৰ্শিত এপ্‌ কেনেকৈ এক্সেছ কৰিব পাৰি সেয়া দেখুওৱা এনিমেশ্বন" + "কাৰ্য কী স্পৰ্শ কৰি আৰু ধৰি ৰাখি আৰু কোনো এটা বস্তু থকা ঠাইখিনি বাছনি কৰি স্ক্ৰীনত বস্তুটো কেনেকৈ সন্ধান কৰিব পাৰি সেয়া দেখুওৱা এনিমেশ্বন" "টাস্কবাৰৰ শিক্ষা" "এবাৰতে ২ টা এপ্‌ ব্যৱহাৰ কৰিবলৈ কোনো এপ্‌ কাষলৈ টানি আনি এৰক" "টাস্কবাৰ দেখুৱাবলৈ লাহেকৈ ওপৰলৈ ছোৱাইপ কৰক" diff --git a/quickstep/res/values-az/strings.xml b/quickstep/res/values-az/strings.xml index ac8e83358f..96e9b0e743 100644 --- a/quickstep/res/values-az/strings.xml +++ b/quickstep/res/values-az/strings.xml @@ -91,7 +91,7 @@ "Əsas səhifəyə keçmək üçün yuxarı çəkin" "Əsas ekranınıza keçmək üçün əsas düyməyə toxunun" "%1$s cihazından istifadəyə başlamağa hazırsınız" - "cihaz" + "Cihazdan istifadə edə bilərsiniz" "Sistem naviqasiya ayarları" "Paylaşın" "Skrinşot" diff --git a/quickstep/res/values-b+sr+Latn/strings.xml b/quickstep/res/values-b+sr+Latn/strings.xml index 429d20243e..12d00b461c 100644 --- a/quickstep/res/values-b+sr+Latn/strings.xml +++ b/quickstep/res/values-b+sr+Latn/strings.xml @@ -91,7 +91,7 @@ "Prevucite nagore da biste otvorili početni ekran" "Dodirnite dugme Početak da biste otišli na početni ekran" "Spremni ste da počnete da koristite %1$s" - "uređaj" + "Spremni ste da počnete da koristite uređaj" "Podešavanja kretanja kroz sistem" "Deli" "Snimak ekrana" diff --git a/quickstep/res/values-be/strings.xml b/quickstep/res/values-be/strings.xml index 521477750a..9ec9dfe9c9 100644 --- a/quickstep/res/values-be/strings.xml +++ b/quickstep/res/values-be/strings.xml @@ -91,7 +91,7 @@ "Каб перайсці на галоўны экран, правядзіце пальцам уверх" "Каб перайсці на галоўны экран, націсніце кнопку галоўнага экрана" "Вы можаце пачаць карыстацца %1$s" - "прыладай" + "Вы можаце пачаць карыстанне прыладай" "Налады навігацыі ў сістэме" "Абагуліць" "Здымак экрана" diff --git a/quickstep/res/values-bg/strings.xml b/quickstep/res/values-bg/strings.xml index 43d96256a2..0751d322e3 100644 --- a/quickstep/res/values-bg/strings.xml +++ b/quickstep/res/values-bg/strings.xml @@ -91,7 +91,7 @@ "Плъзнете с пръст нагоре, за да отворите началния екран" "Докоснете бутона „Начало“, за да преминете към началния екран" "Можете да започнете да използвате %1$s" - "устройството" + "Можете да започнете да използвате устройството си" "Настройки за навигиране в системата" "Споделяне" "Екранна снимка" diff --git a/quickstep/res/values-bn/strings.xml b/quickstep/res/values-bn/strings.xml index b9321b2a9b..0b37046c0a 100644 --- a/quickstep/res/values-bn/strings.xml +++ b/quickstep/res/values-bn/strings.xml @@ -91,7 +91,7 @@ "হোম স্ক্রিনে যেতে উপরের দিকে সোয়াইপ করুন" "আপনার হোম স্ক্রিনে যাওয়ার জন্য হোম বোতামে ট্যাপ করুন" "%1$s ব্যবহার শুরু করার জন্য আপনি রেডি" - "ডিভাইস" + "নিজের ডিভাইস ব্যবহার শুরু করার জন্য আপনি রেডি" "সিস্টেম নেভিগেশন সেটিংস" "শেয়ার করুন" "স্ক্রিনশট নিন" diff --git a/quickstep/res/values-bs/strings.xml b/quickstep/res/values-bs/strings.xml index 1841dcd983..33d08ccfec 100644 --- a/quickstep/res/values-bs/strings.xml +++ b/quickstep/res/values-bs/strings.xml @@ -91,7 +91,7 @@ "Prevucite prema gore da odete na početni ekran" "Dodirnite dugme za početni ekran da odete na početni ekran" "Spremni ste da počnete koristiti %1$s" - "uređaj" + "Sve je spremno da počnete koristiti uređaj" "Postavke navigacije sistemom" "Dijeli" "Snimak ekrana" @@ -113,7 +113,7 @@ "Animacija koja prikazuje kako zakačiti traku zadataka pomoću prekidača da traka zadataka trajno ostane vidljiva u donjem dijelu ekrana" "Animacija koja prikazuje kako kreirati podijeljeni ekran prevlačenjem i ispuštanjem aplikacije s trake zadataka iznad otvorene aplikacije" "Animacija koja prikazuje kako pristupiti predloženim aplikacijama na uređaju" - "Animacija koja prikazuje kako pretražiti stavku na ekranu dodirom i zadržavanjem tipke radnji i odabirom područja u kojoj je stavka" + "Animacija koja prikazuje kako pretražiti stavku na ekranu dodirom i zadržavanjem tipke radnji i odabirom područja u kojem se stavka nalazi" "Edukacija o traci zadataka" "Prevucite aplikaciju ustranu da odjednom koristite 2 aplikacije" "Sporo prevucite nagore da vidite traku zadataka" diff --git a/quickstep/res/values-ca/strings.xml b/quickstep/res/values-ca/strings.xml index ea15bd5ba4..2c3dd88d99 100644 --- a/quickstep/res/values-ca/strings.xml +++ b/quickstep/res/values-ca/strings.xml @@ -91,7 +91,7 @@ "Llisca cap amunt per anar a la pàgina d\'inici" "Toca el botó d\'inici per anar a la pantalla d\'inici" "Ja pots començar a utilitzar el %1$s" - "dispositiu" + "Ja pots començar a utilitzar el dispositiu" "Configuració de navegació del sistema" "Comparteix" "Captura de pantalla" diff --git a/quickstep/res/values-cs/strings.xml b/quickstep/res/values-cs/strings.xml index 177086dd09..502b634a54 100644 --- a/quickstep/res/values-cs/strings.xml +++ b/quickstep/res/values-cs/strings.xml @@ -91,7 +91,7 @@ "Přejetím nahoru se vrátíte na plochu" "Klepnutím na tlačítko plochy se vrátíte na plochu" "%1$s můžete začít používat" - "Zařízení" + "Zařízení je připraveno k používání" "Nastavení navigace v systému" "Sdílet" "Snímek obrazovky" diff --git a/quickstep/res/values-da/strings.xml b/quickstep/res/values-da/strings.xml index 34c0d1251d..62c00184e7 100644 --- a/quickstep/res/values-da/strings.xml +++ b/quickstep/res/values-da/strings.xml @@ -91,7 +91,7 @@ "Stryg opad for at gå til startsiden" "Tryk på knappen Hjem for at gå til din startskærm" "Du er klar til at bruge din %1$s" - "enhed" + "Du er klar til at bruge din enhed" "Indstillinger for systemnavigation" "Del" "Screenshot" diff --git a/quickstep/res/values-de/strings.xml b/quickstep/res/values-de/strings.xml index d1e44f2649..0cc7639747 100644 --- a/quickstep/res/values-de/strings.xml +++ b/quickstep/res/values-de/strings.xml @@ -91,7 +91,7 @@ "Nach oben wischen, um den Startbildschirm aufzurufen" "Startbildschirmtaste drücken, um zum Startbildschirm zu gehen" "Du kannst dein %1$s jetzt verwenden" - "Gerät" + "Du kannst dein Gerät jetzt verwenden" "Einstellungen für die Systemnavigation" "Teilen" "Screenshot" diff --git a/quickstep/res/values-el/strings.xml b/quickstep/res/values-el/strings.xml index ce4d8d2899..b7027d148c 100644 --- a/quickstep/res/values-el/strings.xml +++ b/quickstep/res/values-el/strings.xml @@ -91,7 +91,7 @@ "Σύρετε προς τα επάνω για να μεταβείτε στην αρχική σελίδα" "Πατήστε το κουμπί αρχικής οθόνης για να μεταβείτε στην αρχική οθόνη" "Είστε έτοιμοι να ξεκινήσετε να χρησιμοποιείτε τη %1$s" - "συσκευή" + "Είστε έτοιμοι να ξεκινήσετε να χρησιμοποιείτε τη συσκευή σας" "Ρυθμίσεις πλοήγησης συστήματος" "Κοινοποίηση" "Στιγμιότυπο οθόνης" diff --git a/quickstep/res/values-en-rAU/strings.xml b/quickstep/res/values-en-rAU/strings.xml index 9ab5543a5d..7b377067e8 100644 --- a/quickstep/res/values-en-rAU/strings.xml +++ b/quickstep/res/values-en-rAU/strings.xml @@ -91,7 +91,7 @@ "Swipe up to go home" "Tap the home button to go to your home screen" "You’re ready to start using your %1$s" - "device" + "You\'re ready to start using your device" "System navigation settings" "Share" "Screenshot" diff --git a/quickstep/res/values-en-rCA/strings.xml b/quickstep/res/values-en-rCA/strings.xml index 1e6a340852..1cced69e4c 100644 --- a/quickstep/res/values-en-rCA/strings.xml +++ b/quickstep/res/values-en-rCA/strings.xml @@ -91,7 +91,7 @@ "Swipe up to go home" "Tap the home button to go to your home screen" "You\'re ready to start using your %1$s" - "device" + "You’re ready to start using your device" "System navigation settings" "Share" "Screenshot" diff --git a/quickstep/res/values-en-rGB/strings.xml b/quickstep/res/values-en-rGB/strings.xml index 9ab5543a5d..7b377067e8 100644 --- a/quickstep/res/values-en-rGB/strings.xml +++ b/quickstep/res/values-en-rGB/strings.xml @@ -91,7 +91,7 @@ "Swipe up to go home" "Tap the home button to go to your home screen" "You’re ready to start using your %1$s" - "device" + "You\'re ready to start using your device" "System navigation settings" "Share" "Screenshot" diff --git a/quickstep/res/values-en-rIN/strings.xml b/quickstep/res/values-en-rIN/strings.xml index 9ab5543a5d..7b377067e8 100644 --- a/quickstep/res/values-en-rIN/strings.xml +++ b/quickstep/res/values-en-rIN/strings.xml @@ -91,7 +91,7 @@ "Swipe up to go home" "Tap the home button to go to your home screen" "You’re ready to start using your %1$s" - "device" + "You\'re ready to start using your device" "System navigation settings" "Share" "Screenshot" diff --git a/quickstep/res/values-es-rUS/strings.xml b/quickstep/res/values-es-rUS/strings.xml index f9385f7eea..c6f87f7477 100644 --- a/quickstep/res/values-es-rUS/strings.xml +++ b/quickstep/res/values-es-rUS/strings.xml @@ -91,7 +91,7 @@ "Desliza el dedo hacia arriba para ir a la página principal" "Presiona el botón de inicio para ir a la pantalla principal" "Ya puedes comenzar a usar tu %1$s" - "dispositivo" + "Ya puedes empezar a usar tu dispositivo" "Configuración de navegación del sistema" "Compartir" "Captura de pantalla" diff --git a/quickstep/res/values-es/strings.xml b/quickstep/res/values-es/strings.xml index 17f3dd022f..21e4ae9a1b 100644 --- a/quickstep/res/values-es/strings.xml +++ b/quickstep/res/values-es/strings.xml @@ -91,7 +91,7 @@ "Desliza hacia arriba para ir a la pantalla de inicio" "Toca el botón de inicio para ir a la pantalla de inicio" "Ya puedes empezar a usar tu %1$s" - "dispositivo" + "Ya puedes empezar a usar tu dispositivo" "Opciones de navegación" "Compartir" "Hacer captura" diff --git a/quickstep/res/values-et/strings.xml b/quickstep/res/values-et/strings.xml index b2df44224d..e08d309f51 100644 --- a/quickstep/res/values-et/strings.xml +++ b/quickstep/res/values-et/strings.xml @@ -91,7 +91,7 @@ "Avalehele liikumiseks pühkige üles" "Avakuvale liikumiseks puudutage avakuva nuppu" "Teie %1$s on nüüd kasutamiseks valmis." - "seade" + "Seade on nüüd kasutamiseks valmis" "Süsteemi navigeerimisseaded" "Jaga" "Ekraanipilt" diff --git a/quickstep/res/values-eu/strings.xml b/quickstep/res/values-eu/strings.xml index b38965ec4f..9304419b83 100644 --- a/quickstep/res/values-eu/strings.xml +++ b/quickstep/res/values-eu/strings.xml @@ -91,7 +91,7 @@ "Pasatu hatza gora orri nagusira joateko" "Orri nagusira joateko, sakatu Hasiera botoia" "Prest zaude %1$s erabiltzen hasteko" - "gailua" + "Prest zaude gailua erabiltzen hasteko" "Sisteman nabigatzeko ezarpenak" "Partekatu" "Atera pantaila-argazki bat" diff --git a/quickstep/res/values-fa/strings.xml b/quickstep/res/values-fa/strings.xml index cfd56db26a..f69a64371e 100644 --- a/quickstep/res/values-fa/strings.xml +++ b/quickstep/res/values-fa/strings.xml @@ -91,7 +91,7 @@ "برای رفتن به صفحه اصلی، تند به‌بالا بکشید" "برای رفتن به صفحه اصلی، روی دکمه صفحه اصلی تک‌ضرب بزنید" "آماده‌اید از %1$s خود استفاده کنید" - "دستگاه" + "آماده‌اید از دستگاهتان استفاده کنید" "تنظیمات پیمایش سیستم" "هم‌رسانی" "نماگرفت" diff --git a/quickstep/res/values-fi/strings.xml b/quickstep/res/values-fi/strings.xml index 81a7bc38fb..fc5581010d 100644 --- a/quickstep/res/values-fi/strings.xml +++ b/quickstep/res/values-fi/strings.xml @@ -91,7 +91,7 @@ "Siirry aloitusnäytölle pyyhkäisemällä ylös" "Siirry aloitusnäytölle napauttamalla aloitusnäyttöpainiketta" "%1$s on nyt valmis käytettäväksi" - "Laite" + "Laite on nyt valmis käytettäväksi" "Järjestelmän navigointiasetukset" "Jaa" "Kuvakaappaus" diff --git a/quickstep/res/values-fr-rCA/strings.xml b/quickstep/res/values-fr-rCA/strings.xml index e795661f0b..0cca740da1 100644 --- a/quickstep/res/values-fr-rCA/strings.xml +++ b/quickstep/res/values-fr-rCA/strings.xml @@ -91,7 +91,7 @@ "Balayez l\'écran vers le haut pour accéder à l\'écran d\'accueil" "Toucher le bouton d\'accueil pour passer sur votre écran d\'accueil" "Vous êtes maintenant prêt à utiliser votre %1$s" - "appareil" + "Vous êtes maintenant prêt à utiliser votre appareil" "Paramètres de navigation du système" "Partager" "Capture d\'écran" diff --git a/quickstep/res/values-fr/strings.xml b/quickstep/res/values-fr/strings.xml index 3c485ad7a0..6f7f8e44c0 100644 --- a/quickstep/res/values-fr/strings.xml +++ b/quickstep/res/values-fr/strings.xml @@ -91,7 +91,7 @@ "Balayez vers le haut pour revenir à l\'accueil" "Appuyez sur le bouton d\'accueil pour accéder à votre écran d\'accueil" "Vous pouvez maintenant utiliser votre %1$s" - "appareil" + "Vous pouvez maintenant utiliser votre appareil" "Paramètres de navigation système" "Partager" "Capture d\'écran" @@ -168,7 +168,7 @@ "Bouton \"Fermer\"" "Épingler à la barre" "Désépingler de la barre" - "Décaler" + "Rappel automatique" "Fermer" - "Décaler l\'image" + "Image de rappel automatique" diff --git a/quickstep/res/values-gl/strings.xml b/quickstep/res/values-gl/strings.xml index 4898f57ea4..3400b4c793 100644 --- a/quickstep/res/values-gl/strings.xml +++ b/quickstep/res/values-gl/strings.xml @@ -91,7 +91,7 @@ "Pasa o dedo cara arriba para ir á pantalla de inicio" "Toca o botón de inicio para ir á pantalla de inicio" "%1$s dispoñible para comezar a utilizar" - "Dispositivo" + "Xa está todo listo para que empeces a usar o teu dispositivo" "Configuración da navegación do sistema" "Compartir" "Facer captura" diff --git a/quickstep/res/values-gu/strings.xml b/quickstep/res/values-gu/strings.xml index ea4a97e640..eccf2c870c 100644 --- a/quickstep/res/values-gu/strings.xml +++ b/quickstep/res/values-gu/strings.xml @@ -91,7 +91,7 @@ "હોમ પર જવા માટે ઉપરની તરફ સ્વાઇપ કરો" "તમારી હોમ સ્ક્રીન પર જવા માટે હોમ બટન ટૅપ કરો" "તમે તમારા %1$sનો ઉપયોગ કરવાનું શરૂ કરવા માટે તૈયાર છો" - "ડિવાઇસ" + "તમે તમારા ડિવાઇસનો ઉપયોગ કરવાનું શરૂ કરવા માટે તૈયાર છો" "સિસ્ટમના નૅવિગેશન સેટિંગ" "શેર કરો" "સ્ક્રીનશૉટ" @@ -109,16 +109,11 @@ "રદ કરો" "છોડો" "સ્ક્રીન ફેરવો" - - - - - - - - - - + "ઍનિમેશન બતાવે છે કે કેવી રીતે ટાસ્કબાર સ્ક્રીનના તળિયેથી દૃશ્યમાં આવે છે અને ઉપયોગમાં ન હોય ત્યારે ઑટોમૅટિક રીતે છુપાઇ જાય છે" + "ઍનિમેશન બતાવે છે કે કેવી રીતે ટૉગલ કરો બટનનો ઉપયોગ કરીને તમારા ટાસ્કબારને પિન કરવું, જેથી કરીને સ્ક્રીનના તળિયે ટાસ્કબાર કાયમી રીતે દેખાતું રહે" + "ઍનિમેશન બતાવે છે કે કેવી રીતે કોઈ ખુલ્લી ઍપની ઉપર ટાસ્કબારમાંથી ઍપને ખેંચી અને છોડીને વિભાજીત સ્ક્રીન બનાવવી" + "ઍનિમેશન બતાવે છે કે તમારા ડિવાઇસ પર સૂચવેલી ઍપને કેવી રીતે ઍક્સેસ કરવી" + "ઍનિમેશન બતાવે છે કે ઍક્શન કીને ટચ કરીને થોડીવાર દબાવી રાખીને અને આઇટમ જે ક્ષેત્રમાં છે તેને પસંદ કરીને, સ્ક્રીન પરની કોઈ આઇટમ માટે કેવી રીતે શોધ કરવી" "ટાસ્કબાર વિશે શિક્ષણ" "એક સાથે 2 ઍપનો ઉપયોગ કરવા માટે, ઍપને ખેંચીને બાજુ પર લઈ જાઓ" "ટાસ્કબાર બતાવવા માટે ઉપરની તરફ ધીમેથી સ્વાઇપ કરો" diff --git a/quickstep/res/values-hi/strings.xml b/quickstep/res/values-hi/strings.xml index 787cb0e7ea..b3ded99c10 100644 --- a/quickstep/res/values-hi/strings.xml +++ b/quickstep/res/values-hi/strings.xml @@ -91,7 +91,7 @@ "होम पेज पर जाने के लिए, ऊपर की ओर स्वाइप करें" "होम स्क्रीन पर जाने के लिए, होम बटन पर टैप करें" "अब %1$s इस्तेमाल के लिए तैयार है" - "डिवाइस" + "आपका डिवाइस इस्तेमाल के लिए तैयार है" "सिस्टम नेविगेशन से जुड़ी सेटिंग" "शेयर करें" "स्क्रीनशॉट लें" diff --git a/quickstep/res/values-hr/strings.xml b/quickstep/res/values-hr/strings.xml index 81673c837f..e600dd5608 100644 --- a/quickstep/res/values-hr/strings.xml +++ b/quickstep/res/values-hr/strings.xml @@ -91,7 +91,7 @@ "Prijeđite prstom prema gore da biste otvorili početni zaslon" "Dodirnite gumb početnog zaslona da biste prešli na početni zaslon" "Možete početi upotrebljavati %1$s" - "Uređaj" + "Možete početi upotrebljavati uređaj" "Postavke navigacije sustavom" "Podijeli" "Snimka zaslona" diff --git a/quickstep/res/values-hu/strings.xml b/quickstep/res/values-hu/strings.xml index 071f8f9a06..2da28fcab7 100644 --- a/quickstep/res/values-hu/strings.xml +++ b/quickstep/res/values-hu/strings.xml @@ -91,7 +91,7 @@ "Felfelé csúsztatva megjelenik a kezdőképernyő" "A kezdőképernyőre való lépéshez koppintson a kezdőképernyő gombra" "Készen áll az %1$s használatára" - "eszköz" + "Készen áll az eszköz használatára" "Rendszer-navigációs beállítások" "Megosztás" "Képernyőkép" diff --git a/quickstep/res/values-hy/strings.xml b/quickstep/res/values-hy/strings.xml index 114363b1eb..7c2770b13b 100644 --- a/quickstep/res/values-hy/strings.xml +++ b/quickstep/res/values-hy/strings.xml @@ -91,7 +91,7 @@ "Մատը սահեցրեք վերև՝ հիմնական էկրան անցնելու համար" "Հիմնական էկրան վերադառնալու համար սեղմեք գլխավոր էկրանի կոճակը" "Դուք արդեն կարող եք օգտագործել ձեր %1$sը" - "սարք" + "Դուք արդեն կարող եք օգտագործել ձեր սարքը" "Նավիգացիայի համակարգային կարգավորումներ" "Կիսվել" "Սքրինշոթ անել" diff --git a/quickstep/res/values-in/strings.xml b/quickstep/res/values-in/strings.xml index a90f00d813..6fe65918f6 100644 --- a/quickstep/res/values-in/strings.xml +++ b/quickstep/res/values-in/strings.xml @@ -91,7 +91,7 @@ "Geser ke atas untuk membuka Layar utama" "Ketuk tombol layar utama untuk membuka layar utama" "Anda sudah siap untuk mulai menggunakan %1$s" - "perangkat" + "Anda sudah siap untuk mulai menggunakan perangkat" "Setelan navigasi sistem" "Bagikan" "Screenshot" diff --git a/quickstep/res/values-is/strings.xml b/quickstep/res/values-is/strings.xml index d74eb8ae58..a498239019 100644 --- a/quickstep/res/values-is/strings.xml +++ b/quickstep/res/values-is/strings.xml @@ -91,7 +91,7 @@ "Strjúktu upp til að fara á heimaskjáinn" "Ýttu á heimahnappinn til að fara á heimaskjáinn" "Þú getur byrjað að nota %1$s" - "tækið" + "Þú getur byrjað að nota tækið" "Stillingar kerfisstjórnunar" "Deila" "Skjámynd" diff --git a/quickstep/res/values-it/strings.xml b/quickstep/res/values-it/strings.xml index cb4b1f1212..0e88ff0c7f 100644 --- a/quickstep/res/values-it/strings.xml +++ b/quickstep/res/values-it/strings.xml @@ -91,7 +91,7 @@ "Scorri verso l\'alto per andare alla schermata Home" "Tocca il pulsante Home per andare alla schermata Home" "Puoi iniziare a usare il tuo %1$s" - "dispositivo" + "Puoi iniziare a usare il tuo dispositivo" "Impostazioni di navigazione del sistema" "Condividi" "Screenshot" diff --git a/quickstep/res/values-iw/strings.xml b/quickstep/res/values-iw/strings.xml index e936af0b50..cdd35ab23d 100644 --- a/quickstep/res/values-iw/strings.xml +++ b/quickstep/res/values-iw/strings.xml @@ -91,7 +91,7 @@ "כדי לחזור לדף הבית, צריך להחליק למעלה" "כדי לעבור אל מסך הבית צריך ללחוץ על הכפתור הראשי" "הכול מוכן ואפשר להתחיל להשתמש ב%1$s" - "מכשיר" + "הכול מוכן ואפשר להתחיל להשתמש במכשיר" "הגדרות הניווט במערכת" "שיתוף" "צילום מסך" diff --git a/quickstep/res/values-ja/strings.xml b/quickstep/res/values-ja/strings.xml index 76a852988e..51d090d921 100644 --- a/quickstep/res/values-ja/strings.xml +++ b/quickstep/res/values-ja/strings.xml @@ -91,7 +91,7 @@ "ホームに移動するには上にスワイプします" "ホームボタンをタップすると、ホーム画面に移動します" "%1$s を使用する準備ができました" - "デバイス" + "デバイスを使用する準備ができました" "システム ナビゲーションの設定" "共有" "スクリーンショット" diff --git a/quickstep/res/values-ka/strings.xml b/quickstep/res/values-ka/strings.xml index bdbf98fe94..55db64eea4 100644 --- a/quickstep/res/values-ka/strings.xml +++ b/quickstep/res/values-ka/strings.xml @@ -91,7 +91,7 @@ "მთავარ გვერდზე გადასასვლელად გადაფურცლეთ ზევით" "შეეხეთ მთავარი ეკრანის ღილაკს მთავარ ეკრანზე გადასასვლელად" "მზად ხართ, გამოიყენოთ %1$s" - "მოწყობილობა" + "თქვენ მზად ხართ მოწყობილობის გამოსაყენებლად" "სისტემის ნავიგაციის პარამეტრები" "გაზიარება" "ეკრანის ანაბეჭდი" diff --git a/quickstep/res/values-kk/strings.xml b/quickstep/res/values-kk/strings.xml index 4a5a3e9da9..dfcd185c22 100644 --- a/quickstep/res/values-kk/strings.xml +++ b/quickstep/res/values-kk/strings.xml @@ -91,7 +91,7 @@ "Негізгі экранға өту үшін жоғары қарай сырғытыңыз." "Негізгі экранға өту үшін негізгі экран түймесін түртіңіз." "%1$s пайдалануға дайын." - "Құрылғы" + "Құрылғы пайдалануға дайын." "Навигацияның жүйелік параметрлері" "Бөлісу" "Скриншот" diff --git a/quickstep/res/values-km/strings.xml b/quickstep/res/values-km/strings.xml index 010d7767dd..888d1cc445 100644 --- a/quickstep/res/values-km/strings.xml +++ b/quickstep/res/values-km/strings.xml @@ -91,7 +91,7 @@ "អូស​ឡើង​លើ ​ដើម្បី​ចូលទៅកាន់អេក្រង់ដើម" "ចុចប៊ូតុងដើម ដើម្បីចូលទៅកាន់អេក្រង់ដើមរបស់អ្នក" "អ្នកអាចចាប់ផ្ដើមប្រើ%1$sរបស់អ្នកបានហើយ" - "ឧបករណ៍" + "អ្នកអាចចាប់ផ្ដើមប្រើឧបករណ៍របស់អ្នកបានហើយ" "ការកំណត់​ការរុករក​ប្រព័ន្ធ" "ចែករំលែក" "រូបថតអេក្រង់" diff --git a/quickstep/res/values-kn/strings.xml b/quickstep/res/values-kn/strings.xml index 338ef99517..14539d1717 100644 --- a/quickstep/res/values-kn/strings.xml +++ b/quickstep/res/values-kn/strings.xml @@ -91,7 +91,7 @@ "ಮುಖಪುಟಕ್ಕೆ ಹೋಗಲು ಮೇಲೆ ಸ್ವೈಪ್ ಮಾಡಿ" "ನಿಮ್ಮ ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ಗೆ ಹೋಗಲು ಹೋಮ್ ಬಟನ್ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ" "ನಿಮ್ಮ %1$s ಬಳಸುವುದನ್ನು ಪ್ರಾರಂಭಿಸಲು ನೀವು ಸಿದ್ಧರಾಗಿರುವಿರಿ" - "ಸಾಧನ" + "ನಿಮ್ಮ ಸಾಧನವನ್ನು ಬಳಸಲು ನೀವು ಸಿದ್ಧರಾಗಿದ್ದೀರಿ" "ಸಿಸ್ಟಂ ನ್ಯಾವಿಗೇಶನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು" "ಹಂಚಿಕೊಳ್ಳಿ" "ಸ್ಕ್ರೀನ್‌ಶಾಟ್" diff --git a/quickstep/res/values-ko/strings.xml b/quickstep/res/values-ko/strings.xml index 9705ea4ef8..86f40d4142 100644 --- a/quickstep/res/values-ko/strings.xml +++ b/quickstep/res/values-ko/strings.xml @@ -91,7 +91,7 @@ "위로 스와이프하여 홈으로 이동" "홈 화면으로 이동하려면 홈 버튼을 탭하세요." "%1$s 사용 준비가 완료되었습니다." - "기기" + "기기를 사용할 준비가 되었습니다." "시스템 탐색 설정" "공유" "스크린샷" diff --git a/quickstep/res/values-ky/strings.xml b/quickstep/res/values-ky/strings.xml index 164b032e3e..a15076f091 100644 --- a/quickstep/res/values-ky/strings.xml +++ b/quickstep/res/values-ky/strings.xml @@ -91,7 +91,7 @@ "Башкы бетке өтүү үчүн экранды өйдө сүрүңүз" "Башкы экранга өтүү үчүн башкы бет баскычын таптап коюңуз" "%1$s колдоно берсеңиз болот" - "Түзмөктү" + "Түзмөгүңүздү колдоно берсеңиз болот" "Өтүү аракетинин системалык параметрлери" "Бөлүшүү" "Скриншот" diff --git a/quickstep/res/values-lo/strings.xml b/quickstep/res/values-lo/strings.xml index 5d74f479ff..45524488ac 100644 --- a/quickstep/res/values-lo/strings.xml +++ b/quickstep/res/values-lo/strings.xml @@ -91,7 +91,7 @@ "ປັດຂຶ້ນເພື່ອໄປຫາໜ້າຫຼັກ" "ແຕະປຸ່ມໜ້າທຳອິດເພື່ອໄປຫາໂຮມສະກຣີນຂອງທ່ານ" "ທ່ານເລີ່ມໃຊ້%1$sຂອງທ່ານໄດ້ແລ້ວ" - "ອຸປະກອນ" + "ທ່ານເລີ່ມໃຊ້ອຸປະກອນຂອງທ່ານແລ້ວ" "ການຕັ້ງຄ່າການນຳທາງລະບົບ" "ແບ່ງປັນ" "ຮູບໜ້າຈໍ" diff --git a/quickstep/res/values-lt/strings.xml b/quickstep/res/values-lt/strings.xml index 98fc0e4bd3..83277e0526 100644 --- a/quickstep/res/values-lt/strings.xml +++ b/quickstep/res/values-lt/strings.xml @@ -91,7 +91,7 @@ "Perbraukite aukštyn, kad grįžtumėte į pagrindinį ekraną" "Norėdami eiti į pagrindinį ekraną, palieskite pagrindinio ekrano mygtuką" "Jau parengta naudoti: %1$s" - "įrenginys" + "Esate pasirengę pradėti naudoti įrenginį" "Sistemos naršymo nustatymai" "Bendrinti" "Ekrano kopija" diff --git a/quickstep/res/values-lv/strings.xml b/quickstep/res/values-lv/strings.xml index 557a58cf94..07ed039729 100644 --- a/quickstep/res/values-lv/strings.xml +++ b/quickstep/res/values-lv/strings.xml @@ -91,7 +91,7 @@ "Velciet augšup, lai pārietu uz sākuma ekrānu" "Pieskarieties pogai Sākums, lai dotos uz sākuma ekrānu" "Jūsu %1$s ir gatava lietošanai" - "ierīce" + "Varat sākt izmantot savu ierīci" "Sistēmas navigācijas iestatījumi" "Kopīgot" "Veikt ekrānuzņēmumu" diff --git a/quickstep/res/values-mk/strings.xml b/quickstep/res/values-mk/strings.xml index 65b5d65a89..2a46716c8a 100644 --- a/quickstep/res/values-mk/strings.xml +++ b/quickstep/res/values-mk/strings.xml @@ -91,7 +91,7 @@ "Повлечете нагоре за да го отворите почетниот екран" "Допрете го копчето за почетен екран за да одите на почетниот екран" "Подготвени сте да почнете да го користите вашиот %1$s" - "уред" + "Подготвени сте да започнете да го користите вашиот уред" "Поставки за системска навигација" "Сподели" "Слика од екранот" @@ -109,16 +109,11 @@ "Откажи" "Прескокни" "Ротирајте го екранот" - - - - - - - - - - + "Анимација што прикажува како „Лентата со задачи“ се појавува од дното на екранот и автоматски се крие кога не се користи" + "Анимација што прикажува како да ја закачите „Лентата со задачи“ со прекинувач за да може „Лентата со задачи“ да остане трајно видлива на дното на екранот" + "Анимација што прикажува како да создадете поделен екран, со влечење и спуштање апликација од „Лентата со задачи“ над отворена апликација" + "Анимација што прикажува како да пристапите до предложените апликации на вашиот уред" + "Анимација што прикажува како да пребарате ставка на екранот, со допирање и задржување на копчето за дејство и избирање на областа во која се наоѓа ставката" "Обука за лентата со задачи" "Повлечете апликација настрана за да користите 2 апликации одеднаш" "Полека повлечете нагоре за да се прикаже „Лентата со задачи“" diff --git a/quickstep/res/values-ml/strings.xml b/quickstep/res/values-ml/strings.xml index 5c28ad8531..1e8835367e 100644 --- a/quickstep/res/values-ml/strings.xml +++ b/quickstep/res/values-ml/strings.xml @@ -91,7 +91,7 @@ "ഹോമിലേക്ക് പോകാൻ മുകളിലേക്ക് സ്വൈപ്പ് ചെയ്യുക" "നിങ്ങളുടെ ഹോം സ്ക്രീനിലേക്ക് പോകാൻ ഹോം ബട്ടൺ ടാപ്പ് ചെയ്യുക" "നിങ്ങൾക്ക് %1$s ഉപയോഗിച്ചു തുടങ്ങാം" - "ഉപകരണം" + "നിങ്ങളുടെ ഉപകരണം ഉപയോഗിച്ച് തുടങ്ങാൻ നിങ്ങൾ തയ്യാറാണ്" "സിസ്‌റ്റം നാവിഗേഷൻ ക്രമീകരണം" "പങ്കിടുക" "സ്ക്രീൻഷോട്ട്" diff --git a/quickstep/res/values-mn/strings.xml b/quickstep/res/values-mn/strings.xml index 0ff4429470..c8f962e41d 100644 --- a/quickstep/res/values-mn/strings.xml +++ b/quickstep/res/values-mn/strings.xml @@ -91,7 +91,7 @@ "Нүүр хуудас руу очихын тулд дээш шударна уу" "Үндсэн нүүр лүүгээ очихын тулд нүүр хуудасны товчлуурыг товшино уу" "Та %1$s-г ашиглаж эхлэхэд бэлэн боллоо" - "төхөөрөмж" + "Та төхөөрөмжөө ашиглаж эхлэхэд бэлэн байна" "Системийн навигацын тохиргоо" "Хуваалцах" "Дэлгэцийн агшин дарах" diff --git a/quickstep/res/values-mr/strings.xml b/quickstep/res/values-mr/strings.xml index 79258f9352..ea70ff85d6 100644 --- a/quickstep/res/values-mr/strings.xml +++ b/quickstep/res/values-mr/strings.xml @@ -91,7 +91,7 @@ "होमवर जाण्यासाठी वरती स्वाइप करा" "तुमच्या होम स्क्रीनवर जाण्यासाठी होम बटणावर टॅप करा" "तुम्ही तुमचे %1$s वापरण्यास सुरुवात करू शकता" - "डिव्हाइस" + "तुम्ही तुमचे डिव्हाइस वापरण्यास सुरुवात करण्यासाठी तयार आहात" "सिस्टीम नेव्हिगेशन सेटिंग्ज" "शेअर करा" "स्क्रीनशॉट" diff --git a/quickstep/res/values-ms/strings.xml b/quickstep/res/values-ms/strings.xml index 14749a9393..d2bd0c1ea3 100644 --- a/quickstep/res/values-ms/strings.xml +++ b/quickstep/res/values-ms/strings.xml @@ -91,7 +91,7 @@ "Leret ke atas untuk ke skrin utama" "Ketik butang skrin utama untuk pergi ke skrin utama anda" "Anda sudah sedia untuk mula menggunakan %1$s anda" - "peranti" + "Anda bersedia untuk menggunakan peranti anda" "Tetapan navigasi sistem" "Kongsi" "Tangkapan skrin" diff --git a/quickstep/res/values-my/strings.xml b/quickstep/res/values-my/strings.xml index df0e3c3d39..ecd01940eb 100644 --- a/quickstep/res/values-my/strings.xml +++ b/quickstep/res/values-my/strings.xml @@ -91,7 +91,7 @@ "ပင်မစာမျက်နှာသို့သွားရန် အပေါ်သို့ ပွတ်ဆွဲပါ" "ပင်မစာမျက်နှာသို့ သွားရန် ပင်မခလုတ်ကို တို့ပါ" "%1$s စသုံးရန် အသင့်ဖြစ်ပါပြီ" - "စက်" + "သင့်စက်ကို စသုံးရန် အသင့်ဖြစ်ပါပြီ" "စနစ် လမ်းညွှန် ဆက်တင်များ" "မျှဝေရန်" "ဖန်သားပြင်ဓာတ်ပုံ" diff --git a/quickstep/res/values-nb/strings.xml b/quickstep/res/values-nb/strings.xml index 453d1540b1..6aeb3c6e3d 100644 --- a/quickstep/res/values-nb/strings.xml +++ b/quickstep/res/values-nb/strings.xml @@ -91,7 +91,7 @@ "Sveip opp for å gå til startskjermen" "Trykk på hjemknappen for å gå til startskjermen" "Nå kan du bruke %1$s" - "enheten" + "Nå kan du bruke enheten" "Innstillinger for systemnavigasjon" "Del" "Skjermbilde" diff --git a/quickstep/res/values-ne/strings.xml b/quickstep/res/values-ne/strings.xml index d123fc905a..1def3fd012 100644 --- a/quickstep/res/values-ne/strings.xml +++ b/quickstep/res/values-ne/strings.xml @@ -91,7 +91,7 @@ "होममा जान माथितिर स्वाइप गर्नुहोस्" "आफ्नो होम स्क्रिनमा जान होम बटनमा ट्याप गर्नुहोस्" "तपाईं अब आफ्नो %1$s चलाउन थाल्न सक्नुहुन्छ" - "डिभाइस" + "तपाईं अब आफ्नो डिभाइस प्रयोग गर्न थाल्न सक्नुहुन्छ" "सिस्टम नेभिगेसनसम्बन्धी सेटिङ" "सेयर गर्नुहोस्" "स्क्रिनसट" diff --git a/quickstep/res/values-nl/strings.xml b/quickstep/res/values-nl/strings.xml index 009c002390..3ca812863c 100644 --- a/quickstep/res/values-nl/strings.xml +++ b/quickstep/res/values-nl/strings.xml @@ -91,7 +91,7 @@ "Swipe omhoog om naar het startscherm te gaan" "Tik op de startknop om naar je startscherm te gaan" "Je bent klaar om je %1$s te gebruiken" - "apparaat" + "Je bent klaar om je apparaat te gebruiken" "Navigatie-instellingen van systeem" "Delen" "Screenshot" diff --git a/quickstep/res/values-or/strings.xml b/quickstep/res/values-or/strings.xml index c1b7693649..43da327dce 100644 --- a/quickstep/res/values-or/strings.xml +++ b/quickstep/res/values-or/strings.xml @@ -91,7 +91,7 @@ "ହୋମକୁ ଯିବା ପାଇଁ ଉପରକୁ ସ୍ୱାଇପ କରନ୍ତୁ" "ଆପଣଙ୍କ ହୋମ ସ୍କ୍ରିନକୁ ଯିବା ପାଇଁ ହୋମ ବଟନରେ ଟାପ କରନ୍ତୁ" "ଆପଣ ଆପଣଙ୍କ %1$s ବ୍ୟବହାର କରିବା ଆରମ୍ଭ କରିବାକୁ ପ୍ରସ୍ତୁତ ଅଛନ୍ତି" - "ଡିଭାଇସ" + "ଆପଣ ଆପଣଙ୍କ ଡିଭାଇସ ବ୍ୟବହାର କରିବା ଆରମ୍ଭ କରିବାକୁ ପ୍ରସ୍ତୁତ ଅଛନ୍ତି" "ସିଷ୍ଟମ ନାଭିଗେସନ ସେଟିଂସ" "ସେୟାର୍ କରନ୍ତୁ" "ସ୍କ୍ରିନସଟ୍" @@ -109,16 +109,11 @@ "ବାତିଲ କରନ୍ତୁ" "ବାଦ୍ ଦିଅନ୍ତୁ" "ସ୍କ୍ରିନ ଘୂରାନ୍ତୁ" - - - - - - - - - - + "ସ୍କ୍ରିନର ନିମ୍ନରୁ ଟାସ୍କବାର କିପରି ଦେଖାଯାଏ ଏବଂ ବ୍ୟବହାରରେ ନଥିବା ସମୟରେ ସ୍ୱତଃ ଲୁଚିଯାଏ ତାହା ଦେଖାଉଥିବା ଆନିମେସନ" + "ଏକ ଟୋଗଲ ବ୍ୟବହାର କରି ଆପଣଙ୍କର ଟାସ୍କବାରକୁ କିପରି ପିନ କରିବେ ତାହା ଦେଖାଉଥିବା ଆନିମେସନ, ଫଳରେ ଟାସ୍କବାର ସ୍କ୍ରିନର ନିମ୍ନରେ ସ୍ଥାୟୀ ଭାବରେ ଦେଖାଯିବ" + "ଏକ ଖୋଲା ଥିବା ଆପ ଉପରେ ଟାସ୍କବାରରୁ ଏକ ଆପ ଡ୍ରାଗ ଏବଂ ଡ୍ରପ କରି ଏକ ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନ କିପରି ତିଆରି କରିବେ ତାହା ଦେଖାଉଥିବା ଆନିମେସନ" + "ଆପଣଙ୍କ ଡିଭାଇସରେ ପ୍ରସ୍ତାବିତ ଆପ୍ସକୁ କିପରି ଆକ୍ସେସ କରିବେ ତାହା ଦେଖାଉଥିବା ଆନିମେସନ" + "ଆକ୍ସନ କୀ\'କୁ ସ୍ପର୍ଶ କରି ଧରି ରଖି ଏବଂ ଆଇଟମ କେଉଁ ଏରିଆରେ ଅଛି ତାହା ଚୟନ କରି ସ୍କ୍ରିନରେ ଏକ ଆଇଟମ କିପରି ସର୍ଚ୍ଚ କରିବେ ତାହା ଦେଖାଉଥିବା ଆନିମେସନ" "ଟାସ୍କବାର ଶିକ୍ଷା" "ଥରକେ 2ଟି ଆପ୍ସ ବ୍ୟବହାର କରିବା ପାଇଁ ଏକ ଆପକୁ ପାର୍ଶ୍ୱକୁ ଡ୍ରାଗ କର" "ଟାସ୍କବାର ଦେଖାଇବା ପାଇଁ ଉପରକୁ ଧୀରେ-ସ୍ୱାଇପ କରନ୍ତୁ" diff --git a/quickstep/res/values-pa/strings.xml b/quickstep/res/values-pa/strings.xml index 9621f12166..6ff55b9e1b 100644 --- a/quickstep/res/values-pa/strings.xml +++ b/quickstep/res/values-pa/strings.xml @@ -91,7 +91,7 @@ "ਹੋਮ \'ਤੇ ਜਾਣ ਲਈ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ" "ਆਪਣੀ ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਜਾਣ ਲਈ ਹੋਮ ਬਟਨ \'ਤੇ ਟੈਪ ਕਰੋ" "ਹੁਣ ਤੁਹਾਡਾ %1$s ਵਰਤੋਂ ਲਈ ਤਿਆਰ ਹੈ" - "ਡੀਵਾਈਸ" + "ਤੁਸੀਂ ਆਪਣਾ ਡੀਵਾਈਸ ਵਰਤਣ ਲਈ ਤਿਆਰ ਹੋ" "ਸਿਸਟਮ ਨੈਵੀਗੇਸ਼ਨ ਸੈਟਿੰਗਾਂ" "ਸਾਂਝਾ ਕਰੋ" "ਸਕ੍ਰੀਨਸ਼ਾਟ" diff --git a/quickstep/res/values-pl/strings.xml b/quickstep/res/values-pl/strings.xml index 5818095561..45b4f87a99 100644 --- a/quickstep/res/values-pl/strings.xml +++ b/quickstep/res/values-pl/strings.xml @@ -91,7 +91,7 @@ "Aby przejść na stronę główną, przesuń w górę" "Kliknij przycisk ekranu głównego, aby otworzyć ekran główny" "%1$s jest gotowe – możesz zacząć z niego korzystać" - "Urządzenie" + "Wszystko gotowe – możesz zacząć korzystać z urządzenia" "Ustawienia nawigacji w systemie" "Udostępnij" "Zrzut ekranu" diff --git a/quickstep/res/values-pt-rPT/strings.xml b/quickstep/res/values-pt-rPT/strings.xml index 744c591582..6c0b422980 100644 --- a/quickstep/res/values-pt-rPT/strings.xml +++ b/quickstep/res/values-pt-rPT/strings.xml @@ -91,7 +91,7 @@ "Deslize rapidamente para cima para aceder ao ecrã principal" "Toque no botão do ecrã principal para aceder ao ecrã principal" "Já pode começar a usar o seu %1$s" - "dispositivo" + "Já pode começar a usar o seu dispositivo" "Definições de navegação do sistema" "Partilhar" "Fazer captura de ecrã" diff --git a/quickstep/res/values-pt/strings.xml b/quickstep/res/values-pt/strings.xml index 4a4e1ed581..7af740a372 100644 --- a/quickstep/res/values-pt/strings.xml +++ b/quickstep/res/values-pt/strings.xml @@ -91,7 +91,7 @@ "Deslize para cima para acessar a tela inicial" "Toque no botão home para acessar a tela inicial" "O %1$s já pode ser usado" - "dispositivo" + "Você já pode começar a usar o dispositivo" "Configurações de navegação do sistema" "Compartilhar" "Capturar tela" @@ -109,16 +109,11 @@ "Cancelar" "Pular" "Girar a tela" - - - - - - - - - - + "Animação mostrando como a barra de tarefas aparece na parte de baixo da tela e é ocultada automaticamente quando não está em uso" + "Animação mostrando como fixar a barra de tarefas usando um botão de ativar/desativar para que ela fique sempre visível na parte de baixo da tela" + "Animação mostrando como criar uma tela dividida arrastando e soltando um app da barra de tarefas sobre outro aberto" + "Animação mostrando como acessar os apps sugeridos no dispositivo" + "Animação mostrando como pesquisar um item na tela tocando na tecla de ação, pressionando e selecionando a área em que o item está" "Informações sobre a barra de tarefas" "Arraste um app para o lado e use dois apps ao mesmo tempo" "Deslize para cima devagar para mostrar a Barra de tarefas" diff --git a/quickstep/res/values-ro/strings.xml b/quickstep/res/values-ro/strings.xml index 9774bdd3b1..af8fbd3fc9 100644 --- a/quickstep/res/values-ro/strings.xml +++ b/quickstep/res/values-ro/strings.xml @@ -91,7 +91,7 @@ "Glisează în sus pentru a accesa ecranul principal" "Atinge butonul ecran de pornire ca să accesezi ecranul de pornire" "Ești gata să folosești %1$s" - "dispozitivul" + "Ești gata să folosești dispozitivul" "Setările de navigare ale sistemului" "Distribuie" "Captură de ecran" diff --git a/quickstep/res/values-ru/strings.xml b/quickstep/res/values-ru/strings.xml index 663dbc54be..a6a7a29b14 100644 --- a/quickstep/res/values-ru/strings.xml +++ b/quickstep/res/values-ru/strings.xml @@ -91,7 +91,7 @@ "Чтобы перейти на главный экран, проведите вверх." "Нажмите кнопку главного экрана, чтобы открыть его." "Теперь вы можете использовать %1$s." - "устройство" + "Теперь устройство можно использовать." "Настройки навигации в системе" "Поделиться" "Скриншот" diff --git a/quickstep/res/values-si/strings.xml b/quickstep/res/values-si/strings.xml index 15ad26fd39..910ef8b406 100644 --- a/quickstep/res/values-si/strings.xml +++ b/quickstep/res/values-si/strings.xml @@ -91,7 +91,7 @@ "මුල් පිටුවට යාමට ඉහළට ස්වයිප් කරන්න" "ඔබේ මුල් තිරය වෙත යාමට මුල් පිටුව බොත්තම තට්ටු කරන්න" "ඔබ ඔබේ %1$s භාවිත කිරීම පටන් ගැනීමට සූදානම්" - "උපාංගය" + "ඔබ ඔබේ උපාංගය භාවිත කිරීම පටන් ගැනීමට සූදානම්" "පද්ධති සංචාලන සැකසීම්" "බෙදා ගන්න" "තිර රුව" @@ -109,16 +109,11 @@ "අවලංගු කරන්න" "මඟ හරින්න" "තිරය කරකවන්න" - - - - - - - - - - + "තිරයේ පහළ සිට කාර්ය තීරුව දර්ශනය වන ආකාරය සහ භාවිතයේ නොමැති විට ස්වයංක්‍රීයව සැඟවෙන ආකාරය පෙන්වන සජීවීකරණය" + "තිරයේ පහළින් කාර්ය තීරුව ස්ථිරවම දෘශ්‍යමානව පවතින පරිදි, ටොගලයක් භාවිතයෙන් ඔබේ කාර්ය තීරුව ඇමිණෙන ආකාරය පෙන්වන සජීවීකරණය" + "විවෘත යෙදුමකට ඉහළින් ඇති කාර්ය තීරුවෙන් යෙදුමක් ඇදගෙන යාමෙන්, බෙදීම් තිරයක් නිර්මාණය කරන ආකාරය පෙන්වන සජීවීකරණය" + "ඔබේ උපාංගයේ යෝජිත යෙදුම් වෙත ප්‍රවේශ වන ආකාරය පෙන්වන සජීවීකරණය" + "ක්‍රියා යතුර ස්පර්ශ කරගෙන අයිතමය ඇති ප්‍රදේශය තේරීමෙන් තිරය මත අයිතමයක් සොයන ආකාරය පෙන්වන සජීවීකරණය" "කාර්ය තීරු අධ්‍යාපනය" "එකවර යෙදුම් 2ක් භාවිතා කිරීමට යෙදුමක් පැත්තට අදින්න" "කාර්ය තීරුව පෙන්වීමට ඉහළට සෙමින් ස්වයිප් කරන්න" diff --git a/quickstep/res/values-sk/strings.xml b/quickstep/res/values-sk/strings.xml index ae3fdc984d..83fd925511 100644 --- a/quickstep/res/values-sk/strings.xml +++ b/quickstep/res/values-sk/strings.xml @@ -91,7 +91,7 @@ "Potiahnutím nahor prejdete na plochu" "Na plochu prejdete klepnutím na tlačidlo plochy" "Môžete %1$s začať používať" - "zariadenie" + "Zariadenie môžete začať používať" "Nastavenia navigácie systémom" "Zdieľať" "Snímka obrazovky" @@ -162,7 +162,7 @@ "Zavrieť všetko" "rozbaliť %1$s" "zbaliť %1$s" - "Vyhľadávanie krúžením" + "Hľadanie krúžkovaním" "Ikona aplikácie" "Názov aplikácie" "Tlačidlo Zavrieť" diff --git a/quickstep/res/values-sl/strings.xml b/quickstep/res/values-sl/strings.xml index 57c65e9f5d..218a092201 100644 --- a/quickstep/res/values-sl/strings.xml +++ b/quickstep/res/values-sl/strings.xml @@ -91,7 +91,7 @@ "Povlecite navzgor za začetni zaslon" "Za pomik na začetni zaslon se dotaknite gumba za začetni zaslon." "Pripravljeni ste, da začnete uporabljati %1$s" - "napravo" + "Pripravljeni ste, da začnete uporabljati napravo" "Nastavitve krmarjenja po sistemu" "Deli" "Posnetek zaslona" diff --git a/quickstep/res/values-sq/strings.xml b/quickstep/res/values-sq/strings.xml index a5d5d71cc1..1d0c2235a8 100644 --- a/quickstep/res/values-sq/strings.xml +++ b/quickstep/res/values-sq/strings.xml @@ -91,7 +91,7 @@ "Rrëshqit shpejt lart për të shkuar në ekranin bazë" "Trokit te butoni \"kreu\" për të shkuar tek ekrani bazë" "Je gati që të fillosh ta përdorësh këtë %1$s" - "pajisje" + "Je gati që të fillosh të përdorësh pajisjen tënde" "Cilësimet e navigimit të sistemit" "Ndaj" "Pamja e ekranit" diff --git a/quickstep/res/values-sr/strings.xml b/quickstep/res/values-sr/strings.xml index a321a9283b..b6c47f67bc 100644 --- a/quickstep/res/values-sr/strings.xml +++ b/quickstep/res/values-sr/strings.xml @@ -91,7 +91,7 @@ "Превуците нагоре да бисте отворили почетни екран" "Додирните дугме Почетак да бисте отишли на почетни екран" "Спремни сте да почнете да користите %1$s" - "уређај" + "Спремни сте да почнете да користите уређај" "Подешавања кретања кроз систем" "Дели" "Снимак екрана" diff --git a/quickstep/res/values-sv/strings.xml b/quickstep/res/values-sv/strings.xml index d4950cd952..7ed6fbbc55 100644 --- a/quickstep/res/values-sv/strings.xml +++ b/quickstep/res/values-sv/strings.xml @@ -91,7 +91,7 @@ "Svep uppåt för att öppna startskärmen" "Tryck på hemknappen för att öppna startskärmen" "Nu kan du börja använda din %1$s" - "enhet" + "Nu kan du börja använda din enhet" "Systemnavigeringsinställningar" "Dela" "Skärmbild" @@ -168,7 +168,7 @@ "Knappen Stäng" "Fäst i aktivitetsfält" "Lossa från aktivitetsfält" - "Finjustera" + "Hint" "Stäng" - "Finjustera bild" + "Bild i hint" diff --git a/quickstep/res/values-sw/strings.xml b/quickstep/res/values-sw/strings.xml index b97fa680cb..8a4965c4fe 100644 --- a/quickstep/res/values-sw/strings.xml +++ b/quickstep/res/values-sw/strings.xml @@ -91,7 +91,7 @@ "Telezesha kidole juu ili uende kwenye skrini ya kwanza" "Gusa kitufe cha ukurasa wa mwanzo ili uende kwenye skrini ya kwanza" "Uko tayari kuanza kutumia %1$s" - "kifaa" + "Uko tayari kuanza kutumia kifaa chako" "Mipangilio ya usogezaji kwenye mfumo" "Shiriki" "Picha ya skrini" diff --git a/quickstep/res/values-ta/strings.xml b/quickstep/res/values-ta/strings.xml index 5cc076822b..680954a283 100644 --- a/quickstep/res/values-ta/strings.xml +++ b/quickstep/res/values-ta/strings.xml @@ -91,7 +91,7 @@ "முகப்புக்குச் செல்ல மேல்நோக்கி ஸ்வைப் செய்யுங்கள்" "முகப்புத் திரைக்குச் செல்வதற்கு முகப்பு பட்டனைத் தட்டவும்" "உங்கள் %1$s உங்களுக்காகத் தயாராக இருக்கிறது" - "சாதனம்" + "உங்கள் சாதனத்தைப் பயன்படுத்தத் தயாராகிவிட்டீர்கள்" "சிஸ்டம் வழிசெலுத்தல் அமைப்புகள்" "பகிர்" "ஸ்கிரீன்ஷாட்" diff --git a/quickstep/res/values-te/strings.xml b/quickstep/res/values-te/strings.xml index f013315a67..f6ee834b13 100644 --- a/quickstep/res/values-te/strings.xml +++ b/quickstep/res/values-te/strings.xml @@ -91,7 +91,7 @@ "వర్చువల్ హోమ్‌కు వెళ్లడానికి పైకి స్వైప్ చేయండి" "మీ మొదటి స్క్రీన్‌కు వెళ్లడానికి హోమ్ బటన్‌ను ట్యాప్ చేయండి" "మీరు ఇప్పుడు మీ %1$s‌ను ఉపయోగించడం ప్రారంభించవచ్చు" - "పరికరం" + "మీరు ఇప్పుడు మీ డివైజ్‌ను ఉపయోగించడానికి సిద్ధంగా ఉన్నారు" "సిస్టమ్ నావిగేషన్ సెట్టింగ్‌లు" "షేర్ చేయండి" "స్క్రీన్‌షాట్" diff --git a/quickstep/res/values-th/strings.xml b/quickstep/res/values-th/strings.xml index 1ddd6ffb9f..508c1b4404 100644 --- a/quickstep/res/values-th/strings.xml +++ b/quickstep/res/values-th/strings.xml @@ -91,7 +91,7 @@ "ปัดขึ้นเพื่อไปที่หน้าแรก" "แตะปุ่มหน้าแรกเพื่อไปที่หน้าจอหลัก" "คุณเริ่มใช้%1$sได้แล้ว" - "อุปกรณ์" + "คุณเริ่มใช้อุปกรณ์ได้แล้ว" "การตั้งค่าการไปยังส่วนต่างๆ ของระบบ" "แชร์" "ภาพหน้าจอ" diff --git a/quickstep/res/values-tl/strings.xml b/quickstep/res/values-tl/strings.xml index face21f180..0ee579248b 100644 --- a/quickstep/res/values-tl/strings.xml +++ b/quickstep/res/values-tl/strings.xml @@ -91,7 +91,7 @@ "Mag-swipe pataas para pumunta sa home" "I-tap ang button ng home para pumunta sa iyong home screen" "Handa mo nang simulan ang paggamit sa iyong %1$s" - "device" + "Handa ka nang simulang gamitin ang iyong device" "Mga setting ng navigation ng system" "Ibahagi" "Screenshot" diff --git a/quickstep/res/values-tr/strings.xml b/quickstep/res/values-tr/strings.xml index d30a70b34f..3141fee9c7 100644 --- a/quickstep/res/values-tr/strings.xml +++ b/quickstep/res/values-tr/strings.xml @@ -91,7 +91,7 @@ "Ana ekrana gitmek için yukarı kaydırın" "Ana ekranınıza gitmek için ana sayfa düğmesine dokunun" "Artık %1$s kullanılmak için hazır" - "cihaz" + "Cihazınız kullanılmaya hazır" "Sistem gezinme ayarları" "Paylaş" "Ekran görüntüsü" @@ -109,16 +109,11 @@ "İptal" "Atla" "Ekranı döndür" - - - - - - - - - - + "Görev çubuğunun ekranın altından nasıl göründüğünü ve kullanılmadığında otomatik olarak nasıl gizlendiğini gösteren animasyon" + "Görev çubuğunun, ekranın alt kısmında sürekli görünür olması için açma/kapatma düğmesini kullanarak görev çubuğunuzu nasıl sabitleyeceğinizi gösteren animasyon" + "Görev çubuğundaki bir uygulamayı, açık bir uygulamanın üzerine sürükleyip bırakarak nasıl bölünmüş ekran oluşturacağınızı gösteren animasyon" + "Cihazınızda önerilen uygulamalara nasıl erişeceğinizi gösteren animasyon" + "Eylem tuşuna dokunup basılı tutarak ve öğenin bulunduğu alanı seçerek ekranda nasıl öğe aranacağını gösteren animasyon" "Görev çubuğu eğitimi" "Aynı anda iki uygulama kullanmak için birini yana sürükleyin" "Görev çubuğunun görünmesi için yukarı doğru yavaşça kaydırın" diff --git a/quickstep/res/values-uk/strings.xml b/quickstep/res/values-uk/strings.xml index 57a00ae3db..a4674926fc 100644 --- a/quickstep/res/values-uk/strings.xml +++ b/quickstep/res/values-uk/strings.xml @@ -91,7 +91,7 @@ "Щоб перейти на головний екран, проведіть пальцем угору" "Натисніть кнопку головного екрана, щоб відкрити його" "Тепер ви можете використовувати %1$s" - "пристрій" + "Тепер ви можете користуватися пристроєм" "Налаштування навігації в системі" "Поділитися" "Знімок екрана" @@ -109,16 +109,11 @@ "Скасувати" "Пропустити" "Обернути екран" - - - - - - - - - - + "Анімація, що показує, як панель завдань з’являється внизу екрана й автоматично приховується, якщо ви її не використовуєте" + "Анімація, що показує, як за допомогою перемикача закріпити панель завдань, щоб вона завжди відображалася внизу екрана" + "Анімація, що показує, як розділити екран, перетягнувши додаток із панелі завдань на відкритий додаток" + "Анімація, що показує, як отримати доступ до рекомендованих додатків на пристрої" + "Анімація, що показує, як шукати об’єкт на екрані, натиснувши й утримуючи клавішу дії, а потім вибравши область, де він розташований" "Панель завдань Education" "Перетягніть убік, щоб використовувати 2 додатки одночасно" "Щоб відкрити панель завдань, повільно проведіть угору" diff --git a/quickstep/res/values-ur/strings.xml b/quickstep/res/values-ur/strings.xml index 345ca9974a..3324969eaf 100644 --- a/quickstep/res/values-ur/strings.xml +++ b/quickstep/res/values-ur/strings.xml @@ -91,7 +91,7 @@ "ہوم پر جانے کے لیے اوپر سوائپ کریں" "اپنی ہوم اسکرین پر جانے کے لیے ہوم بٹن پر تھپتھپائیں" "آپ اپنے %1$s کا استعمال شروع کرنے کے لیے تیار ہیں" - "آلہ" + "آپ اپنے آلے کا استعمال شروع کرنے کے لیے تیار ہیں" "سسٹم نیویگیشن کی ترتیبات" "اشتراک کریں" "اسکرین شاٹ" diff --git a/quickstep/res/values-uz/strings.xml b/quickstep/res/values-uz/strings.xml index 08fc9a2d36..2733e8111f 100644 --- a/quickstep/res/values-uz/strings.xml +++ b/quickstep/res/values-uz/strings.xml @@ -91,7 +91,7 @@ "Boshiga qaytish uchun tepaga suring" "Bosh ekranga oʻtish uchun bosh ekran tugmasini bosing" "Sizning %1$s xizmatga tayyor" - "qurilma" + "Qurilmangiz xizmatga tayyor" "Tizim navigatsiya sozlamalari" "Ulashish" "Skrinshot" diff --git a/quickstep/res/values-vi/strings.xml b/quickstep/res/values-vi/strings.xml index 95aa78b98e..86e2848d54 100644 --- a/quickstep/res/values-vi/strings.xml +++ b/quickstep/res/values-vi/strings.xml @@ -91,7 +91,7 @@ "Vuốt lên để chuyển đến màn hình chính" "Nhấn vào nút màn hình chính để chuyển đến màn hình chính" "Bạn có thể bắt đầu sử dụng %1$s" - "thiết bị" + "Bạn có thể bắt đầu sử dụng thiết bị của mình" "Cài đặt cách thao tác trên hệ thống" "Chia sẻ" "Chụp ảnh màn hình" diff --git a/quickstep/res/values-zh-rCN/strings.xml b/quickstep/res/values-zh-rCN/strings.xml index 32bd2a53d6..7cdb1b41dc 100644 --- a/quickstep/res/values-zh-rCN/strings.xml +++ b/quickstep/res/values-zh-rCN/strings.xml @@ -91,7 +91,7 @@ "向上滑动可前往主屏幕" "点按主屏幕按钮即可前往主屏幕" "您可以开始使用%1$s了" - "设备" + "您可以开始使用自己的设备了" "系统导航设置" "分享" "屏幕截图" diff --git a/quickstep/res/values-zh-rHK/strings.xml b/quickstep/res/values-zh-rHK/strings.xml index 8907b407f6..2a340e76c4 100644 --- a/quickstep/res/values-zh-rHK/strings.xml +++ b/quickstep/res/values-zh-rHK/strings.xml @@ -91,7 +91,7 @@ "向上滑動即可前往主畫面" "輕按主按鈕即可前往主畫面" "你可以開始使用%1$s了" - "裝置" + "你現在可以開始使用裝置" "系統導覽設定" "分享" "螢幕截圖" diff --git a/quickstep/res/values-zh-rTW/strings.xml b/quickstep/res/values-zh-rTW/strings.xml index d65432cb78..7dcad2cfeb 100644 --- a/quickstep/res/values-zh-rTW/strings.xml +++ b/quickstep/res/values-zh-rTW/strings.xml @@ -91,7 +91,7 @@ "向上滑動即可前往主畫面" "輕觸主畫面按鈕即可前往主畫面" "你可以開始使用「%1$s」了" - "裝置" + "你可以開始使用裝置了" "系統操作機制設定" "分享" "螢幕截圖" diff --git a/quickstep/res/values-zu/strings.xml b/quickstep/res/values-zu/strings.xml index 4964b5f000..6566f24733 100644 --- a/quickstep/res/values-zu/strings.xml +++ b/quickstep/res/values-zu/strings.xml @@ -91,7 +91,7 @@ "Swayiphela phezulu ukuze uye ekhaya" "Thepha inkinobho yasekhaya ukuze uye kusikrini sasekhaya" "Usulungele ukuqala ukusebenzisa i-%1$s yakho" - "idivayisi" + "Usulungele ukuqala ukusebenzisa idivayisi yakho" "Amasethingi wokuzulazula isistimu" "Yabelana" "Isithombe-skrini" @@ -109,16 +109,11 @@ "Khansela" "Yeqa" "Zungezisa isikrini" - - - - - - - - - - + "Upopayi obonisa ukuthi i-taskbar ivela kanjani phansi esikrinini, iphinde izifihle ngokuzenzakalelayo lapho ingasetshenziswa" + "Upopayi obonisa indlela yokuphina i-taskbar yakho usebenzisa ukuguqula, ukuze i-taskbar ihlale ibonakala unomphela phansi esikrinini." + "Upopayi obonisa ukuthi ungasakha kanjani isikrini esihlukanisayo, ngokuhudula nokudedela i-app ku-taskbar phezu kwe-app evuliwe." + "Upopayi obonisa indlela yokufinyelela ama-app aphakanyisiwe kudivayisi yakho" + "Upopayi obonisa indlela yokusesha into esikrinini, ngokuthinta uphinde ubambe inkinobho yokufinyelela nokukhetha indawo into ekuyo." "Imfundo ye-taskbar" "Hudula i-app ukusebenzisa ama-app ama-2 ngesikhathi esisodwa" "Swayiphela phezulu kancane ukuze ubonise i-Taskbar" From fafa179973737aa46814aaa2da7e96bb701b9058 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 15 Apr 2025 04:18:39 +0000 Subject: [PATCH 18/24] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I29552657cb57a7ebc7aa7e1331779d40d3ae5ef2 --- res/values-af/strings.xml | 4 ++++ res/values-am/strings.xml | 4 ++++ res/values-ar/strings.xml | 4 ++++ res/values-as/strings.xml | 4 ++++ res/values-az/strings.xml | 4 ++++ res/values-b+sr+Latn/strings.xml | 4 ++++ res/values-be/strings.xml | 4 ++++ res/values-bg/strings.xml | 4 ++++ res/values-bn/strings.xml | 4 ++++ res/values-bs/strings.xml | 4 ++++ res/values-ca/strings.xml | 4 ++++ res/values-cs/strings.xml | 4 ++++ res/values-da/strings.xml | 4 ++++ res/values-de/strings.xml | 4 ++++ res/values-el/strings.xml | 4 ++++ res/values-en-rAU/strings.xml | 4 ++++ res/values-en-rCA/strings.xml | 4 ++++ res/values-en-rGB/strings.xml | 4 ++++ res/values-en-rIN/strings.xml | 4 ++++ res/values-es-rUS/strings.xml | 4 ++++ res/values-es/strings.xml | 4 ++++ res/values-et/strings.xml | 4 ++++ res/values-eu/strings.xml | 4 ++++ res/values-fa/strings.xml | 4 ++++ res/values-fi/strings.xml | 4 ++++ res/values-fr-rCA/strings.xml | 4 ++++ res/values-fr/strings.xml | 6 +++++- res/values-gl/strings.xml | 4 ++++ res/values-gu/strings.xml | 4 ++++ res/values-hi/strings.xml | 4 ++++ res/values-hr/strings.xml | 4 ++++ res/values-hu/strings.xml | 4 ++++ res/values-hy/strings.xml | 4 ++++ res/values-in/strings.xml | 4 ++++ res/values-is/strings.xml | 4 ++++ res/values-it/strings.xml | 4 ++++ res/values-iw/strings.xml | 4 ++++ res/values-ja/strings.xml | 4 ++++ res/values-ka/strings.xml | 4 ++++ res/values-kk/strings.xml | 4 ++++ res/values-km/strings.xml | 4 ++++ res/values-kn/strings.xml | 4 ++++ res/values-ko/strings.xml | 4 ++++ res/values-ky/strings.xml | 4 ++++ res/values-lo/strings.xml | 4 ++++ res/values-lt/strings.xml | 4 ++++ res/values-lv/strings.xml | 4 ++++ res/values-mk/strings.xml | 4 ++++ res/values-ml/strings.xml | 4 ++++ res/values-mn/strings.xml | 4 ++++ res/values-mr/strings.xml | 4 ++++ res/values-ms/strings.xml | 4 ++++ res/values-my/strings.xml | 4 ++++ res/values-nb/strings.xml | 4 ++++ res/values-ne/strings.xml | 4 ++++ res/values-nl/strings.xml | 4 ++++ res/values-or/strings.xml | 4 ++++ res/values-pa/strings.xml | 4 ++++ res/values-pl/strings.xml | 4 ++++ res/values-pt-rPT/strings.xml | 4 ++++ res/values-pt/strings.xml | 4 ++++ res/values-ro/strings.xml | 4 ++++ res/values-ru/strings.xml | 4 ++++ res/values-si/strings.xml | 4 ++++ res/values-sk/strings.xml | 4 ++++ res/values-sl/strings.xml | 4 ++++ res/values-sq/strings.xml | 4 ++++ res/values-sr/strings.xml | 4 ++++ res/values-sv/strings.xml | 4 ++++ res/values-sw/strings.xml | 4 ++++ res/values-ta/strings.xml | 4 ++++ res/values-te/strings.xml | 4 ++++ res/values-th/strings.xml | 4 ++++ res/values-tl/strings.xml | 4 ++++ res/values-tr/strings.xml | 4 ++++ res/values-uk/strings.xml | 4 ++++ res/values-ur/strings.xml | 4 ++++ res/values-uz/strings.xml | 4 ++++ res/values-vi/strings.xml | 4 ++++ res/values-zh-rCN/strings.xml | 4 ++++ res/values-zh-rHK/strings.xml | 4 ++++ res/values-zh-rTW/strings.xml | 4 ++++ res/values-zu/strings.xml | 4 ++++ 83 files changed, 333 insertions(+), 1 deletion(-) diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 9d262c9c07..bd46b18504 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -113,6 +113,10 @@ "Tik om opstelling te voltooi" "Dit is \'n stelselprogram en kan nie gedeïnstalleer word nie." "Wysig naam" + + + + "Het %1$s gedeaktiveer" "{count,plural, =1{{app_name} het # kennisgewing}other{{app_name} het # kennisgewings}}" "Bladsy %1$d van %2$d" diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index 79da78a90f..4248c7a99c 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -113,6 +113,10 @@ "ማዋቀርን ለመጨረስ መታ ያድርጉ" "ይህ የስርዓት መተግበሪያ ነው እና ማራገፍ አይቻልም።" "ስም ያርትዑ" + + + + "%1$s ተሰናክሏል" "{count,plural, =1{{app_name}፣ # ማሳወቂያ አለው}one{{app_name}፣ # ማሳወቂያዎች አሉት}other{{app_name}፣ # ማሳወቂያዎች አሉት}}" "ገፅ %1$d ከ%2$d" diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 2c9259aca6..7abf09c347 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -113,6 +113,10 @@ "انقر لإكمال الإعداد." "هذا تطبيق نظام وتتعذر إزالته." "تعديل الاسم" + + + + "تم إيقاف %1$s" "{count,plural, =1{هناك إشعار واحد في التطبيق {app_name}.}zero{هناك # إشعار في التطبيق {app_name}.}two{هناك إشعارَان في التطبيق {app_name}.}few{هناك # إشعارات في التطبيق {app_name}.}many{هناك # إشعارًا في التطبيق {app_name}.}other{هناك # إشعار في التطبيق {app_name}.}}" "‏الصفحة %1$d من %2$d" diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml index 28913bc60d..b698da1f92 100644 --- a/res/values-as/strings.xml +++ b/res/values-as/strings.xml @@ -113,6 +113,10 @@ "ছেটআপ সমাপ্ত কৰিবলৈ টিপক" "এইটো এটা ছিষ্টেম এপ আৰু ইয়াক আনইনষ্টল কৰিব নোৱৰি" "নাম সম্পাদনা কৰক" + + + + "%1$s অক্ষম কৰা হ’ল" "{count,plural, =1{{app_name}ৰ # টা জাননী আছে}one{{app_name}ৰ # টা জাননী আছে}other{{app_name}ৰ # টা জাননী আছে}}" "%2$dৰ %1$d পৃষ্ঠা" diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml index 13f3571623..894298e8b7 100644 --- a/res/values-az/strings.xml +++ b/res/values-az/strings.xml @@ -113,6 +113,10 @@ "Ayarlamanı tamamlamaq üçün toxunun" "Bu sistem tətbiqi olduğu üçün sistemdən silinə bilməz." "Adı redaktə edin" + + + + "%1$s deaktiv edildi" "{count,plural, =1{{app_name} tətbiqində # bildiriş var}other{{app_name} tətbiqində # bildiriş var}}" "Səhifə %1$d of %2$d" diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml index bc03b85e5c..24852a1c4a 100644 --- a/res/values-b+sr+Latn/strings.xml +++ b/res/values-b+sr+Latn/strings.xml @@ -113,6 +113,10 @@ "Dodirnite da biste dovršili podešavanje" "Ovo je sistemska aplikacija i ne može da se deinstalira." "Izmenite naziv" + + + + "Aplikacija %1$s je onemogućena" "{count,plural, =1{{app_name}, ima # obaveštenje}one{{app_name}, ima # obaveštenje}few{{app_name}, ima # obaveštenja}other{{app_name}, ima # obaveštenja}}" "%1$d. stranica od %2$d" diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml index b85a1a8dc3..89bd3424a8 100644 --- a/res/values-be/strings.xml +++ b/res/values-be/strings.xml @@ -113,6 +113,10 @@ "Націсніце, каб завяршыць наладжванне" "Гэта сістэмная праграма, яе нельга выдаліць." "Змяніць назву" + + + + "%1$s адключана" "{count,plural, =1{У праграмы \"{app_name}\" ёсць # апавяшчэнне}one{У праграмы \"{app_name}\" ёсць # апавяшчэнне}few{У праграмы \"{app_name}\" ёсць # апавяшчэнні}many{У праграмы \"{app_name}\" ёсць # апавяшчэнняў}other{У праграмы \"{app_name}\" ёсць # апавяшчэння}}" "Старонка %1$d з %2$d" diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index c80d9275c6..ceca22828d 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -113,6 +113,10 @@ "Докоснете, за да завършите настройването" "Това е системно приложение и не може да се деинсталира." "Редактиране на името" + + + + "Деактивирахте %1$s" "{count,plural, =1{{app_name} има # известие}other{{app_name} има # известия}}" "Страница %1$d от %2$d" diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml index c96defc0d0..3a239d7e6b 100644 --- a/res/values-bn/strings.xml +++ b/res/values-bn/strings.xml @@ -113,6 +113,10 @@ "সেটআপ সম্পূর্ণ করতে ট্যাপ করুন" "এটি একটি সিস্টেম অ্যাপ্লিকেশান এবং আনইনস্টল করা যাবে না৷" "নাম এডিট করুন" + + + + "%1$s অক্ষম করা হয়েছে" "{count,plural, =1{{app_name}-এর #টি বিজ্ঞপ্তি আছে}one{{app_name}-এর #টি বিজ্ঞপ্তি আছে}other{{app_name}-এর #টি বিজ্ঞপ্তি আছে}}" "%2$dটির মধ্যে %1$dটি পৃষ্ঠা" diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml index 2d363950e2..233702873d 100644 --- a/res/values-bs/strings.xml +++ b/res/values-bs/strings.xml @@ -113,6 +113,10 @@ "Dodirnite da završite postavljanje" "Ovo je sistemska aplikacija i ne može se deinstalirati." "Uređivanje naziva" + + + + "Aplikacija %1$s je onemogućena" "{count,plural, =1{Aplikacija {app_name} ima # obavještenje}one{Aplikacija {app_name} ima # obavještenje}few{Aplikacija {app_name} ima # obavještenja}other{Aplikacija {app_name} ima # obavještenja}}" "Strana %1$d od %2$d" diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 114407076e..a808bff86c 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -113,6 +113,10 @@ "Toca per finalitzar la configuració" "Aquesta aplicació és una aplicació del sistema i no es pot desinstal·lar." "Edita el nom" + + + + "S\'ha desactivat %1$s" "{count,plural, =1{{app_name} té # notificació}other{{app_name} té # notificacions}}" "Pàgina %1$d de %2$d" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 75aa75ba2d..ca5b9c470b 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -113,6 +113,10 @@ "Klepnutím dokončíte konfiguraci" "Toto je systémová aplikace a nelze ji odinstalovat." "Upravit název" + + + + "Aplikace %1$s je zakázána" "{count,plural, =1{Aplikace {app_name} má # oznámení}few{Aplikace {app_name} má # oznámení}many{Aplikace {app_name} má # oznámení}other{Aplikace {app_name} má # oznámení}}" "Strana %1$d z %2$d" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 517c395d19..d29ef5415d 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -113,6 +113,10 @@ "Tryk for at fuldføre konfigurationen" "Dette er en systemapp, som ikke kan afinstalleres." "Rediger navn" + + + + "%1$s er deaktiveret" "{count,plural, =1{{app_name} har # notifikation}one{{app_name} har # notifikation}other{{app_name} har # notifikationer}}" "Side %1$d ud af %2$d" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 933ca3fe7b..a408c78d53 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -113,6 +113,10 @@ "Tippen, um Einrichtung abzuschließen" "Dies ist eine Systemanwendung, die nicht deinstalliert werden kann." "Name bearbeiten" + + + + "%1$s deaktiviert" "{count,plural, =1{{app_name} hat # Benachrichtigung}other{{app_name} hat # Benachrichtigungen}}" "Seite %1$d von %2$d" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index d45b8dda77..7d48afa7fb 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -113,6 +113,10 @@ "Πατήστε για να ολοκληρώσετε τη ρύθμιση" "Αυτή είναι μια εφαρμογή συστήματος και δεν είναι δυνατή η κατάργηση της εγκατάστασής της." "Επεξεργασία ονόματος" + + + + "Η εφαρμογή %1$s είναι απενεργοποιημένη" "{count,plural, =1{Η εφαρμογή {app_name} έχει # ειδοποίηση}other{Η εφαρμογή {app_name} έχει # ειδοποιήσεις}}" "Σελίδα %1$d από %2$d" diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index 0bf43465b0..a1320f07c9 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -113,6 +113,10 @@ "Tap to finish setup" "This is a system app and can\'t be uninstalled." "Edit Name" + + + + "Disabled %1$s" "{count,plural, =1{{app_name} has # notification}other{{app_name} has # notifications}}" "Page %1$d of %2$d" diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml index a3d3409d40..8e6cf246f4 100644 --- a/res/values-en-rCA/strings.xml +++ b/res/values-en-rCA/strings.xml @@ -113,6 +113,10 @@ "Tap to finish setup" "This is a system app and can\'t be uninstalled." "Edit Name" + + + + "Disabled %1$s" "{count,plural, =1{{app_name} has # notification}other{{app_name} has # notifications}}" "Page %1$d of %2$d" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 0bf43465b0..a1320f07c9 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -113,6 +113,10 @@ "Tap to finish setup" "This is a system app and can\'t be uninstalled." "Edit Name" + + + + "Disabled %1$s" "{count,plural, =1{{app_name} has # notification}other{{app_name} has # notifications}}" "Page %1$d of %2$d" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index 0bf43465b0..a1320f07c9 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -113,6 +113,10 @@ "Tap to finish setup" "This is a system app and can\'t be uninstalled." "Edit Name" + + + + "Disabled %1$s" "{count,plural, =1{{app_name} has # notification}other{{app_name} has # notifications}}" "Page %1$d of %2$d" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index a0f77165fa..697bb7f593 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -113,6 +113,10 @@ "Presiona para finalizar la configuración" "Esta es una aplicación del sistema y no se puede desinstalar." "Editar nombre" + + + + "Se inhabilitó %1$s" "{count,plural, =1{{app_name} tiene # notificación}other{{app_name} tiene # notificaciones}}" "Página %1$d de %2$d" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index eef48f6e60..8fb26cac21 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -113,6 +113,10 @@ "Toca para finalizar la configuración" "Esta aplicación es del sistema y no se puede desinstalar." "Editar nombre" + + + + "Se ha inhabilitado %1$s" "{count,plural, =1{{app_name} tiene # notificación}other{{app_name} tiene # notificaciones}}" "Página %1$d de %2$d" diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index 856d4d42e0..5bba2dfc10 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -113,6 +113,10 @@ "Puudutage seadistuse lõpuleviimiseks" "See on süsteemirakendus ja seda ei saa desinstallida." "Muuda nime" + + + + "Rakendus %1$s on keelatud" "{count,plural, =1{Rakenduses {app_name} on # märguanne}other{Rakenduses {app_name} on # märguannet}}" "Leht %1$d/%2$d" diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index 93a94dcd7b..d3d3a3c8d6 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -113,6 +113,10 @@ "Sakatu konfiguratzen amaitzeko" "Sistema-aplikazioa da hau eta ezin da desinstalatu." "Editatu izena" + + + + "%1$s desgaituta dago" "{count,plural, =1{{app_name} aplikazioak # jakinarazpen dauka}other{{app_name} aplikazioak # jakinarazpen dauzka}}" "%1$d/%2$d orria" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 848acadbdf..1de5c862c7 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -113,6 +113,10 @@ "برای تمام کردن راه‌اندازی تک‌ضرب بزنید" "این برنامه سیستمی است و حذف نصب نمی‌شود." "ویرایش نام" + + + + "%1$s غیرفعال شد" "{count,plural, =1{{app_name} ‏# اعلان دارد}one{{app_name} ‏# اعلان دارد}other{{app_name} ‏# اعلان دارد}}" "‏صفحه %1$d از %2$d" diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index b52d3a30d5..3fbea35ada 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -113,6 +113,10 @@ "Viimeistele asennus napauttamalla" "Tämä on järjestelmäsovellus, eikä sitä voi poistaa." "Muokkaa nimeä" + + + + "%1$s poistettiin käytöstä" "{count,plural, =1{{app_name}: # ilmoitus}other{{app_name}: # ilmoitusta}}" "Sivu %1$d / %2$d" diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index f768b419be..9cd58e94e0 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -113,6 +113,10 @@ "Touchez pour terminer la configuration" "Impossible de désinstaller cette appli, car il s\'agit d\'une appli système." "Modifier le nom" + + + + "L\'appli %1$s est désactivée" "{count,plural, =1{{app_name} a # notification}one{{app_name} a # notification}other{{app_name} a # notifications}}" "Page %1$d sur %2$d" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index ecf49be5ed..354a278e26 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -113,6 +113,10 @@ "Appuyez pour terminer la configuration" "Impossible de désinstaller cette application, car il s\'agit d\'une application système." "Modifier le nom" + + + + "%1$s est désactivé." "{count,plural, =1{{app_name} a # notification}one{{app_name} a # notification}other{{app_name} a # notifications}}" "Page %1$d sur %2$d" @@ -138,7 +142,7 @@ "Mode Paysage" "Paramétrer le téléphone en mode Paysage" "Pastilles de notification" - "Activées" + "Activé" "Désactivées" "Accès aux notifications requis" "Pour afficher les pastilles de notification, activez les notifications de l\'application %1$s" diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index 1afc92f625..81c87c2079 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -113,6 +113,10 @@ "Toca para rematar a configuración" "Esta aplicación é do sistema e non se pode desinstalar." "Edita o nome" + + + + "Desactivouse %1$s" "{count,plural, =1{{app_name} ten # notificación}other{{app_name} ten # notificacións}}" "Páxina %1$d de %2$d" diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml index fc49f83cbe..1150906a93 100644 --- a/res/values-gu/strings.xml +++ b/res/values-gu/strings.xml @@ -113,6 +113,10 @@ "સેટઅપ પૂર્ણ કરવા માટે ટૅપ કરો" "આ એક સિસ્ટમ ઍપ્લિકેશન છે અને અનઇન્સ્ટોલ કરી શકાતી નથી." "નામમાં ફેરફાર કરો" + + + + "%1$s અક્ષમ કરી" "{count,plural, =1{{app_name}ના # નોટિફિકેશન છે}one{{app_name}ના # નોટિફિકેશન છે}other{{app_name}ના # નોટિફિકેશન છે}}" "%2$dમાંથી %1$d પેજ" diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 393219cdbd..a824752d78 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -113,6 +113,10 @@ "सेट अप पूरा करने के लिए टैप करें" "यह एक सिस्टम ऐप्लिकेशन है और इसे अनइंस्टॉल नहीं किया जा सकता." "नाम में बदलाव करें" + + + + "%1$s अक्षम है" "{count,plural, =1{{app_name} से जुड़ी # सूचना है}one{{app_name} से जुड़ी # सूचना है}other{{app_name} से जुड़ी # सूचनाएं हैं}}" "पेज %2$d में से %1$d" diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index f7e7b08d73..73c82c91aa 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -113,6 +113,10 @@ "Dodirnite da biste dovršili postavljanje" "Ovo je aplikacija sustava i ne može se ukloniti." "Uređivanje naziva" + + + + "Aplikacija %1$s onemogućena" "{count,plural, =1{Aplikacija {app_name} ima # obavijest}one{Aplikacija {app_name} ima # obavijest}few{Aplikacija {app_name} ima # obavijesti}other{Aplikacija {app_name} ima # obavijesti}}" "Stranica %1$d od %2$d" diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 573d03e29a..1f64974fe0 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -113,6 +113,10 @@ "Koppintson a beállítás befejezéséhez" "Ez egy rendszeralkalmazás, és nem lehet eltávolítani." "Név módosítása" + + + + "A(z) %1$s letiltva" "{count,plural, =1{A(z) {app_name} alkalmazásnak # értesítése van}other{A(z) {app_name} alkalmazásnak # értesítése van}}" "%2$d/%1$d. oldal" diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml index 4299f9139c..c3ba290c4b 100644 --- a/res/values-hy/strings.xml +++ b/res/values-hy/strings.xml @@ -113,6 +113,10 @@ "Հպեք՝ կարգավորումն ավարտելու համար" "Սա համակարգային ծրագիր է և չի կարող ապատեղադրվել:" "Փոխել անունը" + + + + "%1$s հավելվածն անջատված է" "{count,plural, =1{«{app_name}» հավելվածն ունի # ծանուցում}one{«{app_name}» հավելվածն ունի # ծանուցում}other{«{app_name}» հավելվածն ունի # ծանուցում}}" "Էջ %1$d՝ %2$d-ից" diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 50c9279537..3f80f32afd 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -113,6 +113,10 @@ "Ketuk untuk menyelesaikan penyiapan" "Ini adalah aplikasi sistem dan tidak dapat di-uninstal." "Edit Nama" + + + + "%1$s dinonaktifkan" "{count,plural, =1{{app_name} memiliki # notifikasi}other{{app_name} memiliki # notifikasi}}" "Halaman %1$d dari %2$d" diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml index 7acbfcb8bf..af1599df30 100644 --- a/res/values-is/strings.xml +++ b/res/values-is/strings.xml @@ -113,6 +113,10 @@ "Ýttu til að ljúka við uppsetningu" "Þetta er kerfisforrit sem ekki er hægt að fjarlægja." "Breyta nafni" + + + + "Óvirkt %1$s" "{count,plural, =1{{app_name} er með # tilkynningu}one{{app_name} er með # tilkynningu}other{{app_name} er með # tilkynningar}}" "Síða %1$d af %2$d" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 11ea5d997c..28d3da981b 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -113,6 +113,10 @@ "Tocca per completare la configurazione" "Questa è un\'app di sistema e non può essere disinstallata." "Modifica nome" + + + + "App %1$s disattivata" "{count,plural, =1{{app_name} ha # notifica}other{{app_name} ha # notifiche}}" "Pagina %1$d di %2$d" diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index a573f70482..c236ce8a9f 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -113,6 +113,10 @@ "צריך ללחוץ כדי לסיים את תהליך ההגדרה" "זוהי אפליקציית מערכת ולא ניתן להסיר את התקנתה." "עריכת השם" + + + + "%1$s מושבתת" "{count,plural, =1{לאפליקציה {app_name} יש התראה אחת}one{לאפליקציה {app_name} יש # התראות}two{לאפליקציה {app_name} יש # התראות}other{לאפליקציה {app_name} יש # התראות}}" "‏דף %1$d מתוך %2$d" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 3eec609f11..35e3eaf424 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -113,6 +113,10 @@ "タップして設定を完了してください" "このシステムアプリはアンインストールできません。" "名前の編集" + + + + "「%1$s」は無効です" "{count,plural, =1{{app_name} の通知が # 件あります}other{{app_name} の通知が # 件あります}}" "%1$d/%2$dページ" diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml index 96adee66ba..094c264262 100644 --- a/res/values-ka/strings.xml +++ b/res/values-ka/strings.xml @@ -113,6 +113,10 @@ "შეეხეთ დაყენების დასასრულებლად" "ეს სისტემური აპია და მისი წაშლა შეუძლებელია." "სახელის რედაქტირება" + + + + "%1$s გაითიშა" "{count,plural, =1{{app_name}-ში # შეტყობინებაა}other{{app_name}-ში # შეტყობინებაა}}" "გვერდი %1$d %2$d-დან" diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml index 9572592142..722499191f 100644 --- a/res/values-kk/strings.xml +++ b/res/values-kk/strings.xml @@ -113,6 +113,10 @@ "Реттеуді аяқтау үшін түртіңіз." "Бұл жүйе қолданбасы, сондықтан оны алу мүмкін емес." "Атын өңдеу" + + + + "%1$s өшірілді" "{count,plural, =1{{app_name} қолданбасында # хабарландыру бар}other{{app_name} қолданбасында # хабарландыру бар}}" "%1$d бет, барлығы %2$d" diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml index f55193a2fb..b038582b60 100644 --- a/res/values-km/strings.xml +++ b/res/values-km/strings.xml @@ -113,6 +113,10 @@ "ចុច​ដើម្បី​បញ្ចប់​ការរៀបចំ" "នេះ​​​ជា​កម្មវិធី​ប្រព័ន្ធ មិន​អាច​លុប​បាន​ទេ។" "កែ​ឈ្មោះ" + + + + "បានបិទដំណើរការ %1$s" "{count,plural, =1{{app_name} មានការជូនដំណឹង #}other{{app_name} មានការជូនដំណឹង #}}" "ទំព័រ %1$d នៃ %2$d" diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml index bc3ca73c0c..ab404442a3 100644 --- a/res/values-kn/strings.xml +++ b/res/values-kn/strings.xml @@ -113,6 +113,10 @@ "ಸೆಟಪ್ ಪೂರ್ಣಗೊಳಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ" "ಇದೊಂದು ಆ್ಯಪ್‌ ಆಗಿದೆ ಮತ್ತು ಅಸ್ಥಾಪಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ." "ಹೆಸರನ್ನು ಎಡಿಟ್ ಮಾಡಿ" + + + + "%1$s ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ" "{count,plural, =1{{app_name} ಆ್ಯಪ್ # ಅಧಿಸೂಚನೆಯನ್ನು ಹೊಂದಿದೆ}one{{app_name} ಆ್ಯಪ್ # ಅಧಿಸೂಚನೆಗಳನ್ನು ಹೊಂದಿದೆ}other{{app_name} ಆ್ಯಪ್ # ಅಧಿಸೂಚನೆಗಳನ್ನು ಹೊಂದಿದೆ}}" "%2$d ರಲ್ಲಿ %1$d ಪುಟ" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index f4aa7319c2..16fd9bcb75 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -113,6 +113,10 @@ "탭하여 설정을 완료하세요." "시스템 앱은 제거할 수 없습니다." "이름 수정" + + + + "%1$s 사용 안함" "{count,plural, =1{{app_name} 알림 #개}other{{app_name} 알림 #개}}" "페이지 %1$d/%2$d" diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml index 8e2be9556b..e71338c3ff 100644 --- a/res/values-ky/strings.xml +++ b/res/values-ky/strings.xml @@ -113,6 +113,10 @@ "Аягына чейин тууралоо үчүн басып коюңуз" "Бул системдик колдонмо жана аны чечкенге болбойт." "Аталышын түзөтүү" + + + + "%1$s өчүрүлгөн" "{count,plural, =1{{app_name}, # билдирмеси бар}other{{app_name}, # билдирмеси бар}}" "%2$d ичинен %1$d барак" diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml index fa49adac60..cfaad7cae9 100644 --- a/res/values-lo/strings.xml +++ b/res/values-lo/strings.xml @@ -113,6 +113,10 @@ "ແຕະເພື່ອຕັ້ງຄ່າໃຫ້ແລ້ວ" "ນີ້ແມ່ນແອັບຯຂອງລະບົບ ແລະບໍ່ສາມາດຖອນການຕິດຕັ້ງອອກໄດ້." "ແກ້ໄຂຊື່" + + + + "ປິດການນຳໃຊ້ %1$s ແລ້ວ" "{count,plural, =1{{app_name} ມີ # ການແຈ້ງເຕືອນ}other{{app_name} ມີ # ການແຈ້ງເຕືອນ}}" "ໜ້າ %1$d ຈາກ %2$d" diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 91149b1a5c..a21bf937ac 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -113,6 +113,10 @@ "Palieskite, kad užbaigtumėte sąranką" "Tai sistemos programa ir jos negalima pašalinti." "Pavadinimo redagavimas" + + + + "„%1$s“ išjungta" "{count,plural, =1{Programoje „{app_name}“ yra # pranešimas}one{Programoje „{app_name}“ yra # pranešimas}few{Programoje „{app_name}“ yra # pranešimai}many{Programoje „{app_name}“ yra # pranešimo}other{Programoje „{app_name}“ yra # pranešimų}}" "%1$d psl. iš %2$d" diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 35efc71189..3d94e2f9af 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -113,6 +113,10 @@ "Pieskarieties, lai pabeigtu iestatīšanu" "Šī ir sistēmas lietotne, un to nevar atinstalēt." "Nosaukuma rediģēšana" + + + + "Lietotne %1$s ir atspējota" "{count,plural, =1{Lietotnē {app_name} ir # paziņojums}zero{Lietotnē {app_name} ir # paziņojumi}one{Lietotnē {app_name} ir # paziņojums}other{Lietotnē {app_name} ir # paziņojumi}}" "%1$d. lapa no %2$d" diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml index 8dacfa3741..742010c654 100644 --- a/res/values-mk/strings.xml +++ b/res/values-mk/strings.xml @@ -113,6 +113,10 @@ "Допрете за да го завршите поставувањето" "Ова е системска апликација и не може да се деинсталира." "Изменете го името" + + + + "%1$s е оневозможена" "{count,plural, =1{{app_name} има # известување}one{{app_name} има # известување}other{{app_name} има # известувања}}" "Страница %1$d од %2$d" diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml index e7266333d9..e22f11c657 100644 --- a/res/values-ml/strings.xml +++ b/res/values-ml/strings.xml @@ -113,6 +113,10 @@ "സജ്ജീകരണം പൂർത്തിയാക്കാൻ ടാപ്പ് ചെയ്യുക" "ഇതൊരു സിസ്‌റ്റം അപ്ലിക്കേഷനായതിനാൽ അൺഇൻസ്‌റ്റാളുചെയ്യാനാവില്ല." "പേര് എഡിറ്റ് ചെയ്യുക" + + + + "%1$s പ്രവർത്തനരഹിതമാക്കി" "{count,plural, =1{{app_name} ആപ്പിന് # അറിയിപ്പുണ്ട്}other{{app_name} ആപ്പിന് # അറിയിപ്പുകളുണ്ട്}}" "പേജ് %1$d / %2$d" diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml index 25bec35d66..76a416e7a0 100644 --- a/res/values-mn/strings.xml +++ b/res/values-mn/strings.xml @@ -113,6 +113,10 @@ "Тохируулгыг дуусгахын тулд товшино уу" "Энэ апп нь системийн апп ба устгах боломжгүй." "Нэр засах" + + + + "%1$s-г идэвхгүй болгосон" "{count,plural, =1{{app_name} дээр # мэдэгдэл байна}other{{app_name} дээр # мэдэгдэл байна}}" "%2$d-н %1$d хуудас" diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml index a87e9e913b..76e230868b 100644 --- a/res/values-mr/strings.xml +++ b/res/values-mr/strings.xml @@ -113,6 +113,10 @@ "सेटअप पूर्ण करण्‍यासाठी टॅप करा" "हे सिस्टीम अ‍ॅप आहे आणि ते अनइंस्टॉल केले जाऊ शकत नाही." "नाव संपादित करा" + + + + "%1$s अक्षम केला आहे" "{count,plural, =1{{app_name} संबंधित # सूचना आहे}other{{app_name} संबंधित # सूचना आहेत}}" "%2$d पैकी %1$d पेज" diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index ff072726af..0a9139ede7 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -113,6 +113,10 @@ "Ketik untuk menyelesaikan persediaan" "Ini ialah apl sistem dan tidak boleh dinyahpasang." "Edit Nama" + + + + "%1$s dilumpuhkan" "{count,plural, =1{{app_name} mempunyai # pemberitahuan}other{{app_name} mempunyai # pemberitahuan}}" "Halaman %1$d daripada %2$d" diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml index cb5a5e44fa..d8e6497665 100644 --- a/res/values-my/strings.xml +++ b/res/values-my/strings.xml @@ -113,6 +113,10 @@ "စနစ်ထည့်သွင်းခြင်း အပြီးသတ်ရန် တို့ပါ" "ဤအပ်ပလီကေးရှင်းမှာ စစ်စတန်ပိုင်းဆိုင်ရာ အပ်ပလီကေးရှင်းဖြစ်ပါသည်။ ထုတ်ပစ်၍ မရပါ" "အမည်ကို တည်းဖြတ်ပါ" + + + + "%1$s ကို ပိတ်ထားသည်" "{count,plural, =1{{app_name} တွင် အကြောင်းကြားချက် # ခု ရှိသည်}other{{app_name} တွင် အကြောင်းကြားချက် # ခု ရှိသည်}}" "စာမျက်နှာ %1$d မှ %2$d" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index f251412b82..ec48d457d6 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -113,6 +113,10 @@ "Trykk for å fullføre konfigureringen" "Dette er en systemapp som ikke kan avinstalleres." "Rediger navn" + + + + "Slo av %1$s" "{count,plural, =1{{app_name} har # varsel}other{{app_name} har # varsler}}" "Side %1$d av %2$d" diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index fe047cc06d..ee3fc6bb1d 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -113,6 +113,10 @@ "सेटअप पूरा गर्न ट्याप गर्नुहोस्" "यो सिस्टम एप हो र यसलाई स्थापना रद्द गर्न सकिँदैन।" "नाम सम्पादन गर्नुहोस्" + + + + "असक्षम पारिएको %1$s" "{count,plural, =1{{app_name} सँग सम्बन्धित # सूचना छ}other{{app_name} सँग सम्बन्धित # वटा सूचना छन्}}" "पृष्ठ %2$d को %1$d" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index f579c2568c..c6938c97dc 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -113,6 +113,10 @@ "Tik om instellen af te ronden" "Dit is een systeemapp die niet kan worden verwijderd." "Naam bewerken" + + + + "%1$s staat uit" "{count,plural, =1{{app_name} heeft # melding}other{{app_name} heeft # meldingen}}" "Pagina %1$d van %2$d" diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml index feb693921f..b0b7c76e1b 100644 --- a/res/values-or/strings.xml +++ b/res/values-or/strings.xml @@ -113,6 +113,10 @@ "ସେଟଅପ ସମ୍ପୂର୍ଣ୍ଣ କରିବାକୁ ଟାପ କରନ୍ତୁ" "ଏହା ଏକ ସିଷ୍ଟମ୍‌ ଆପ୍‌ ଅଟେ ଏବଂ ଏହା ଅନଇନଷ୍ଟଲ୍‌ କରାଯାଇ ପାରିବ ନାହିଁ।" "ନାମ ଏଡିଟ କରନ୍ତୁ" + + + + "%1$s ଅକ୍ଷମ କରାଗଲା" "{count,plural, =1{{app_name}ର #ଟି ବିଜ୍ଞପ୍ତି ଅଛି}other{{app_name}ର #ଟି ବିଜ୍ଞପ୍ତି ଅଛି}}" "ମୋଟ %2$dରୁ %1$d ନମ୍ବର ପୃଷ୍ଠା" diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index 28d2e5f51d..0e331261cf 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -113,6 +113,10 @@ "ਸੈੱਟਅੱਪ ਪੂਰਾ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ" "ਇਹ ਇੱਕ ਸਿਸਟਮ ਐਪ ਹੈ ਅਤੇ ਇਸਨੂੰ ਅਣਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।" "ਨਾਮ ਦਾ ਸੰਪਾਦਨ ਕਰੋ" + + + + "%1$s ਨੂੰ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ" "{count,plural, =1{{app_name} \'ਤੇ # ਸੂਚਨਾ ਹੈ}one{{app_name} \'ਤੇ # ਸੂਚਨਾ ਹੈ}other{{app_name} \'ਤੇ # ਸੂਚਨਾਵਾਂ ਹਨ}}" "ਸਫ਼ਾ %2$d ਦਾ %1$d" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 715ccbfd91..cffd9e3639 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -113,6 +113,10 @@ "Kliknij, aby dokończyć konfigurację" "To aplikacja systemowa i nie można jej odinstalować." "Edytuj nazwę" + + + + "Aplikacja %1$s jest wyłączona" "{count,plural, =1{{app_name} – # powiadomienie}few{{app_name} – # powiadomienia}many{{app_name} – # powiadomień}other{{app_name} – # powiadomienia}}" "Strona %1$d z %2$d" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index d9c6ea2489..7a221fe33f 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -113,6 +113,10 @@ "Toque para concluir a configuração" "É uma app de sistema e não pode ser desinstalada." "Edite o nome" + + + + "%1$s desativado" "{count,plural, =1{A app {app_name} tem # notificação}other{A app {app_name} tem # notificações}}" "Página %1$d de %2$d" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 07dbc26782..8aea397db5 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -113,6 +113,10 @@ "Toque para concluir a configuração" "Este é um app do sistema e não pode ser desinstalado." "Editar nome" + + + + "%1$s desativado" "{count,plural, =1{O app {app_name} tem # notificação}one{O app {app_name} tem # notificação}other{O app {app_name} tem # notificações}}" "Página %1$d de %2$d" diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 4e97efc1d7..de8fb3a592 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -113,6 +113,10 @@ "Atinge pentru a finaliza configurarea" "Aceasta este o aplicație de sistem și nu poate fi dezinstalată." "Modifică numele" + + + + "S-a dezactivat %1$s" "{count,plural, =1{{app_name} are # notificare}few{{app_name} are # notificări}other{{app_name} are # de notificări}}" "Pagina %1$d din %2$d" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 71f9114669..e0d458d627 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -113,6 +113,10 @@ "Нажмите, чтобы завершить настройку." "Это системное приложение, его нельзя удалить." "Измените название" + + + + "Приложение %1$s отключено" "{count,plural, =1{В приложении \"{app_name}\" # уведомление}one{В приложении \"{app_name}\" # уведомление}few{В приложении \"{app_name}\" # уведомления}many{В приложении \"{app_name}\" # уведомлений}other{В приложении \"{app_name}\" # уведомления}}" "Стр. %1$d из %2$d" diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml index 457538189f..3b5231e9e1 100644 --- a/res/values-si/strings.xml +++ b/res/values-si/strings.xml @@ -113,6 +113,10 @@ "පිහිටුවීම අවසන් කිරීමට තට්ටු කරන්න" "මෙය පද්ධති යෙදුමක් වන අතර අස්ථාපනය කළ නොහැක." "නම සංස්කරණය කරන්න" + + + + "%1$s අබල කෙරිණි" "{count,plural, =1{{app_name} හට දැනුම්දීම් #ක් ඇත}one{{app_name} හට දැනුම්දීම් #ක් ඇත}other{{app_name} හට දැනුම්දීම් #ක් ඇත}}" "%2$d හි %1$d පිටුව" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 1a2d84f461..f6faf53011 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -113,6 +113,10 @@ "Nastavenie dokončíte klepnutím" "Toto je systémová aplikácia a nedá sa odinštalovať." "Úprava názvu" + + + + "Aplikácia %1$s je deaktivovaná" "{count,plural, =1{Aplikácia {app_name} má # upozornenie}few{Aplikácia {app_name} má # upozornenia}many{{app_name} has # notifications}other{Aplikácia {app_name} má # upozornení}}" "Stránka %1$d z %2$d" diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 0e838eb1b5..d22a291c79 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -113,6 +113,10 @@ "Dotaknite se, da dokončate postopek nastavitve." "To je sistemska aplikacija in je ni mogoče odstraniti." "Urejanje imena" + + + + "Aplikacija %1$s je onemogočena" "{count,plural, =1{{app_name} ima # obvestilo.}one{{app_name} ima # obvestilo.}two{{app_name} ima # obvestili.}few{{app_name} ima # obvestila.}other{{app_name} ima # obvestil.}}" "Stran %1$d od %2$d" diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml index 93f772fc54..41dffa2f64 100644 --- a/res/values-sq/strings.xml +++ b/res/values-sq/strings.xml @@ -113,6 +113,10 @@ "Trokit për të përfunduar konfigurimin" "Ky është aplikacion sistemi dhe nuk mund të çinstalohet." "Redakto emrin" + + + + "%1$s u çaktivizua" "{count,plural, =1{{app_name} ka # njoftim}other{{app_name} ka # njoftime}}" "Faqja: %1$d nga gjithsej %2$d" diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index aacbc42670..fc7d9fa776 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -113,6 +113,10 @@ "Додирните да бисте довршили подешавање" "Ово је системска апликација и не може да се деинсталира." "Измените назив" + + + + "Апликација %1$s је онемогућена" "{count,plural, =1{{app_name}, има # обавештење}one{{app_name}, има # обавештење}few{{app_name}, има # обавештења}other{{app_name}, има # обавештења}}" "%1$d. страница од %2$d" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index ea12fe6b6a..c795bcabe2 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -113,6 +113,10 @@ "Tryck för att slutföra konfigureringen" "Det här är en systemapp som inte kan avinstalleras." "Redigera namn" + + + + "%1$s har inaktiverats" "{count,plural, =1{{app_name} har # avisering}other{{app_name} har # aviseringar}}" "Sidan %1$d av %2$d" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index dc2777d9d6..f67aed31d0 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -113,6 +113,10 @@ "Gusa ili umalize kuweka mipangilio" "Hii ni programu ya mfumo na haiwezi kuondolewa." "Badilisha Jina" + + + + "%1$s imezimwa" "{count,plural, =1{{app_name} ina arifa #}other{{app_name} ina arifa #}}" "Ukurasa%1$d wa %2$d" diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml index 8034f9dd21..5e886e606b 100644 --- a/res/values-ta/strings.xml +++ b/res/values-ta/strings.xml @@ -113,6 +113,10 @@ "அமைவை நிறைவுசெய்யத் தட்டவும்" "இது அமைப்பு ஆப்ஸ் என்பதால் நிறுவல் நீக்கம் செய்ய முடியாது." "பெயரைத் திருத்துதல்" + + + + "%1$s முடக்கப்பட்டது" "{count,plural, =1{{app_name} ஆப்ஸில் # அறிவிப்பு உள்ளது}other{{app_name} ஆப்ஸில் # அறிவிப்புகள் உள்ளன}}" "பக்கம் %1$d / %2$d" diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml index 41d332e37f..c9c2de086e 100644 --- a/res/values-te/strings.xml +++ b/res/values-te/strings.xml @@ -113,6 +113,10 @@ "సెటప్‌ను ముగించడానికి ట్యాప్ చేయండి" "ఇది సిస్టమ్ యాప్ మరియు దీన్ని అన్‌ఇన్‌స్టాల్ చేయడం సాధ్యపడదు." "పేరును ఎడిట్ చేయండి" + + + + "%1$s నిలిపివేయబడింది" "{count,plural, =1{{app_name}లో # నోటిఫికేషన్ ఉంది}other{{app_name}లో # నోటిఫికేషన్‌లు ఉన్నాయి}}" "%2$dలో %1$dవ పేజీ" diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 068dd49440..105d893af6 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -113,6 +113,10 @@ "แตะเพื่อสิ้นสุดการตั้งค่า" "นี่เป็นแอประบบและไม่สามารถถอนการติดตั้งได้" "แก้ไขชื่อ" + + + + "ปิดใช้ %1$s" "{count,plural, =1{{app_name} มีการแจ้งเตือน # รายการ}other{{app_name} มีการแจ้งเตือน # รายการ}}" "หน้า %1$d จาก %2$d" diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 8a65cd541c..a9d7df0146 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -113,6 +113,10 @@ "I-tap para tapusin ang pag-set up" "Isa itong app ng system at hindi maaaring i-uninstall." "I-edit ang Pangalan" + + + + "Naka-disable ang %1$s" "{count,plural, =1{May # notification ang {app_name}}one{May # notification ang {app_name}}other{May # na notification ang {app_name}}}" "Pahina %1$d ng %2$d" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 21fae8ac0a..091b714a47 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -113,6 +113,10 @@ "Kurulumu tamamlamak için dokunun" "Bu bir sistem uygulamasıdır ve yüklemesi kaldırılamaz." "Adı Düzenle" + + + + "%1$s devre dışı" "{count,plural, =1{{app_name} uygulamasının # bildirimi var}other{{app_name} uygulamasının # bildirimi var}}" "Sayfa %1$d / %2$d" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 8dab52219e..3a21c94d61 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -113,6 +113,10 @@ "Торкніться, щоб завершити налаштування" "Це системна програма, її неможливо видалити." "Редагувати назву" + + + + "%1$s вимкнено" "{count,plural, =1{Додаток {app_name} має # сповіщення}one{Додаток {app_name} має # сповіщення}few{Додаток {app_name} має # сповіщення}many{Додаток {app_name} має # сповіщень}other{Додаток {app_name} має # сповіщення}}" "Сторінка %1$d з %2$d" diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml index e9ff3e446f..3d0e1fa329 100644 --- a/res/values-ur/strings.xml +++ b/res/values-ur/strings.xml @@ -113,6 +113,10 @@ "سیٹ اپ مکمل کرنے کیلئے تھپتھپائیں" "یہ ایک سسٹم ایپ ہے اور اسے اَن انسٹال نہیں کیا جا سکتا ہے۔" "نام میں ترمیم کریں" + + + + "%1$s غیر فعال ہے" "{count,plural, =1{{app_name} میں # اطلاع ہے}other{{app_name} میں # اطلاعات ہیں}}" "‏صفحہ ‎%1$d از ‎%2$d" diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml index 14c50fb105..bb8f2285e9 100644 --- a/res/values-uz/strings.xml +++ b/res/values-uz/strings.xml @@ -113,6 +113,10 @@ "Sozlashni yakunlash uchun bosing" "Bu tizim ilovasi, shuning uchun o‘chirib bo‘lmaydi." "Nomini tahrirlash" + + + + "%1$s ilovasi o‘chirib qo‘yildi" "{count,plural, =1{{app_name} ilovasida # ta bildirishnoma bor}other{{app_name} ilovasida # ta bildirishnoma bor}}" "%2$ddan %1$d ta sahifa" diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 5db14d500a..4c931dd827 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -113,6 +113,10 @@ "Nhấn để hoàn tất thiết lập" "Đây là ứng dụng hệ thống và không thể gỡ cài đặt." "Chỉnh sửa tên" + + + + "Đã vô hiệu hóa %1$s" "{count,plural, =1{{app_name} có # thông báo}other{{app_name} có # thông báo}}" "Trang %1$d / %2$d" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 7a776c7ad9..bdd3139dce 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -113,6 +113,10 @@ "点按即可完成设置" "这是系统应用,无法卸载。" "修改名称" + + + + "已停用%1$s" "{count,plural, =1{“{app_name}”有 # 条通知}other{“{app_name}”有 # 条通知}}" "第%1$d页,共%2$d页" diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index b4997af81a..29ced0d6f4 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -113,6 +113,10 @@ "輕按即可完成設定" "這是系統應用程式,無法將其解除安裝。" "編輯名稱" + + + + "「%1$s」已停用" "{count,plural, =1{「{app_name}」有 # 項通知}other{「{app_name}」有 # 項通知}}" "第 %1$d 頁,共 %2$d 頁" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index e01a67d8e4..8110255b81 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -113,6 +113,10 @@ "輕觸即可完成設定" "這是系統應用程式,不可解除安裝。" "編輯名稱" + + + + "已停用 %1$s" "{count,plural, =1{「{app_name}」應用程式有 # 則通知}other{「{app_name}」應用程式有 # 則通知}}" "第 %1$d 頁,共 %2$d 頁" diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 3670c03f92..4c2fe08510 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -113,6 +113,10 @@ "Thepha ukuze uqede ukusetha" "Lolu uhlelo lokusebenza lwesistimu futhi alikwazi ukukhishwa." "Hlela igama" + + + + "Kukhutshaziwe %1$s" "{count,plural, =1{I-{app_name} inesaziso esi-#}one{I-{app_name} inezaziso ezingu-#}other{I-{app_name} inezaziso ezingu-#}}" "Ikhasi elingu-%1$d kwangu-%2$d" From 8cb1ae879becf449cc8a63a1ada484a96955943f Mon Sep 17 00:00:00 2001 From: Steven Ng Date: Fri, 11 Apr 2025 18:31:24 +0100 Subject: [PATCH 19/24] Use SysUi focus display ID as the source of truth For key gesture events received in SysUi & Launcher, we will use the SysUi tracked display Id as the source of truth. The KeyGestureHandler mechanism will be kept because it has less redirection compare to the existing pipeline. Bug: 406452076 Test: atest NexusLauncherTests:QuickstepKeyGestureEventsHandlerTest Test: atest NexusLauncherTests:AllAppsActionManagerTest Test: atest NexusLauncherOutOfProcTests:com.google.android.apps.nexuslauncher.TaplTestsNexus Test: Verfiy manually that meta key event triggered all apps if the display focused is the default display. Flag: com.android.window.flags.enable_key_gesture_handler_for_recents Change-Id: I032a44b903e4e49e85c2a40a1e0bdc49ef8d86b0 --- .../launcher3/taskbar/TaskbarManager.java | 28 ++----------------- .../input/QuickstepKeyGestureEventsManager.kt | 10 ++----- .../QuickstepKeyGestureEventsHandlerTest.kt | 9 ++---- 3 files changed, 7 insertions(+), 40 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java index e19fd5764b..484c60037a 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java @@ -121,12 +121,6 @@ public class TaskbarManager implements DisplayDecorationListener { // TODO: b/397738606 - Remove all logs with this tag after the growth framework is integrated. public static final String GROWTH_FRAMEWORK_TAG = "Growth Framework"; - /** - * An integer extra specifying the ID of the display on which the All Apps UI should be shown - * or hidden. - */ - public static final String EXTRA_KEY_ALL_APPS_ACTION_DISPLAY_ID = - "com.android.quickstep.allapps.display_id"; /** * All the configurations which do not initiate taskbar recreation. @@ -590,15 +584,7 @@ public class TaskbarManager implements DisplayDecorationListener { * visibility on the System UI tracked focused display. */ public void toggleAllAppsSearch() { - toggleAllAppsSearchForDisplay(getFocusedDisplayId()); - } - - /** - * Shows or hides the All Apps view in the Taskbar or Launcher, based on its current - * visibility on the given display, with ID {@code displayId}. - */ - public void toggleAllAppsSearchForDisplay(int displayId) { - TaskbarActivityContext taskbar = getTaskbarForDisplay(displayId); + TaskbarActivityContext taskbar = getTaskbarForDisplay(getFocusedDisplayId()); if (taskbar == null) { // Home All Apps should be toggled from this class, because the controllers are not // initialized when Taskbar is disabled (i.e. TaskbarActivityContext is null). @@ -1740,17 +1726,7 @@ public class TaskbarManager implements DisplayDecorationListener { public void send(int code, Intent intent, String resolvedType, IBinder allowlistToken, IIntentReceiver finishedReceiver, String requiredPermission, Bundle options) { - MAIN_EXECUTOR.execute(() -> { - int displayId = -1; - if (options != null) { - displayId = options.getInt(EXTRA_KEY_ALL_APPS_ACTION_DISPLAY_ID, -1); - } - if (displayId == -1) { - toggleAllAppsSearch(); - } else { - toggleAllAppsSearchForDisplay(displayId); - } - }); + MAIN_EXECUTOR.execute(TaskbarManager.this::toggleAllAppsSearch); } }); } diff --git a/quickstep/src/com/android/quickstep/input/QuickstepKeyGestureEventsManager.kt b/quickstep/src/com/android/quickstep/input/QuickstepKeyGestureEventsManager.kt index d6355e9a91..d5120985ee 100644 --- a/quickstep/src/com/android/quickstep/input/QuickstepKeyGestureEventsManager.kt +++ b/quickstep/src/com/android/quickstep/input/QuickstepKeyGestureEventsManager.kt @@ -21,11 +21,9 @@ import android.content.Context import android.hardware.input.InputManager import android.hardware.input.InputManager.KeyGestureEventHandler import android.hardware.input.KeyGestureEvent -import android.os.Bundle import android.os.IBinder import android.util.Log import androidx.annotation.VisibleForTesting -import com.android.launcher3.taskbar.TaskbarManager import com.android.window.flags.Flags /** @@ -47,11 +45,9 @@ class QuickstepKeyGestureEventsManager(context: Context) { return } - allAppsPendingIntent?.send( - Bundle().apply { - putInt(TaskbarManager.EXTRA_KEY_ALL_APPS_ACTION_DISPLAY_ID, event.displayId) - } - ) + // Ignore the display ID from the KeyGestureEvent as we will use the focus display + // from the SysUi proxy as the source of truth. + allAppsPendingIntent?.send() } } diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/input/QuickstepKeyGestureEventsHandlerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/input/QuickstepKeyGestureEventsHandlerTest.kt index e5b517ede9..b7622a0759 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/input/QuickstepKeyGestureEventsHandlerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/input/QuickstepKeyGestureEventsHandlerTest.kt @@ -20,13 +20,11 @@ import android.app.PendingIntent import android.hardware.input.InputManager import android.hardware.input.KeyGestureEvent import android.hardware.input.KeyGestureEvent.KEY_GESTURE_TYPE_ALL_APPS -import android.os.Bundle import android.platform.test.annotations.DisableFlags import android.platform.test.annotations.EnableFlags import android.platform.test.flag.junit.SetFlagsRule import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest -import com.android.launcher3.taskbar.TaskbarManager.EXTRA_KEY_ALL_APPS_ACTION_DISPLAY_ID import com.android.launcher3.util.SandboxApplication import com.android.window.flags.Flags import com.google.common.truth.Truth.assertThat @@ -55,7 +53,6 @@ class QuickstepKeyGestureEventsHandlerTest { private val keyGestureEventsManager = QuickstepKeyGestureEventsManager(context) private val allAppsPendingIntent: PendingIntent = mock() private val keyGestureEventsCaptor: KArgumentCaptor> = argumentCaptor() - private val bundleCaptor: KArgumentCaptor = argumentCaptor() @Before fun setup() { @@ -105,7 +102,7 @@ class QuickstepKeyGestureEventsHandlerTest { @Test @EnableFlags(Flags.FLAG_ENABLE_KEY_GESTURE_HANDLER_FOR_RECENTS) - fun handleEvent_flagEnabled_allApps_toggleAllAppsSearchWithDisplayId() { + fun handleEvent_flagEnabled_allApps_toggleAllAppsSearch() { keyGestureEventsManager.registerAllAppsKeyGestureEvent(allAppsPendingIntent) keyGestureEventsManager.allAppsKeyGestureEventHandler.handleKeyGestureEvent( @@ -116,9 +113,7 @@ class QuickstepKeyGestureEventsHandlerTest { /* focusedToken= */ null, ) - verify(allAppsPendingIntent).send(bundleCaptor.capture()) - assertThat(bundleCaptor.firstValue.getInt(EXTRA_KEY_ALL_APPS_ACTION_DISPLAY_ID)) - .isEqualTo(TEST_DISPLAY_ID) + verify(allAppsPendingIntent).send() } @Test From f4d8a9d3a2bd3b8e830c6d6bbbf53432ab10d05a Mon Sep 17 00:00:00 2001 From: helencheuk Date: Fri, 11 Apr 2025 15:13:09 +0100 Subject: [PATCH 20/24] [Action Corner] Handle overview action in launcher Add a new command type "TOGGLE_OVERVIEW_PREVIOUS" to toggle between overview and the previous task or homepage. Renamed the existing command types to make them more precise Bug: 409036363 Flag: com.android.systemui.shared.cursor_hot_corner Test: OverviewCommandHelperTest Change-Id: I7bab39adb0c933e16ac222fafc8be3f60fe36cc1 --- .../quickstep/OverviewCommandHelper.kt | 61 ++++++++++----- .../quickstep/TouchInteractionService.java | 21 ++++-- .../actioncorner/ActionCornerHandler.kt | 39 ++++++++++ .../quickstep/OverviewCommandHelperTest.kt | 74 +++++++++++++++++-- 4 files changed, 163 insertions(+), 32 deletions(-) create mode 100644 quickstep/src/com/android/quickstep/actioncorner/ActionCornerHandler.kt diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.kt b/quickstep/src/com/android/quickstep/OverviewCommandHelper.kt index 11e1dce7b2..8034c2e5b6 100644 --- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.kt +++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.kt @@ -48,11 +48,12 @@ import com.android.launcher3.util.RunnableList import com.android.launcher3.util.coroutines.DispatcherProvider import com.android.launcher3.util.coroutines.ProductionDispatchers import com.android.quickstep.OverviewCommandHelper.CommandInfo.CommandStatus -import com.android.quickstep.OverviewCommandHelper.CommandType.HIDE +import com.android.quickstep.OverviewCommandHelper.CommandType.HIDE_ALT_TAB import com.android.quickstep.OverviewCommandHelper.CommandType.HOME -import com.android.quickstep.OverviewCommandHelper.CommandType.KEYBOARD_INPUT -import com.android.quickstep.OverviewCommandHelper.CommandType.SHOW +import com.android.quickstep.OverviewCommandHelper.CommandType.SHOW_ALT_TAB +import com.android.quickstep.OverviewCommandHelper.CommandType.SHOW_WITH_FOCUS import com.android.quickstep.OverviewCommandHelper.CommandType.TOGGLE +import com.android.quickstep.OverviewCommandHelper.CommandType.TOGGLE_OVERVIEW_PREVIOUS import com.android.quickstep.fallback.window.RecentsWindowFlags.Companion.enableOverviewInWindow import com.android.quickstep.util.ActiveGestureLog import com.android.quickstep.util.ActiveGestureProtoLogProxy @@ -159,7 +160,10 @@ constructor( .toIntArray(), ) - fun canStartHomeSafely(): Boolean = commandQueue.isEmpty() || commandQueue.first().type == HOME + fun canStartHomeSafely(): Boolean = + commandQueue.isEmpty() || + commandQueue.first().type == HOME || + commandQueue.first().type == TOGGLE_OVERVIEW_PREVIOUS /** Clear pending or completed commands from the queue */ fun clearPendingCommands() { @@ -248,9 +252,9 @@ constructor( onCallbackResult: () -> Unit, ): Boolean = when (command.type) { - SHOW -> true // already visible - KEYBOARD_INPUT, - HIDE -> { + SHOW_WITH_FOCUS -> true // already visible + SHOW_ALT_TAB, + HIDE_ALT_TAB -> { if (recentsView.isHandlingTouch) { true } else { @@ -269,7 +273,15 @@ constructor( onCallbackResult, ) } - + TOGGLE_OVERVIEW_PREVIOUS -> { + val taskView = recentsView.runningTaskView + if (taskView == null) { + recentsView.startHome() + } else { + taskView.launchWithAnimation() + } + true + } HOME -> { recentsView.startHome() true @@ -341,7 +353,7 @@ constructor( } when (command.type) { - HIDE -> { + HIDE_ALT_TAB -> { if ( taskbarUIController == null || !shouldShowAltTabKqs(deviceProfile, command.displayId) @@ -353,7 +365,7 @@ constructor( if (keyboardTaskFocusIndex == -1) return true } - KEYBOARD_INPUT -> + SHOW_ALT_TAB -> if ( taskbarUIController != null && shouldShowAltTabKqs(deviceProfile, command.displayId) @@ -374,14 +386,15 @@ constructor( return true } - SHOW -> + SHOW_WITH_FOCUS -> // When Recents is not currently visible, the command's type is SHOW // when overview is triggered via the keyboard overview button or Action+Tab // keys (Not Alt+Tab which is KQS). The overview button on-screen in 3-button // nav is TYPE_TOGGLE. keyboardTaskFocusIndex = 0 - TOGGLE -> {} + TOGGLE, + TOGGLE_OVERVIEW_PREVIOUS -> {} } recentsView?.setKeyboardTaskFocusIndex( @@ -560,7 +573,11 @@ constructor( private fun updateRecentsViewFocus(command: CommandInfo) { val recentsView: RecentsView<*, *> = getVisibleRecentsView(command.displayId) ?: return - if (command.type != KEYBOARD_INPUT && command.type != HIDE && command.type != SHOW) { + if ( + command.type != SHOW_ALT_TAB && + command.type != HIDE_ALT_TAB && + command.type != SHOW_WITH_FOCUS + ) { return } @@ -581,7 +598,7 @@ constructor( private fun onRecentsViewFocusUpdated(command: CommandInfo) { val recentsView: RecentsView<*, *> = getVisibleRecentsView(command.displayId) ?: return - if (command.type != HIDE || keyboardTaskFocusIndex == PagedView.INVALID_PAGE) { + if (command.type != HIDE_ALT_TAB || keyboardTaskFocusIndex == PagedView.INVALID_PAGE) { return } recentsView.setKeyboardTaskFocusIndex(PagedView.INVALID_PAGE) @@ -603,8 +620,8 @@ constructor( val container = containerInterface.getCreatedContainer() ?: return val event = when (command.type) { - SHOW -> LAUNCHER_OVERVIEW_SHOW_OVERVIEW_FROM_KEYBOARD_SHORTCUT - HIDE -> LAUNCHER_OVERVIEW_SHOW_OVERVIEW_FROM_KEYBOARD_QUICK_SWITCH + SHOW_WITH_FOCUS -> LAUNCHER_OVERVIEW_SHOW_OVERVIEW_FROM_KEYBOARD_SHORTCUT + HIDE_ALT_TAB -> LAUNCHER_OVERVIEW_SHOW_OVERVIEW_FROM_KEYBOARD_QUICK_SWITCH TOGGLE -> LAUNCHER_OVERVIEW_SHOW_OVERVIEW_FROM_3_BUTTON else -> return } @@ -659,11 +676,17 @@ constructor( } enum class CommandType { - SHOW, - KEYBOARD_INPUT, - HIDE, + SHOW_WITH_FOCUS, + SHOW_ALT_TAB, + HIDE_ALT_TAB, + /** Toggle between overview and the next task */ TOGGLE, // Navigate to Overview HOME, // Navigate to Home + /** + * Toggle between Overview and the previous screen before launching Overview, which can + * either be a task or the home screen. + */ + TOGGLE_OVERVIEW_PREVIOUS, } companion object { diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index c91655eddd..db4ff9a0e4 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -94,6 +94,7 @@ import com.android.launcher3.util.ScreenOnTracker; import com.android.launcher3.util.TraceHelper; import com.android.quickstep.OverviewCommandHelper.CommandType; import com.android.quickstep.OverviewComponentObserver.OverviewChangeListener; +import com.android.quickstep.actioncorner.ActionCornerHandler; import com.android.quickstep.fallback.window.RecentsWindowFlags; import com.android.quickstep.fallback.window.RecentsWindowManager; import com.android.quickstep.fallback.window.RecentsWindowSwipeHandler; @@ -238,9 +239,9 @@ public class TouchInteractionService extends Service { int displayId = enableAltTabKqsOnConnectedDisplays.isTrue() ? SystemUiProxy.INSTANCE.get(tis).getFocusState().getFocusedDisplayId() : DEFAULT_DISPLAY; - tis.mOverviewCommandHelper.addCommand(CommandType.KEYBOARD_INPUT, displayId); + tis.mOverviewCommandHelper.addCommand(CommandType.SHOW_ALT_TAB, displayId); } else { - tis.mOverviewCommandHelper.addCommand(CommandType.SHOW); + tis.mOverviewCommandHelper.addCommand(CommandType.SHOW_WITH_FOCUS); } }); } @@ -254,7 +255,7 @@ public class TouchInteractionService extends Service { int displayId = enableAltTabKqsOnConnectedDisplays.isTrue() ? SystemUiProxy.INSTANCE.get(tis).getFocusState().getFocusedDisplayId() : DEFAULT_DISPLAY; - tis.mOverviewCommandHelper.addCommand(CommandType.HIDE, displayId); + tis.mOverviewCommandHelper.addCommand(CommandType.HIDE_ALT_TAB, displayId); } }); } @@ -451,7 +452,13 @@ public class TouchInteractionService extends Service { @Override public void onActionCornerActivated(int action, int displayId) { - //TODO: b/409036363 - Handle Home and Overview action corner + MAIN_EXECUTOR.execute(() -> executeForTouchInteractionService(tis -> { + ActionCornerHandler actionCornerHandler = tis.mActionCornerHandler; + if (actionCornerHandler == null) { + return; + } + actionCornerHandler.handleAction(action, displayId); + })); } private void executeForTouchInteractionService( @@ -595,9 +602,9 @@ public class TouchInteractionService extends Service { @Override public void onHideOverview(int displayId) { if (enableOverviewOnConnectedDisplays()) { - mOverviewCommandHelper.addCommand(CommandType.HIDE, displayId); + mOverviewCommandHelper.addCommand(CommandType.HIDE_ALT_TAB, displayId); } else { - mOverviewCommandHelper.addCommand(CommandType.HIDE, DEFAULT_DISPLAY); + mOverviewCommandHelper.addCommand(CommandType.HIDE_ALT_TAB, DEFAULT_DISPLAY); } } }; @@ -620,6 +627,7 @@ public class TouchInteractionService extends Service { private InputEventReceiver mInputEventReceiver; private TaskbarManager mTaskbarManager; + private ActionCornerHandler mActionCornerHandler; private Function mSwipeUpProxyProvider = i -> null; private AllAppsActionManager mAllAppsActionManager; private ActiveTrackpadList mTrackpadsConnected; @@ -755,6 +763,7 @@ public class TouchInteractionService extends Service { mOverviewCommandHelper = new OverviewCommandHelper(this, mOverviewComponentObserver, mDisplayRepository, mTaskbarManager, mTaskAnimationManagerRepository); + mActionCornerHandler = new ActionCornerHandler(mOverviewCommandHelper); mUserUnlocked = true; mInputConsumer.registerInputConsumer(); mDeviceStateRepository.forEach(/* createIfAbsent= */ true, deviceState -> diff --git a/quickstep/src/com/android/quickstep/actioncorner/ActionCornerHandler.kt b/quickstep/src/com/android/quickstep/actioncorner/ActionCornerHandler.kt new file mode 100644 index 0000000000..e99b393176 --- /dev/null +++ b/quickstep/src/com/android/quickstep/actioncorner/ActionCornerHandler.kt @@ -0,0 +1,39 @@ +/* + * Copyright 2025 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.quickstep.actioncorner + +import com.android.quickstep.OverviewCommandHelper +import com.android.quickstep.OverviewCommandHelper.CommandType.TOGGLE_OVERVIEW_PREVIOUS +import com.android.systemui.shared.system.actioncorner.ActionCornerConstants.Action +import com.android.systemui.shared.system.actioncorner.ActionCornerConstants.HOME +import com.android.systemui.shared.system.actioncorner.ActionCornerConstants.OVERVIEW + +/** + * Handles actions triggered from action corners that are mapped to specific functionalities. + * Launcher supports both overview and home actions. + */ +class ActionCornerHandler(private val overviewCommandHelper: OverviewCommandHelper) { + + fun handleAction(@Action action: Int, displayId: Int) { + when (action) { + // TODO(b/410798748): handle projected mode when launching overview + OVERVIEW -> overviewCommandHelper.addCommandsForAllDisplays(TOGGLE_OVERVIEW_PREVIOUS) + HOME -> {} // TODO(b/409036363): handle HOME action + else -> {} + } + } +} diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/OverviewCommandHelperTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/OverviewCommandHelperTest.kt index c96ccbdce6..7e73d47605 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/OverviewCommandHelperTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/OverviewCommandHelperTest.kt @@ -21,12 +21,18 @@ import android.view.Display.DEFAULT_DISPLAY import androidx.test.filters.SmallTest import com.android.app.displaylib.DisplayRepository import com.android.launcher3.Flags +import com.android.launcher3.LauncherState +import com.android.launcher3.statemanager.StateManager +import com.android.launcher3.statemanager.StatefulActivity +import com.android.launcher3.uioverrides.QuickstepLauncher import com.android.launcher3.util.LauncherMultivalentJUnit import com.android.launcher3.util.TestDispatcherProvider import com.android.launcher3.util.rule.setFlags import com.android.quickstep.OverviewCommandHelper.CommandInfo import com.android.quickstep.OverviewCommandHelper.CommandInfo.CommandStatus import com.android.quickstep.OverviewCommandHelper.CommandType +import com.android.quickstep.views.RecentsView +import com.android.quickstep.views.TaskView import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.delay @@ -46,6 +52,7 @@ import org.mockito.Mockito.doAnswer import org.mockito.Mockito.spy import org.mockito.kotlin.any import org.mockito.kotlin.mock +import org.mockito.kotlin.verify import org.mockito.kotlin.whenever @SmallTest @@ -63,6 +70,10 @@ class OverviewCommandHelperTest { private val displayRepository: DisplayRepository = mock() private val executeCommandDisplayIds = mutableListOf() + private val recentView: RecentsView<*, *> = mock() + private val stateManager: StateManager> = mock() + private val containerInterface: BaseActivityInterface = mock() + private fun setupDefaultDisplay() { whenever(displayRepository.displayIds).thenReturn(MutableStateFlow(setOf(DEFAULT_DISPLAY))) } @@ -79,18 +90,30 @@ class OverviewCommandHelperTest { setupDefaultDisplay() + val overviewComponentObserver = mock() + whenever(overviewComponentObserver.getContainerInterface(any())) + .thenReturn(containerInterface) + whenever(recentView.getStateManager()).thenReturn(stateManager) + whenever(containerInterface.switchToRecentsIfVisible(any())).thenReturn(true) + sut = spy( OverviewCommandHelper( touchInteractionService = mock(), - overviewComponentObserver = mock(), + overviewComponentObserver = overviewComponentObserver, dispatcherProvider = TestDispatcherProvider(dispatcher), displayRepository = displayRepository, taskbarManager = mock(), taskAnimationManagerRepository = mock(), ) ) + } + private fun addCallbackDelay(delayInMillis: Long = 0) { + pendingCallbacksWithDelays.add(delayInMillis) + } + + private fun mockExecuteCommand() { doAnswer { invocation -> val pendingCallback = invocation.arguments[1] as () -> Unit @@ -111,13 +134,10 @@ class OverviewCommandHelperTest { .executeCommand(any(), any()) } - private fun addCallbackDelay(delayInMillis: Long = 0) { - pendingCallbacksWithDelays.add(delayInMillis) - } - @Test fun whenFirstCommandIsAdded_executeCommandImmediately() = testScope.runTest { + mockExecuteCommand() // Add command to queue val commandInfo: CommandInfo = sut.addCommand(CommandType.HOME)!! assertThat(commandInfo.status).isEqualTo(CommandStatus.IDLE) @@ -128,6 +148,7 @@ class OverviewCommandHelperTest { @Test fun whenFirstCommandIsAdded_executeCommandImmediately_WithCallbackDelay() = testScope.runTest { + mockExecuteCommand() addCallbackDelay(100) // Add command to queue @@ -145,6 +166,7 @@ class OverviewCommandHelperTest { @Test fun whenFirstCommandIsPendingCallback_NextCommandWillWait() = testScope.runTest { + mockExecuteCommand() // Add command to queue addCallbackDelay(100) val commandType1 = CommandType.HOME @@ -152,7 +174,7 @@ class OverviewCommandHelperTest { assertThat(commandInfo1.status).isEqualTo(CommandStatus.IDLE) addCallbackDelay(100) - val commandType2 = CommandType.SHOW + val commandType2 = CommandType.SHOW_ALT_TAB val commandInfo2: CommandInfo = sut.addCommand(commandType2)!! assertThat(commandInfo2.status).isEqualTo(CommandStatus.IDLE) @@ -171,6 +193,7 @@ class OverviewCommandHelperTest { @Test fun whenCommandTakesTooLong_TriggerTimeout_AndExecuteNextCommand() = testScope.runTest { + mockExecuteCommand() // Add command to queue addCallbackDelay(QUEUE_TIMEOUT) val commandType1 = CommandType.HOME @@ -178,7 +201,7 @@ class OverviewCommandHelperTest { assertThat(commandInfo1.status).isEqualTo(CommandStatus.IDLE) addCallbackDelay(100) - val commandType2 = CommandType.SHOW + val commandType2 = CommandType.SHOW_ALT_TAB val commandInfo2: CommandInfo = sut.addCommand(commandType2)!! assertThat(commandInfo2.status).isEqualTo(CommandStatus.IDLE) @@ -197,6 +220,7 @@ class OverviewCommandHelperTest { @Test fun whenAllDisplaysCommandIsAdded_singleCommandProcessedForDefaultDisplay() = testScope.runTest { + mockExecuteCommand() executeCommandDisplayIds.clear() // Add command to queue val commandInfo: CommandInfo = sut.addCommandsForAllDisplays(CommandType.HOME)!! @@ -209,6 +233,7 @@ class OverviewCommandHelperTest { @Test fun whenAllDisplaysCommandIsAdded_multipleCommandsProcessedForMultipleDisplays() = testScope.runTest { + mockExecuteCommand() setupMultipleDisplays() executeCommandDisplayIds.clear() // Add command to queue @@ -223,6 +248,7 @@ class OverviewCommandHelperTest { @Test fun whenAllExceptDisplayCommandIsAdded_otherDisplayProcessed() = testScope.runTest { + mockExecuteCommand() setupMultipleDisplays() executeCommandDisplayIds.clear() // Add command to queue @@ -237,6 +263,7 @@ class OverviewCommandHelperTest { @Test fun whenSingleDisplayCommandIsAdded_thatDisplayIsProcessed() = testScope.runTest { + mockExecuteCommand() executeCommandDisplayIds.clear() val displayId = 5 // Add command to queue @@ -247,6 +274,39 @@ class OverviewCommandHelperTest { assertThat(executeCommandDisplayIds).containsExactly(displayId) } + @Test + fun recentViewNotVisible_toggleOverviewPrev_goToOverview() = + testScope.runTest { + whenever(containerInterface.getVisibleRecentsView>()).thenReturn(null) + sut.addCommand(CommandType.TOGGLE_OVERVIEW_PREVIOUS)!! + runCurrent() + verify(containerInterface).switchToRecentsIfVisible(any()) + } + + @Test + fun recentViewVisible_toggleOverviewPrev_goToHome() = + testScope.runTest { + whenever(containerInterface.getVisibleRecentsView>()) + .thenReturn(recentView) + sut.addCommand(CommandType.TOGGLE_OVERVIEW_PREVIOUS)!! + runCurrent() + verify(recentView).startHome() + } + + @Test + fun recentViewVisible_hasRunningTask_toggleOverviewPrev_goToPrevTask() = + testScope.runTest { + whenever(containerInterface.getVisibleRecentsView>()) + .thenReturn(recentView) + val mockTask = mock() + whenever(recentView.runningTaskView).thenReturn(mockTask) + + sut.addCommand(CommandType.TOGGLE_OVERVIEW_PREVIOUS)!! + runCurrent() + + verify(mockTask).launchWithAnimation() + } + private companion object { const val QUEUE_TIMEOUT = 5001L const val EXTERNAL_DISPLAY_ID = 1 From bfe39bdf36b3f124ba5a4874465b0c537977bb8d Mon Sep 17 00:00:00 2001 From: Schneider Victor-Tulias Date: Tue, 15 Apr 2025 10:37:27 -0400 Subject: [PATCH 21/24] Dispose input monitor on the main thread in InputConsumerUtilsTest Flag: EXEMPT test fix Fixes: 410599758 Test: InputConsumerUtilsTest Change-Id: I2016d4711d5913e4e9baad1c394bcd1fb2f043ea --- .../src/com/android/quickstep/InputConsumerUtilsTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/quickstep/tests/src/com/android/quickstep/InputConsumerUtilsTest.java b/quickstep/tests/src/com/android/quickstep/InputConsumerUtilsTest.java index f4bfd5ee74..8a6aa5fb49 100644 --- a/quickstep/tests/src/com/android/quickstep/InputConsumerUtilsTest.java +++ b/quickstep/tests/src/com/android/quickstep/InputConsumerUtilsTest.java @@ -201,8 +201,10 @@ public class InputConsumerUtilsTest { @After public void cleanUp() { - mInputMonitorCompat.dispose(); - mInputEventReceiver.dispose(); + runOnMainSync(() -> { + mInputMonitorCompat.dispose(); + mInputEventReceiver.dispose(); + }); } @Test From a8afda25da543809f91e977562244e48036d88bd Mon Sep 17 00:00:00 2001 From: Shamali P Date: Tue, 15 Apr 2025 02:22:22 +0000 Subject: [PATCH 22/24] Add accessibility actions for "REMOVE", "UNINSTALL" & "Widget Settings" Bug: 279800472 Flag: EXEMPT BUGFIX Test: Talkback & VoiceAccess Change-Id: I78387020cf23910fad5f7b98f9501bc1eb410a72 --- .../android/launcher3/ButtonDropTarget.java | 8 +++++-- .../android/launcher3/DeleteDropTarget.java | 15 +++++++++--- src/com/android/launcher3/DropTargetBar.java | 5 +++- .../launcher3/SecondaryDropTarget.java | 24 +++++++++++-------- .../LauncherAccessibilityDelegate.java | 13 ++++++---- 5 files changed, 44 insertions(+), 21 deletions(-) diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java index 18619f5989..50111111fe 100644 --- a/src/com/android/launcher3/ButtonDropTarget.java +++ b/src/com/android/launcher3/ButtonDropTarget.java @@ -224,7 +224,10 @@ public abstract class ButtonDropTarget extends TextView protected abstract boolean supportsDrop(ItemInfo info); - public abstract boolean supportsAccessibilityDrop(ItemInfo info, View view); + /** + * Returns the accessibility action that {@link ButtonDropTarget} supports for the itemInfo. + */ + public abstract int getSupportedAccessibilityAction(ItemInfo info, View view); @Override public boolean isDropEnabled() { @@ -276,7 +279,8 @@ public abstract class ButtonDropTarget extends TextView @Override public void prepareAccessibilityDrop() { } - public abstract void onAccessibilityDrop(View view, ItemInfo item); + /** Performs a drop in case of accessibility services with the provided action for the item. */ + public abstract void onAccessibilityDrop(View view, ItemInfo item, int action); public abstract void completeDrop(DragObject d); diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java index 89d54f8cf6..798d8b4046 100644 --- a/src/com/android/launcher3/DeleteDropTarget.java +++ b/src/com/android/launcher3/DeleteDropTarget.java @@ -32,6 +32,7 @@ import com.android.launcher3.model.data.CollectionInfo; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.LauncherAppWidgetInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; +import com.android.launcher3.util.Preconditions; public class DeleteDropTarget extends ButtonDropTarget { @@ -68,8 +69,7 @@ public class DeleteDropTarget extends ButtonDropTarget { /** * @return true for items that should have a "Remove" action in accessibility. */ - @Override - public boolean supportsAccessibilityDrop(ItemInfo info, View view) { + private boolean supportsAccessibilityDrop(ItemInfo info, View view) { if (info instanceof WorkspaceItemInfo) { // Support the action unless the item is in a context menu. return canRemove(info); @@ -79,6 +79,14 @@ public class DeleteDropTarget extends ButtonDropTarget { || (info instanceof CollectionInfo); } + @Override + public int getSupportedAccessibilityAction(ItemInfo info, View view) { + if (supportsAccessibilityDrop(info, view)) { + return getAccessibilityAction(); + } + return LauncherAccessibilityDelegate.INVALID; + } + @Override public int getAccessibilityAction() { return LauncherAccessibilityDelegate.REMOVE; @@ -143,7 +151,8 @@ public class DeleteDropTarget extends ButtonDropTarget { * Removes the item from the workspace. If the view is not null, it also removes the view. */ @Override - public void onAccessibilityDrop(View view, ItemInfo item) { + public void onAccessibilityDrop(View view, ItemInfo item, int action) { + Preconditions.assertTrue(action == getAccessibilityAction()); // Remove the item from launcher and the db, we can ignore the containerInfo in this call // because we already remove the drag view from the folder (if the drag originated from // a folder) in Folder.beginDrag() diff --git a/src/com/android/launcher3/DropTargetBar.java b/src/com/android/launcher3/DropTargetBar.java index 8bdf61a633..1d5f185635 100644 --- a/src/com/android/launcher3/DropTargetBar.java +++ b/src/com/android/launcher3/DropTargetBar.java @@ -342,7 +342,10 @@ public class DropTargetBar extends FrameLayout } } + /** + * Returns all possible drop targets (including ones that aren't visible) + */ public ButtonDropTarget[] getDropTargets() { - return getVisibility() == View.VISIBLE ? mDropTargets : new ButtonDropTarget[0]; + return mDropTargets; } } diff --git a/src/com/android/launcher3/SecondaryDropTarget.java b/src/com/android/launcher3/SecondaryDropTarget.java index f4d3146ed5..d09da0a1f4 100644 --- a/src/com/android/launcher3/SecondaryDropTarget.java +++ b/src/com/android/launcher3/SecondaryDropTarget.java @@ -144,8 +144,8 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList } @Override - public boolean supportsAccessibilityDrop(ItemInfo info, View view) { - return getButtonType(info, view) != INVALID; + public int getSupportedAccessibilityAction(ItemInfo info, View view) { + return getButtonType(info, view); } private int getButtonType(ItemInfo info, View view) { @@ -222,17 +222,17 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList d.dragSource = new DeferredOnComplete(d.dragSource, getContext()); super.onDrop(d, options); - doLog(d.logInstanceId, d.originalDragInfo); + doLog(d.logInstanceId, d.originalDragInfo, mCurrentAccessibilityAction); } - private void doLog(InstanceId logInstanceId, ItemInfo itemInfo) { + private void doLog(InstanceId logInstanceId, ItemInfo itemInfo, int action) { StatsLogger logger = mStatsLogManager.logger().withInstanceId(logInstanceId); if (itemInfo != null) { logger.withItemInfo(itemInfo); } - if (mCurrentAccessibilityAction == UNINSTALL) { + if (action == UNINSTALL) { logger.log(LAUNCHER_ITEM_DROPPED_ON_UNINSTALL); - } else if (mCurrentAccessibilityAction == DISMISS_PREDICTION) { + } else if (action == DISMISS_PREDICTION) { logger.log(LAUNCHER_ITEM_DROPPED_ON_DONT_SUGGEST); } } @@ -272,7 +272,11 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList * the action was not performed. */ protected ComponentName performDropAction(View view, ItemInfo info) { - if (mCurrentAccessibilityAction == RECONFIGURE) { + return performDropAction(view, info, mCurrentAccessibilityAction); + } + + private ComponentName performDropAction(View view, ItemInfo info, int action) { + if (action == RECONFIGURE) { int widgetId = getReconfigurableWidgetId(view); if (widgetId != INVALID_APPWIDGET_ID) { mDropTargetHandler.reconfigureWidget(widgetId, info); @@ -313,9 +317,9 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList } @Override - public void onAccessibilityDrop(View view, ItemInfo item) { - doLog(new InstanceIdSequence().newInstanceId(), item); - performDropAction(view, item); + public void onAccessibilityDrop(View view, ItemInfo item, int action) { + doLog(new InstanceIdSequence().newInstanceId(), item, action); + performDropAction(view, item, action); } /** diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java index 643f643274..e16a296947 100644 --- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java +++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java @@ -122,9 +122,12 @@ public class LauncherAccessibilityDelegate extends BaseAccessibilityDelegate Date: Tue, 15 Apr 2025 15:26:56 +0000 Subject: [PATCH 23/24] Disable overlay on Desktop tasks to match existing behaviour. Fix: 406931344 Flag: com.android.launcher3.enable_refactor_task_thumbnail Test: TaskViewModelTest#taskOverlayDisabled_when_OverlayIsEnabledForVisibleDesktopTask Change-Id: Iadf6946e5eb67dc422c20f91f4395baf22c7ed57 --- .../recents/ui/viewmodel/TaskViewModel.kt | 17 +++++++++++------ .../recents/ui/viewmodel/TaskViewModelTest.kt | 11 +++++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/quickstep/src/com/android/quickstep/recents/ui/viewmodel/TaskViewModel.kt b/quickstep/src/com/android/quickstep/recents/ui/viewmodel/TaskViewModel.kt index d5e255df1e..9236f543d8 100644 --- a/quickstep/src/com/android/quickstep/recents/ui/viewmodel/TaskViewModel.kt +++ b/quickstep/src/com/android/quickstep/recents/ui/viewmodel/TaskViewModel.kt @@ -37,6 +37,7 @@ import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.debounce import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.map @@ -82,12 +83,16 @@ class TaskViewModel( } private val overlayEnabled = - combine(recentsViewData.overlayEnabled, recentsViewData.settledFullyVisibleTaskIds) { - isOverlayEnabled, - settledFullyVisibleTaskIds -> - isOverlayEnabled && settledFullyVisibleTaskIds.any { it in taskIds.value } - } - .distinctUntilChanged() + if (taskViewType == TaskViewType.DESKTOP) { + flowOf(false) + } else { + combine(recentsViewData.overlayEnabled, recentsViewData.settledFullyVisibleTaskIds) { + isOverlayEnabled, + settledFullyVisibleTaskIds -> + isOverlayEnabled && settledFullyVisibleTaskIds.any { it in taskIds.value } + } + .distinctUntilChanged() + } val state: Flow = combine(taskData, overlayEnabled, isCentralTask, ::mapToTaskTile) diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/ui/viewmodel/TaskViewModelTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/ui/viewmodel/TaskViewModelTest.kt index 4a3ed280fe..9eb1f11fa7 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/ui/viewmodel/TaskViewModelTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/recents/ui/viewmodel/TaskViewModelTest.kt @@ -294,6 +294,17 @@ class TaskViewModelTest { assertThat(sut.state.first().taskOverlayEnabled).isFalse() } + @Test + fun taskOverlayDisabled_when_OverlayIsEnabledForVisibleDesktopTask() = + testScope.runTest { + sut = createTaskViewModel(TaskViewType.DESKTOP) + sut.bind(TASK_MODEL_1.id) + recentsViewData.overlayEnabled.value = true + recentsViewData.settledFullyVisibleTaskIds.value = setOf(1) + + assertThat(sut.state.first().taskOverlayEnabled).isFalse() + } + @Test fun isCentralTask_when_CentralTaskIdsMatchTaskIds() = testScope.runTest { From 3019338ae90e0a2956144028ea6a228840c9f04f Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Mon, 14 Apr 2025 15:40:18 +0100 Subject: [PATCH 24/24] Use WindowContext in RotationTouchHelper - See the bug on analysis on perfromance regression - Using WindowContext which is able to have updated Resource after configuration change on all displays. Fix: 408988616 Test: manual Flag: EXEMPT refactor Change-Id: I716a78072e77e2a5af11bc595f8d477ca136cc48 --- .../launcher3/dagger/PerDisplayModule.kt | 6 ++-- .../quickstep/RotationTouchHelper.java | 31 +++++++------------ 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/quickstep/src/com/android/launcher3/dagger/PerDisplayModule.kt b/quickstep/src/com/android/launcher3/dagger/PerDisplayModule.kt index 51db1c6648..b3ee903888 100644 --- a/quickstep/src/com/android/launcher3/dagger/PerDisplayModule.kt +++ b/quickstep/src/com/android/launcher3/dagger/PerDisplayModule.kt @@ -103,19 +103,19 @@ object PerDisplayRepositoriesModule { fun provideRotationTouchHandlerRepo( repositoryFactory: PerDisplayInstanceRepositoryImpl.Factory, instanceFactory: RotationTouchHelper.Factory, - @DisplayContext displayContextRepository: PerDisplayRepository, + @WindowContext windowContextRepository: PerDisplayRepository, ): PerDisplayRepository { return if (enableOverviewOnConnectedDisplays()) { repositoryFactory.create( "RotationTouchHelperRepo", { displayId -> - displayContextRepository[displayId]?.let { instanceFactory.create(it) } + windowContextRepository[displayId]?.let { instanceFactory.create(it) } }, ) } else { SingleInstanceRepositoryImpl( "RotationTouchHelperRepo", - instanceFactory.create(displayContextRepository[DEFAULT_DISPLAY]), + instanceFactory.create(windowContextRepository[DEFAULT_DISPLAY]), ) } } diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java index f96330a168..d3951d7621 100644 --- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java +++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java @@ -33,8 +33,7 @@ import android.view.MotionEvent; import android.view.OrientationEventListener; import com.android.app.displaylib.PerDisplayRepository; -import com.android.launcher3.dagger.ApplicationContext; -import com.android.launcher3.dagger.DisplayContext; +import com.android.launcher3.dagger.WindowContext; import com.android.launcher3.testing.shared.TestProtocol; import com.android.launcher3.util.DaggerSingletonObject; import com.android.launcher3.util.DaggerSingletonTracker; @@ -134,35 +133,29 @@ public class RotationTouchHelper implements DisplayInfoChangeListener { */ private boolean mInOverview; private boolean mTaskListFrozen; - private final Context mApplicationContext; + private final Context mWindowContext; @AssistedInject RotationTouchHelper( - @ApplicationContext Context applicationContext, - @Assisted Context displayContext, + @Assisted Context windowContext, DisplayController displayController, SystemUiProxy systemUiProxy, DaggerSingletonTracker lifeCycle) { - mApplicationContext = applicationContext; - mDisplayId = displayContext.getDisplayId(); + mWindowContext = windowContext; + mDisplayId = windowContext.getDisplayId(); mDisplayController = displayController; mSystemUiProxy = systemUiProxy; - Resources resources = mApplicationContext.getResources(); - // TODO(b/408988616): Find a better solution for external display to have resources updated - // after configuration changes. - Context displayAssociatedContext = - mApplicationContext.getAssociatedDisplayId() == mDisplayId - ? mApplicationContext : displayContext; + Resources resources = mWindowContext.getResources(); mOrientationTouchTransformer = new OrientationTouchTransformer(resources, mMode, - () -> QuickStepContract.getWindowCornerRadius(displayAssociatedContext)); + () -> QuickStepContract.getWindowCornerRadius(mWindowContext)); // Register for navigation mode and rotation changes mDisplayController.addChangeListenerForDisplay(this, mDisplayId); DisplayController.Info info = mDisplayController.getInfoForDisplay(mDisplayId); - onDisplayInfoChanged(mApplicationContext, info, CHANGE_ALL); + onDisplayInfoChanged(mWindowContext, info, CHANGE_ALL); - mOrientationListener = new OrientationEventListener(mApplicationContext) { + mOrientationListener = new OrientationEventListener(mWindowContext) { @Override public void onOrientationChanged(int degrees) { int newRotation = RecentsOrientedState.getRotationForUserDegreesRotated(degrees, @@ -270,7 +263,7 @@ public class RotationTouchHelper implements DisplayInfoChangeListener { NavigationMode newMode = info.getNavigationMode(); mOrientationTouchTransformer.setNavigationMode(newMode, mDisplayController.getInfoForDisplay(mDisplayId), - mApplicationContext.getResources()); + mWindowContext.getResources()); TaskStackChangeListeners.getInstance() .unregisterTaskStackListener(mFrozenTaskListener); @@ -292,7 +285,7 @@ public class RotationTouchHelper implements DisplayInfoChangeListener { void setGesturalHeight(int newGesturalHeight) { mOrientationTouchTransformer.setGesturalHeight( newGesturalHeight, mDisplayController.getInfoForDisplay(mDisplayId), - mApplicationContext.getResources()); + mWindowContext.getResources()); } /** @@ -403,6 +396,6 @@ public class RotationTouchHelper implements DisplayInfoChangeListener { @AssistedFactory public interface Factory { /** Creates a new instance of [RotationTouchHelper] for a given [context]. */ - RotationTouchHelper create(@DisplayContext Context context); + RotationTouchHelper create(@WindowContext Context context); } }