summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-04-18 15:25:08 -0700
committerMichael Jurka <mikejurka@google.com>2012-04-18 15:25:08 -0700
commitee7c1d8dc223381d4c3afce5fdbd8dc6f78091f3 (patch)
tree2a2c4b0d44431042a0d1c8e96b33cae146b9ff02
parent336d491492ae15cc97aebb2f9b263c8ec3718dcb (diff)
downloadandroid_packages_apps_Trebuchet-ee7c1d8dc223381d4c3afce5fdbd8dc6f78091f3.tar.gz
android_packages_apps_Trebuchet-ee7c1d8dc223381d4c3afce5fdbd8dc6f78091f3.tar.bz2
android_packages_apps_Trebuchet-ee7c1d8dc223381d4c3afce5fdbd8dc6f78091f3.zip
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
-rw-r--r--src/com/android/launcher2/PagedViewCellLayout.java9
-rw-r--r--src/com/android/launcher2/PagedViewCellLayoutChildren.java7
2 files changed, 2 insertions, 14 deletions
diff --git a/src/com/android/launcher2/PagedViewCellLayout.java b/src/com/android/launcher2/PagedViewCellLayout.java
index 58b87dc8e..9e5452be3 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 eaef682bb..187a22d55 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;
}