From ee7c1d8dc223381d4c3afce5fdbd8dc6f78091f3 Mon Sep 17 00:00:00 2001 From: Michael Jurka Date: Wed, 18 Apr 2012 15:25:08 -0700 Subject: [PATCH] Setting alpha/hardware layers directly in All Apps Changing it so that PagedViewCellLayout has alpha and hardware layers set directly on itself rather than its child view --- src/com/android/launcher2/PagedViewCellLayout.java | 9 ++------- .../android/launcher2/PagedViewCellLayoutChildren.java | 7 ------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/com/android/launcher2/PagedViewCellLayout.java b/src/com/android/launcher2/PagedViewCellLayout.java index 58b87dc8e0..9e5452be3b 100644 --- a/src/com/android/launcher2/PagedViewCellLayout.java +++ b/src/com/android/launcher2/PagedViewCellLayout.java @@ -86,20 +86,15 @@ public class PagedViewCellLayout extends ViewGroup implements Page { return mCellHeight; } - @Override - public void setAlpha(float alpha) { - mChildren.setAlpha(alpha); - } - void destroyHardwareLayers() { // called when a page is no longer visible (triggered by loadAssociatedPages -> // removeAllViewsOnPage) - mChildren.destroyHardwareLayer(); + setLayerType(LAYER_TYPE_NONE, null); } void createHardwareLayers() { // called when a page is visible (triggered by loadAssociatedPages -> syncPageItems) - mChildren.createHardwareLayer(); + setLayerType(LAYER_TYPE_HARDWARE, null); } @Override diff --git a/src/com/android/launcher2/PagedViewCellLayoutChildren.java b/src/com/android/launcher2/PagedViewCellLayoutChildren.java index eaef682bbe..187a22d556 100644 --- a/src/com/android/launcher2/PagedViewCellLayoutChildren.java +++ b/src/com/android/launcher2/PagedViewCellLayoutChildren.java @@ -141,13 +141,6 @@ public class PagedViewCellLayoutChildren extends ViewGroup { } } - void destroyHardwareLayer() { - setLayerType(LAYER_TYPE_NONE, null); - } - void createHardwareLayer() { - setLayerType(LAYER_TYPE_HARDWARE, null); - } - public void enableCenteredContent(boolean enabled) { mCenterContent = enabled; }