am 5239997d: am 685a1446: Merge "Fix floating toolbar flicker in ExtractEditText mode." into mnc-dev

* commit '5239997d646cb3e5d146db3794e7015f35943fa1':
  Fix floating toolbar flicker in ExtractEditText mode.
This commit is contained in:
Abodunrinwa Toki
2015-06-30 17:23:41 +00:00
committed by Android Git Automerger

View File

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