Merge "Do not show buttons in screen pinning dialog on tablets" into sc-v2-dev am: 03ac8eea53 am: 0bc6757b9b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16429456

Change-Id: I2d67a2b4d372591394173b0069fbee30294e307a
This commit is contained in:
TreeHugger Robot
2021-12-09 22:21:59 +00:00
committed by Automerger Merge Worker

View File

@@ -16,6 +16,7 @@
package com.android.systemui.recents;
import static com.android.systemui.shared.recents.utilities.Utilities.isTablet;
import static com.android.systemui.util.leak.RotationUtils.ROTATION_LANDSCAPE;
import static com.android.systemui.util.leak.RotationUtils.ROTATION_NONE;
import static com.android.systemui.util.leak.RotationUtils.ROTATION_SEASCAPE;
@@ -248,8 +249,8 @@ public class ScreenPinningRequest implements View.OnClickListener,
.setLayoutDirection(View.LAYOUT_DIRECTION_LOCALE);
View buttons = mLayout.findViewById(R.id.screen_pinning_buttons);
WindowManagerWrapper wm = WindowManagerWrapper.getInstance();
if (!QuickStepContract.isGesturalMode(mNavBarMode)
&& wm.hasSoftNavigationBar(mContext.getDisplayId())) {
if (!QuickStepContract.isGesturalMode(mNavBarMode)
&& wm.hasSoftNavigationBar(mContext.getDisplayId()) && !isTablet(mContext)) {
buttons.setLayoutDirection(View.LAYOUT_DIRECTION_LOCALE);
swapChildrenIfRtlAndVertical(buttons);
} else {