diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-10-26 11:40:35 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-10-26 13:14:03 -0700 |
commit | 35fe7be54e4c9b47598130f5234ea96c4dc16229 (patch) | |
tree | 70d58d380e297ba76227c350c926bbe70c414f45 /src/com/android/launcher3 | |
parent | d1f034708b591f0648f2a8ad47b6e857cd328e52 (diff) | |
download | android_packages_apps_Trebuchet-35fe7be54e4c9b47598130f5234ea96c4dc16229.tar.gz android_packages_apps_Trebuchet-35fe7be54e4c9b47598130f5234ea96c4dc16229.tar.bz2 android_packages_apps_Trebuchet-35fe7be54e4c9b47598130f5234ea96c4dc16229.zip |
Removing some deprecated code around page layers
1) setChildrenDrawnWithCacheEnabled: deprecated
2) Removing custom logic based on isHardwareAccelerated. This check was not being
used consistantly everywhere
Bug: 29761236
Change-Id: Ic4a9c764f154497e376e37de2351fe04d1b48500
Diffstat (limited to 'src/com/android/launcher3')
-rw-r--r-- | src/com/android/launcher3/CellLayout.java | 10 | ||||
-rw-r--r-- | src/com/android/launcher3/ShortcutAndWidgetContainer.java | 24 | ||||
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 53 |
3 files changed, 2 insertions, 85 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 5c7ea767c..979c9508b 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -930,16 +930,6 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { return getMeasuredWidth() - getPaddingLeft() - getPaddingRight() - (mCountX * mCellWidth); } - @Override - protected void setChildrenDrawingCacheEnabled(boolean enabled) { - mShortcutsAndWidgets.setChildrenDrawingCacheEnabled(enabled); - } - - @Override - protected void setChildrenDrawnWithCacheEnabled(boolean enabled) { - mShortcutsAndWidgets.setChildrenDrawnWithCacheEnabled(enabled); - } - public float getBackgroundAlpha() { return mBackgroundAlpha; } diff --git a/src/com/android/launcher3/ShortcutAndWidgetContainer.java b/src/com/android/launcher3/ShortcutAndWidgetContainer.java index 37cbf9846..c8bb79306 100644 --- a/src/com/android/launcher3/ShortcutAndWidgetContainer.java +++ b/src/com/android/launcher3/ShortcutAndWidgetContainer.java @@ -201,28 +201,4 @@ public class ShortcutAndWidgetContainer extends ViewGroup { child.cancelLongPress(); } } - - @Override - protected void setChildrenDrawingCacheEnabled(boolean enabled) { - final int count = getChildCount(); - for (int i = 0; i < count; i++) { - final View view = getChildAt(i); - view.setDrawingCacheEnabled(enabled); - // Update the drawing caches - if (!view.isHardwareAccelerated() && enabled) { - view.buildDrawingCache(true); - } - } - } - - protected void setChildrenDrawnWithCacheEnabled(boolean enabled) { - super.setChildrenDrawnWithCacheEnabled(enabled); - } - - @Override - public void setLayerType(int layerType, Paint paint) { - // When clip children is disabled do not use hardware layer, - // as hardware layer forces clip children. - super.setLayerType(getClipChildren() ? layerType : LAYER_TYPE_NONE, paint); - } } diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index b88ffd913..f9bda75cb 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -500,7 +500,6 @@ public class Workspace extends PagedView setWillNotDraw(false); setClipChildren(false); setClipToPadding(false); - setChildrenDrawnWithCacheEnabled(true); setMinScale(mOverviewModeShrinkFactor); setupLayoutTransition(); @@ -1312,29 +1311,12 @@ public class Workspace extends PagedView protected void onPageBeginMoving() { super.onPageBeginMoving(); - - if (isHardwareAccelerated()) { - updateChildrenLayersEnabled(false); - } else { - if (mNextPage != INVALID_PAGE) { - // we're snapping to a particular screen - enableChildrenCache(mCurrentPage, mNextPage); - } else { - // this is when user is actively dragging a particular screen, they might - // swipe it either left or right (but we won't advance by more than one screen) - enableChildrenCache(mCurrentPage - 1, mCurrentPage + 1); - } - } + updateChildrenLayersEnabled(false); } protected void onPageEndMoving() { super.onPageEndMoving(); - - if (isHardwareAccelerated()) { - updateChildrenLayersEnabled(false); - } else { - clearChildrenCache(); - } + updateChildrenLayersEnabled(false); if (mDragController.isDragging()) { if (workspaceInModalState()) { @@ -1872,37 +1854,6 @@ public class Workspace extends PagedView return mState != State.NORMAL; } - void enableChildrenCache(int fromPage, int toPage) { - if (fromPage > toPage) { - final int temp = fromPage; - fromPage = toPage; - toPage = temp; - } - - final int screenCount = getChildCount(); - - fromPage = Math.max(fromPage, 0); - toPage = Math.min(toPage, screenCount - 1); - - for (int i = fromPage; i <= toPage; i++) { - final CellLayout layout = (CellLayout) getChildAt(i); - layout.setChildrenDrawnWithCacheEnabled(true); - layout.setChildrenDrawingCacheEnabled(true); - } - } - - void clearChildrenCache() { - final int screenCount = getChildCount(); - for (int i = 0; i < screenCount; i++) { - final CellLayout layout = (CellLayout) getChildAt(i); - layout.setChildrenDrawnWithCacheEnabled(false); - // In software mode, we don't want the items to continue to be drawn into bitmaps - if (!isHardwareAccelerated()) { - layout.setChildrenDrawingCacheEnabled(false); - } - } - } - @Thunk void updateChildrenLayersEnabled(boolean force) { boolean small = mState == State.OVERVIEW || mIsSwitchingState; boolean enableChildrenLayers = force || small || mAnimatingViewIntoPlace || isPageMoving(); |