Merge "Disable drag handle." into rvc-dev am: 79554c081d

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

Change-Id: I459098e94a0601ade33ec5d1d88fb070bba67f32
This commit is contained in:
Ben Lin
2020-06-19 18:30:17 +00:00
committed by Automerger Merge Worker

View File

@@ -110,6 +110,8 @@ public class PipMenuActivity extends Activity {
private static final float DISABLED_ACTION_ALPHA = 0.54f;
private static final boolean ENABLE_RESIZE_HANDLE = false;
private int mMenuState;
private boolean mResize = true;
private boolean mAllowMenuTimeout = true;
@@ -388,7 +390,8 @@ public class PipMenuActivity extends Activity {
ObjectAnimator dismissAnim = ObjectAnimator.ofFloat(mDismissButton, View.ALPHA,
mDismissButton.getAlpha(), 1f);
ObjectAnimator resizeAnim = ObjectAnimator.ofFloat(mResizeHandle, View.ALPHA,
mResizeHandle.getAlpha(), menuState == MENU_STATE_CLOSE && showResizeHandle
mResizeHandle.getAlpha(),
ENABLE_RESIZE_HANDLE && menuState == MENU_STATE_CLOSE && showResizeHandle
? 1f : 0f);
if (menuState == MENU_STATE_FULL) {
mMenuContainerAnimator.playTogether(menuAnim, settingsAnim, dismissAnim,