commit b17e140a07039604a33209ad2555a5586565cd37
author Patrick Dubroy <dubroy@google.com> Thu Jan 20 13:30:29 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 20 13:30:29 2011 -0800
tree 2bcbc3c55d5a6a7064a11b04e601cd10250716ad
parent 378fc245b35961adacf98bac41ae080b30cb4418
parent e3887cc4ec3cebda2333298e56a35acb49ccdf13

Merge "Ensure drag outline & crosshairs disappear on drag cancel" into honeycomb

src/com/android/launcher2/CellLayout.java

diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index 02ee950..49ae652 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -53,7 +53,7 @@
 
 import java.util.Arrays;
 
-public class CellLayout extends ViewGroup implements Dimmable, VisibilityChangedListener {
+public class CellLayout extends ViewGroup implements VisibilityChangedListener {
     static final String TAG = "CellLayout";
 
     private int mCellWidth;
@@ -568,20 +568,6 @@
         }
     }
 
-    public void setDimmableProgress(float progress) {
-        for (int i = 0; i < getChildCount(); i++) {
-            Dimmable d = (Dimmable) getChildAt(i);
-            d.setDimmableProgress(progress);
-        }
-    }
-
-    public float getDimmableProgress() {
-        if (getChildCount() > 0) {
-            return ((Dimmable) getChildAt(0)).getDimmableProgress();
-        }
-        return 0.0f;
-    }
-
     @Override
     public void cancelLongPress() {
         super.cancelLongPress();

src/com/android/launcher2/Dimmable.java

diff --git a/src/com/android/launcher2/Dimmable.java b/src/com/android/launcher2/Dimmable.java
deleted file mode 100644
index df43b3c..0000000
--- a/src/com/android/launcher2/Dimmable.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.android.launcher2;
-
-public interface Dimmable {
-    public void setDimmableProgress(float progress);
-    public float getDimmableProgress();
-}

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 8255ded..f381b1f 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1347,7 +1347,7 @@
         View v = hostView.findViewById(appWidgetInfo.autoAdvanceViewId);
         if (v instanceof Advanceable) {
             mWidgetsToAdvance.put(hostView, appWidgetInfo);
-            ((Advanceable) v).willBeAdvancedByHost();
+            ((Advanceable) v).fyiWillBeAdvancedByHostKThx();
             updateRunning();
         }
     }