Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
parent 8c744e0114 5239997d64
commit 3e26dcb550
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/view/FloatingActionMode.java
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);
} }