PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Properly desaturating the dragview if the icon is disabled" into ub-launcher3-dorval-polish

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-22 16:59:41 +00:00
committed by Android (Google) Code Review
parent bef710114c 2814112998
commit edfc0192ce
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/FastBitmapDrawable.java
+5 -2
View File
@@ -36,8 +36,6 @@ import com.android.launcher3.graphics.IconPalette;
public class FastBitmapDrawable extends Drawable {
private static final int[] STATE_PRESSED = new int[] {android.R.attr.state_pressed};
private static final float PRESSED_BRIGHTNESS = 100f / 255f;
private static final float DISABLED_DESATURATION = 1f;
private static final float DISABLED_BRIGHTNESS = 0.5f;
@@ -184,6 +182,11 @@ public class FastBitmapDrawable extends Drawable {
return true;
}
@Override
public ColorFilter getColorFilter() {
return mPaint.getColorFilter();
}
@Override
protected boolean onStateChange(int[] state) {
boolean isPressed = false;
src/com/android/launcher3/dragndrop/DragView.java
+10
View File
@@ -29,6 +29,7 @@ import android.content.pm.LauncherActivityInfo;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.ColorFilter;
import android.graphics.ColorMatrix;
import android.graphics.ColorMatrixColorFilter;
import android.graphics.Matrix;
@@ -245,6 +246,15 @@ public class DragView extends FrameLayout {
addView(mBgImageView);
addView(mFgImageView);
setWillNotDraw(true);
if (info.isDisabled()) {
FastBitmapDrawable d = new FastBitmapDrawable(null);
d.setIsDisabled(true);
ColorFilter cf = d.getColorFilter();
mBgImageView.setColorFilter(cf);
mFgImageView.setColorFilter(cf);
mBadge.setColorFilter(cf);
}
}
});
}