removing DimmableBubbleTextView and DimmableAppWidgetHostView
- use of DimmableBubbleTextView might also be causing NPE on user machines
diff --git a/src/com/android/launcher2/DimmableAppWidgetHostView.java b/src/com/android/launcher2/DimmableAppWidgetHostView.java
deleted file mode 100644
index 1f512a3..0000000
--- a/src/com/android/launcher2/DimmableAppWidgetHostView.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher2;
-
-import com.android.launcher.R;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.view.View;
-
-public class DimmableAppWidgetHostView extends LauncherAppWidgetHostView implements Dimmable {
- public DimmableAppWidgetHostView(Context context) {
- super(context);
- mPaint.setFilterBitmap(true);
- }
-
- private final Paint mPaint = new Paint();
- private Bitmap mDimmedView;
- private Canvas mDimmedViewCanvas;
- private boolean isDimmedViewUpdatePass;
- private float mDimmableProgress;
-
- private void setChildAlpha(float alpha) {
- if (getChildCount() > 0) {
- final View child = getChildAt(0);
- if (child.getAlpha() != alpha) {
- getChildAt(0).setAlpha(alpha);
- }
- }
- }
-
- private void updateChildAlpha() {
- // hacky, but sometimes widgets get their alpha set back to 1.0f, so we call
- // this to force them back
- setChildAlpha(getAlpha());
- }
-
- //@Override
- public boolean onSetAlpha(int alpha) {
- super.onSetAlpha(alpha);
- return true;
- }
-
- public void setDimmableProgress(float progress) {
- mDimmableProgress = progress;
- }
-
- public float getDimmableProgress() {
- return mDimmableProgress;
- }
-
- private void updateDimmedView() {
- if (mDimmedView == null) {
- mDimmedView = Bitmap.createBitmap(getMeasuredWidth(), getMeasuredHeight(),
- Bitmap.Config.ARGB_8888);
- mDimmedViewCanvas = new Canvas(mDimmedView);
- }
- mDimmedViewCanvas.drawColor(0x00000000);
- mDimmedViewCanvas.concat(getMatrix());
- isDimmedViewUpdatePass = true;
- draw(mDimmedViewCanvas);
- // make the bitmap look "dimmed"
- int dimmedColor = getContext().getResources().getColor(R.color.dimmed_view_color);
- mDimmedViewCanvas.drawColor(dimmedColor, PorterDuff.Mode.SRC_IN);
- isDimmedViewUpdatePass = false;
- invalidate();
- }
-
- @Override
- protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
- super.onLayout(changed, left, top, right, bottom);
-
- if (mDimmedView == null && mDimmableProgress > 0.0f) {
- updateDimmedView();
- }
- }
-
- @Override
- public void dispatchDraw(Canvas canvas) {
- if (isDimmedViewUpdatePass) {
- final float alpha = getAlpha();
- canvas.save();
- setAlpha(1.0f);
- super.dispatchDraw(canvas);
- canvas.restore();
- setAlpha(alpha);
- } else {
- if (mDimmedView != null && mDimmableProgress > 0) {
- // draw the dimmed version of this widget
- mPaint.setAlpha((int) (mDimmableProgress * 255));
- canvas.drawBitmap(mDimmedView, 0, 0, mPaint);
- }
-
- updateChildAlpha();
- super.dispatchDraw(canvas);
- }
- }
-}
diff --git a/src/com/android/launcher2/DimmableBubbleTextView.java b/src/com/android/launcher2/DimmableBubbleTextView.java
deleted file mode 100644
index cb3b8ef..0000000
--- a/src/com/android/launcher2/DimmableBubbleTextView.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.launcher2;
-
-import com.android.launcher.R;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.util.AttributeSet;
-
-public class DimmableBubbleTextView extends BubbleTextView implements Dimmable {
- private Paint mDimmedPaint = new Paint();
- private int mAlpha;
- private Bitmap mDimmedView;
- private Canvas mDimmedViewCanvas;
- private boolean isDimmedViewUpdatePass;
- private float mDimmableProgress;
-
- public DimmableBubbleTextView(Context context) {
- super(context);
- mDimmedPaint.setFilterBitmap(true);
- }
-
- public DimmableBubbleTextView(Context context, AttributeSet attrs) {
- super(context, attrs);
- mDimmedPaint.setFilterBitmap(true);
- }
-
- public DimmableBubbleTextView(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- mDimmedPaint.setFilterBitmap(true);
- }
-
- public void setDimmableProgress(float progress) {
- mDimmableProgress = progress;
- }
-
- public float getDimmableProgress() {
- return mDimmableProgress;
- }
-
- @Override
- protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
- super.onLayout(changed, left, top, right, bottom);
-
- if (mDimmedView == null) {
- isDimmedViewUpdatePass = true;
- mDimmedView = Bitmap.createBitmap(getMeasuredWidth(), getMeasuredHeight(),
- Bitmap.Config.ARGB_8888);
- mDimmedViewCanvas = new Canvas(mDimmedView);
- mDimmedViewCanvas.concat(getMatrix());
-
- draw(mDimmedViewCanvas);
-
- // MAKE THE DIMMED VERSION
- int dimmedColor = getContext().getResources().getColor(R.color.dimmed_view_color);
- mDimmedViewCanvas.drawColor(dimmedColor, PorterDuff.Mode.SRC_IN);
-
- isDimmedViewUpdatePass = false;
- }
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
- if (isDimmedViewUpdatePass) {
- canvas.save();
- final float alpha = getAlpha();
- super.setAlpha(1.0f);
- super.onDraw(canvas);
- super.setAlpha(alpha);
- canvas.restore();
- } else {
- super.onDraw(canvas);
- }
-
- if (mDimmedView != null && mDimmableProgress > 0) {
- mDimmedPaint.setAlpha((int) (mDimmableProgress * 255));
- canvas.drawBitmap(mDimmedView, mScrollX, mScrollY, mDimmedPaint);
- }
- }
-}
\ No newline at end of file
diff --git a/src/com/android/launcher2/FolderIcon.java b/src/com/android/launcher2/FolderIcon.java
index dae84aa..86c099e 100644
--- a/src/com/android/launcher2/FolderIcon.java
+++ b/src/com/android/launcher2/FolderIcon.java
@@ -29,7 +29,7 @@
/**
* An icon that can appear on in the workspace representing an {@link UserFolder}.
*/
-public class FolderIcon extends DimmableBubbleTextView implements DropTarget {
+public class FolderIcon extends BubbleTextView implements DropTarget {
private UserFolderInfo mInfo;
private Launcher mLauncher;
private Drawable mCloseIcon;