Remove scrim on highlighted spring-loaded panel.

Bug: 27135377
Change-Id: I470955ed082a45ae7dc5f8fdd1f3decb2b573dbc
This commit is contained in:
Tony Wickham
2016-02-18 14:37:07 -08:00
parent 16466f1bbb
commit 95cdb3a021
7 changed files with 51 additions and 9 deletions
+12 -2
View File
@@ -149,7 +149,7 @@ public class Workspace extends PagedView
*/
@Thunk CellLayout mDragTargetLayout = null;
/**
* The CellLayout that we will show as glowing
* The CellLayout that we will show as highlighted
*/
private CellLayout mDragOverlappingLayout = null;
@@ -1421,6 +1421,10 @@ public class Workspace extends PagedView
mWallpaperOffset.syncWithScroll();
}
public void computeScrollWithoutInvalidation() {
computeScrollHelper(false);
}
@Override
protected void determineScrollingStart(MotionEvent ev, float touchSlopScale) {
if (!isSwitchingState()) {
@@ -2836,7 +2840,13 @@ public class Workspace extends PagedView
if (mDragOverlappingLayout != null) {
mDragOverlappingLayout.setIsDragOverlapping(true);
}
invalidate();
// Invalidating the scrim will also force this CellLayout
// to be invalidated so that it is highlighted if necessary.
mLauncher.getDragLayer().invalidateScrim();
}
public CellLayout getCurrentDragOverlappingLayout() {
return mDragOverlappingLayout;
}
void setCurrentDropOverCell(int x, int y) {