Dark text support for caret, drop target text and cell layout drop outline
Change-Id: I1bcad657b6e49be6fa93cafe9d8ae304604be34d
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 78030ce..c2c5c27 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -236,7 +236,7 @@
for (int i = 0; i < mDragOutlines.length; i++) {
mDragOutlines[i] = new Rect(-1, -1, -1, -1);
}
- mDragOutlinePaint.setColor(Themes.getAttrColor(context, android.R.attr.textColorPrimary));
+ mDragOutlinePaint.setColor(Themes.getAttrColor(context, R.attr.workspaceTextColor));
// When dragging things around the home screens, we show a green outline of
// where the item will land. The outlines gradually fade out, leaving a trail
diff --git a/src/com/android/launcher3/pageindicators/CaretDrawable.java b/src/com/android/launcher3/pageindicators/CaretDrawable.java
index c5abfe3..5ade497 100644
--- a/src/com/android/launcher3/pageindicators/CaretDrawable.java
+++ b/src/com/android/launcher3/pageindicators/CaretDrawable.java
@@ -38,6 +38,7 @@
private Paint mCaretPaint = new Paint();
private Path mPath = new Path();
private final int mCaretSizePx;
+ private final boolean mUseShadow;
public CaretDrawable(Context context) {
final Resources res = context.getResources();
@@ -60,6 +61,7 @@
mShadowPaint.setStrokeCap(Paint.Cap.ROUND);
mShadowPaint.setStrokeJoin(Paint.Join.ROUND);
+ mUseShadow = !Themes.getAttrBoolean(context, R.attr.isWorkspaceDarkText);
mCaretSizePx = res.getDimensionPixelSize(R.dimen.all_apps_caret_size);
}
@@ -94,8 +96,9 @@
mPath.moveTo(left, top + caretHeight * (1 - getNormalizedCaretProgress()));
mPath.lineTo(left + (width / 2), top + caretHeight * getNormalizedCaretProgress());
mPath.lineTo(left + width, top + caretHeight * (1 - getNormalizedCaretProgress()));
-
- canvas.drawPath(mPath, mShadowPaint);
+ if (mUseShadow) {
+ canvas.drawPath(mPath, mShadowPaint);
+ }
canvas.drawPath(mPath, mCaretPaint);
}