Merge "Fix menu visibility while updating dismiss fraction." into oc-dev

am: 3f2bbcbe92

Change-Id: I748b00c12872baa61280a20d354da49766fcf837
This commit is contained in:
Winson Chung
2017-04-03 19:26:31 +00:00
committed by android-build-merger

View File

@@ -417,17 +417,17 @@ public class PipMenuActivity extends Activity {
} }
private void updateDismissFraction(float fraction) { private void updateDismissFraction(float fraction) {
setDecorViewVisibility(true);
int alpha; int alpha;
if (mMenuVisible) { if (mMenuVisible) {
mMenuContainer.setAlpha(1-fraction); mMenuContainer.setAlpha(1 - fraction);
final float interpolatedAlpha = final float interpolatedAlpha =
MENU_BACKGROUND_ALPHA * (1.0f - fraction) + DISMISS_BACKGROUND_ALPHA * fraction; MENU_BACKGROUND_ALPHA * (1.0f - fraction) + DISMISS_BACKGROUND_ALPHA * fraction;
alpha = (int) (interpolatedAlpha*255); alpha = (int) (interpolatedAlpha * 255);
} else { } else {
alpha = (int) (fraction*DISMISS_BACKGROUND_ALPHA*255); alpha = (int) (fraction * DISMISS_BACKGROUND_ALPHA * 255);
} }
mBackgroundDrawable.setAlpha(alpha); mBackgroundDrawable.setAlpha(alpha);
setDecorViewVisibility(alpha > 0);
} }
private void notifyRegisterInputConsumer() { private void notifyRegisterInputConsumer() {