Merge "Disable drag handle." into rvc-dev
This commit is contained in:
@@ -110,6 +110,8 @@ public class PipMenuActivity extends Activity {
|
|||||||
|
|
||||||
private static final float DISABLED_ACTION_ALPHA = 0.54f;
|
private static final float DISABLED_ACTION_ALPHA = 0.54f;
|
||||||
|
|
||||||
|
private static final boolean ENABLE_RESIZE_HANDLE = false;
|
||||||
|
|
||||||
private int mMenuState;
|
private int mMenuState;
|
||||||
private boolean mResize = true;
|
private boolean mResize = true;
|
||||||
private boolean mAllowMenuTimeout = true;
|
private boolean mAllowMenuTimeout = true;
|
||||||
@@ -388,7 +390,8 @@ public class PipMenuActivity extends Activity {
|
|||||||
ObjectAnimator dismissAnim = ObjectAnimator.ofFloat(mDismissButton, View.ALPHA,
|
ObjectAnimator dismissAnim = ObjectAnimator.ofFloat(mDismissButton, View.ALPHA,
|
||||||
mDismissButton.getAlpha(), 1f);
|
mDismissButton.getAlpha(), 1f);
|
||||||
ObjectAnimator resizeAnim = ObjectAnimator.ofFloat(mResizeHandle, View.ALPHA,
|
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);
|
? 1f : 0f);
|
||||||
if (menuState == MENU_STATE_FULL) {
|
if (menuState == MENU_STATE_FULL) {
|
||||||
mMenuContainerAnimator.playTogether(menuAnim, settingsAnim, dismissAnim,
|
mMenuContainerAnimator.playTogether(menuAnim, settingsAnim, dismissAnim,
|
||||||
|
|||||||
Reference in New Issue
Block a user