Fixing drop target area, and adding bg color indicators.

- Merging wallpaper fix and PagedViewIconCache key fix

Change-Id: I2a65bc4b642f020dfc4d2223a36d3ebcf41de5f5
This commit is contained in:
Winson Chung
2011-06-12 15:15:29 -07:00
parent f0ea4d3378
commit 61fa4197c4
12 changed files with 176 additions and 78 deletions

View File

@@ -17,9 +17,6 @@
package com.android.launcher2;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
import android.util.AttributeSet;
import android.view.View;
import android.widget.FrameLayout;
@@ -38,8 +35,8 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D
private boolean mIsSearchBarHidden;
private View mQSBSearchBar;
private View mDropTargetBar;
private IconDropTarget mInfoDropTarget;
private IconDropTarget mDeleteDropTarget;
private ButtonDropTarget mInfoDropTarget;
private ButtonDropTarget mDeleteDropTarget;
public SearchDropTargetBar(Context context, AttributeSet attrs) {
this(context, attrs, 0);
@@ -57,6 +54,7 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D
dragController.addDropTarget(mDeleteDropTarget);
mInfoDropTarget.setLauncher(launcher);
mDeleteDropTarget.setLauncher(launcher);
mDropTargetBar.setBackgroundColor(0x33000000);
}
@Override
@@ -66,8 +64,8 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D
// Get the individual components
mQSBSearchBar = findViewById(R.id.qsb_search_bar);
mDropTargetBar = findViewById(R.id.drag_target_bar);
mInfoDropTarget = (IconDropTarget) mDropTargetBar.findViewById(R.id.info_target);
mDeleteDropTarget = (IconDropTarget) mDropTargetBar.findViewById(R.id.delete_target);
mInfoDropTarget = (ButtonDropTarget) mDropTargetBar.findViewById(R.id.info_target);
mDeleteDropTarget = (ButtonDropTarget) mDropTargetBar.findViewById(R.id.delete_target);
}
/*