Merge "Fix floating toolbar flicker in ExtractEditText mode." into mnc-dev

This commit is contained in:
Abodunrinwa Toki
2015-06-30 16:53:23 +00:00
committed by Android (Google) Code Review

View File

@@ -167,6 +167,7 @@ public class FloatingActionMode extends ActionMode {
// Content rect is moving. // Content rect is moving.
mOriginatingView.removeCallbacks(mMovingOff); mOriginatingView.removeCallbacks(mMovingOff);
mFloatingToolbarVisibilityHelper.setMoving(true); mFloatingToolbarVisibilityHelper.setMoving(true);
mFloatingToolbarVisibilityHelper.updateToolbarVisibility();
mOriginatingView.postDelayed(mMovingOff, MOVING_HIDE_DELAY); mOriginatingView.postDelayed(mMovingOff, MOVING_HIDE_DELAY);
mFloatingToolbar.setContentRect(mContentRectOnWindow); mFloatingToolbar.setContentRect(mContentRectOnWindow);
@@ -174,9 +175,9 @@ public class FloatingActionMode extends ActionMode {
} }
} else { } else {
mFloatingToolbarVisibilityHelper.setOutOfBounds(true); mFloatingToolbarVisibilityHelper.setOutOfBounds(true);
mFloatingToolbarVisibilityHelper.updateToolbarVisibility();
mContentRectOnWindow.setEmpty(); mContentRectOnWindow.setEmpty();
} }
mFloatingToolbarVisibilityHelper.updateToolbarVisibility();
mPreviousContentRectOnWindow.set(mContentRectOnWindow); mPreviousContentRectOnWindow.set(mContentRectOnWindow);
} }