diff options
| author | Winson Chung <winsonc@google.com> | 2011-06-12 15:15:29 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2011-06-13 11:51:18 -0700 |
| commit | 61fa4197c4316bb0f9b05fcefb676f86197a2273 (patch) | |
| tree | f65b772ab5f47288734edab35fdb5d8f0fabf7b9 /src/com/android/launcher2/SearchDropTargetBar.java | |
| parent | f0ea4d3378be7b962c8e0bce2392df5e82491fb8 (diff) | |
| download | android_packages_apps_Trebuchet-61fa4197c4316bb0f9b05fcefb676f86197a2273.tar.gz android_packages_apps_Trebuchet-61fa4197c4316bb0f9b05fcefb676f86197a2273.tar.bz2 android_packages_apps_Trebuchet-61fa4197c4316bb0f9b05fcefb676f86197a2273.zip | |
Fixing drop target area, and adding bg color indicators.
- Merging wallpaper fix and PagedViewIconCache key fix
Change-Id: I2a65bc4b642f020dfc4d2223a36d3ebcf41de5f5
Diffstat (limited to 'src/com/android/launcher2/SearchDropTargetBar.java')
| -rw-r--r-- | src/com/android/launcher2/SearchDropTargetBar.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/com/android/launcher2/SearchDropTargetBar.java b/src/com/android/launcher2/SearchDropTargetBar.java index 5ab28ea4a..d00e2103f 100644 --- a/src/com/android/launcher2/SearchDropTargetBar.java +++ b/src/com/android/launcher2/SearchDropTargetBar.java @@ -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); } /* |