Merge "Fix floating toolbar flicker in ExtractEditText mode." into mnc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
685a14468e
@@ -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);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user