From 9a70e1c9b4f8d91437421a7c8b471feb4a6ffdde Mon Sep 17 00:00:00 2001 From: Sean Pont Date: Tue, 16 Jun 2020 09:41:41 -0700 Subject: Remove systemExclusionZone when only 1 card shown Fixes: 158721734 Test: manual Test: atest QuickAccessWalletRoboTests Change-Id: Icd4b850b64d97ffbb21080692836dff45d0d0d06 --- .../systemui/plugin/globalactions/wallet/WalletCardCarousel.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/com/android/systemui/plugin/globalactions/wallet/WalletCardCarousel.java b/src/com/android/systemui/plugin/globalactions/wallet/WalletCardCarousel.java index 10f2205..1a27acc 100644 --- a/src/com/android/systemui/plugin/globalactions/wallet/WalletCardCarousel.java +++ b/src/com/android/systemui/plugin/globalactions/wallet/WalletCardCarousel.java @@ -20,8 +20,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.content.Context; import android.graphics.Rect; -import android.os.Build.VERSION; -import android.os.Build.VERSION_CODES; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.view.HapticFeedbackConstants; @@ -136,7 +134,7 @@ class WalletCardCarousel extends RecyclerView { protected void onLayout(boolean changed, int left, int top, int right, int bottom) { super.onLayout(changed, left, top, right, bottom); int width = getWidth(); - if (VERSION.SDK_INT >= VERSION_CODES.Q) { + if (mWalletCardAdapter.getItemCount() > 1) { // Whole carousel is opted out from system gesture. mSystemGestureExclusionZone.set(0, 0, width, getHeight()); setSystemGestureExclusionRects(Collections.singletonList(mSystemGestureExclusionZone)); -- cgit v1.2.3