summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/Cling.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-09-19 11:49:12 -0700
committerWinson Chung <winsonc@google.com>2011-09-19 16:06:37 -0700
commit9d9d74f2b0927b9b28ac70d453c046d48788b57b (patch)
treead6f4bd1a576f0e1a71a42ddffe7cf8c18e3b332 /src/com/android/launcher2/Cling.java
parentff648b5512d1af9f5863aa97677a7a3e108ad1dd (diff)
downloadandroid_packages_apps_Trebuchet-9d9d74f2b0927b9b28ac70d453c046d48788b57b.tar.gz
android_packages_apps_Trebuchet-9d9d74f2b0927b9b28ac70d453c046d48788b57b.tar.bz2
android_packages_apps_Trebuchet-9d9d74f2b0927b9b28ac70d453c046d48788b57b.zip
Launcher tweaks.
- Updating search bar bg - Removing clings from the layout if they are already dismissed - Tweaking cling description paddings for languages that are more verbase - Tweaking wallpaper picker gallery spacing Change-Id: I801cdf4b1d0cc49a53113318d7b9075f6fa218bd
Diffstat (limited to 'src/com/android/launcher2/Cling.java')
-rw-r--r--src/com/android/launcher2/Cling.java15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/com/android/launcher2/Cling.java b/src/com/android/launcher2/Cling.java
index 4f37cb9e0..09c5062ae 100644
--- a/src/com/android/launcher2/Cling.java
+++ b/src/com/android/launcher2/Cling.java
@@ -62,10 +62,6 @@ public class Cling extends FrameLayout {
private Paint mErasePaint;
- private View mWorkspaceDesc1;
- private View mWorkspaceDesc2;
- private View mAllAppsDesc;
-
public Cling(Context context) {
this(context, null, 0);
}
@@ -98,10 +94,6 @@ public class Cling extends FrameLayout {
r.getDimensionPixelSize(R.dimen.toolbar_button_horizontal_padding);
mButtonBarHeight = r.getDimensionPixelSize(R.dimen.button_bar_height);
- mWorkspaceDesc1 = findViewById(R.id.workspace_cling_move_item);
- mWorkspaceDesc2 = findViewById(R.id.workspace_cling_open_all_apps);
- mAllAppsDesc = findViewById(R.id.all_apps_cling_add_item);
-
mErasePaint = new Paint();
mErasePaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.MULTIPLY));
mErasePaint.setColor(0xFFFFFF);
@@ -140,11 +132,6 @@ public class Cling extends FrameLayout {
double diff = Math.sqrt(Math.pow(event.getX() - pos[0], 2) +
Math.pow(event.getY() - pos[1], 2));
if (diff < mRevealRadius) {
- if (mDrawIdentifier.equals(WORKSPACE_PORTRAIT)) {
- // Do nothing
- } else if (mDrawIdentifier.equals(ALLAPPS_PORTRAIT)) {
- // Do nothing
- }
return false;
}
} else if (mDrawIdentifier.equals(FOLDER_PORTRAIT) ||
@@ -167,7 +154,7 @@ public class Cling extends FrameLayout {
DisplayMetrics metrics = new DisplayMetrics();
mLauncher.getWindowManager().getDefaultDisplay().getMetrics(metrics);
- // Draw the background
+ // Initialize the draw buffer (to allow punching through)
Bitmap b = Bitmap.createBitmap(getMeasuredWidth(), getMeasuredHeight(),
Bitmap.Config.ARGB_8888);
Canvas c = new Canvas(b);