diff --git a/quickstep/res/layout/transient_taskbar.xml b/quickstep/res/layout/transient_taskbar.xml index 47d63e728c..62c69336e7 100644 --- a/quickstep/res/layout/transient_taskbar.xml +++ b/quickstep/res/layout/transient_taskbar.xml @@ -26,6 +26,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" + android:focusable="true" + android:importantForAccessibility="yes" android:forceHasOverlappingRendering="false" android:layout_gravity="bottom" android:layout_marginBottom="@dimen/transient_taskbar_bottom_margin" diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java index 41d35cfd3e..b98f172e9b 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java @@ -600,7 +600,11 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba if (!mIsStashed) { tryStartTaskbarTimeout(); } - mControllers.taskbarViewController.announceForAccessibility(); + + // only announce if we are actually animating + if (duration > 0 && isInApp()) { + mControllers.taskbarViewController.announceForAccessibility(); + } } }); } diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java index 47396a530f..0c19e4bab1 100644 --- a/src/com/android/launcher3/InvariantDeviceProfile.java +++ b/src/com/android/launcher3/InvariantDeviceProfile.java @@ -1144,7 +1144,7 @@ public class InvariantDeviceProfile { transientTaskbarIconSize[INDEX_DEFAULT]); transientTaskbarIconSize[INDEX_TWO_PANEL_PORTRAIT] = a.getFloat( R.styleable.ProfileDisplayOption_transientTaskbarIconSizeTwoPanelPortrait, - hotseatQsbSpace[INDEX_DEFAULT]); + transientTaskbarIconSize[INDEX_DEFAULT]); a.recycle(); } diff --git a/src/com/android/launcher3/views/ActivityContext.java b/src/com/android/launcher3/views/ActivityContext.java index 10f40b7124..a6744fb02a 100644 --- a/src/com/android/launcher3/views/ActivityContext.java +++ b/src/com/android/launcher3/views/ActivityContext.java @@ -324,8 +324,9 @@ public interface ActivityContext { Bundle optsBundle = null; if (v != null) { optsBundle = getActivityLaunchOptions(v, item).toBundle(); - } else if (item != null && item.animationType == LauncherSettings.Animation.DEFAULT_NO_ICON - && Utilities.ATLEAST_T) { + } else if (android.os.Build.VERSION.SDK_INT >= 33 + && item != null + && item.animationType == LauncherSettings.Animation.DEFAULT_NO_ICON) { optsBundle = ActivityOptions.makeBasic() .setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_SOLID_COLOR).toBundle(); } diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java index c3633db11f..4d0e2aff2d 100644 --- a/src/com/android/launcher3/views/FloatingIconView.java +++ b/src/com/android/launcher3/views/FloatingIconView.java @@ -80,7 +80,6 @@ public class FloatingIconView extends FrameLayout implements public static final float SHAPE_PROGRESS_DURATION = 0.10f; private static final RectF sTmpRectF = new RectF(); - private static final Object[] sTmpObjArray = new Object[1]; private Runnable mEndRunnable; private CancellationSignal mLoadIconSignal; @@ -289,12 +288,13 @@ public class FloatingIconView extends FrameLayout implements } else { int width = (int) pos.width(); int height = (int) pos.height(); + Object[] tmpObjArray = new Object[1]; if (supportsAdaptiveIcons) { boolean shouldThemeIcon = btvIcon instanceof FastBitmapDrawable && ((FastBitmapDrawable) btvIcon).isThemed(); - drawable = getFullDrawable(l, info, width, height, shouldThemeIcon, sTmpObjArray); + drawable = getFullDrawable(l, info, width, height, shouldThemeIcon, tmpObjArray); if (drawable instanceof AdaptiveIconDrawable) { - badge = getBadge(l, info, sTmpObjArray[0]); + badge = getBadge(l, info, tmpObjArray[0]); } else { // The drawable we get back is not an adaptive icon, so we need to use the // BubbleTextView icon that is already legacy treated. @@ -306,7 +306,7 @@ public class FloatingIconView extends FrameLayout implements drawable = btvIcon; } else { drawable = getFullDrawable(l, info, width, height, true /* shouldThemeIcon */, - sTmpObjArray); + tmpObjArray); } } } @@ -679,7 +679,6 @@ public class FloatingIconView extends FrameLayout implements mOriginalIcon = null; mOnTargetChangeRunnable = null; mBadge = null; - sTmpObjArray[0] = null; sRecycledFetchIconId = sFetchIconId; mIconLoadResult = null; mClipIconView.recycle();