Dark text support for caret, drop target text and cell layout drop outline
Change-Id: I1bcad657b6e49be6fa93cafe9d8ae304604be34d
diff --git a/res/layout/drop_target_bar_vert.xml b/res/layout/drop_target_bar_vert.xml
index e2a65d4..2394d0d 100644
--- a/res/layout/drop_target_bar_vert.xml
+++ b/res/layout/drop_target_bar_vert.xml
@@ -32,8 +32,7 @@
android:gravity="center"
android:paddingLeft="@dimen/vert_drop_target_horizontal_gap"
android:paddingRight="@dimen/vert_drop_target_horizontal_gap"
- android:id="@+id/delete_target_text"
- android:textColor="@android:color/white" />
+ android:id="@+id/delete_target_text" />
<!-- Uninstall target -->
<com.android.launcher3.UninstallDropTarget
@@ -43,7 +42,6 @@
android:paddingLeft="@dimen/vert_drop_target_horizontal_gap"
android:paddingRight="@dimen/vert_drop_target_horizontal_gap"
android:id="@+id/uninstall_target_text"
- android:textColor="@android:color/white"
android:layout_marginTop="@dimen/vert_drop_target_vertical_gap"/>
<Space
@@ -59,7 +57,6 @@
android:paddingLeft="@dimen/vert_drop_target_horizontal_gap"
android:paddingRight="@dimen/vert_drop_target_horizontal_gap"
android:id="@+id/info_target_text"
- android:textColor="@android:color/white"
android:layout_marginBottom="64dp"/>
</com.android.launcher3.DropTargetBar>
\ No newline at end of file
diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
index 0c060ea..5cfe84f 100644
--- a/res/values-sw720dp/styles.xml
+++ b/res/values-sw720dp/styles.xml
@@ -42,7 +42,7 @@
<style name="DropTargetButton" parent="DropTargetButtonBase">
<item name="android:paddingLeft">60dp</item>
<item name="android:paddingRight">60dp</item>
- <item name="android:shadowColor">#393939</item>
+ <item name="android:shadowColor">?attr/workspaceShadowColor</item>
<item name="android:shadowDx">0.0</item>
<item name="android:shadowDy">0.0</item>
<item name="android:shadowRadius">2.0</item>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index dd56029..70f65ca 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -139,11 +139,11 @@
<item name="android:drawablePadding">7.5dp</item>
<item name="android:paddingLeft">16dp</item>
<item name="android:paddingRight">16dp</item>
- <item name="android:textColor">?android:attr/textColorPrimary</item>
+ <item name="android:textColor">?attr/workspaceTextColor</item>
<item name="android:textSize">@dimen/drop_target_text_size</item>
<item name="android:singleLine">true</item>
<item name="android:ellipsize">end</item>
- <item name="android:shadowColor">@color/default_shadow_color_no_alpha</item>
+ <item name="android:shadowColor">?attr/workspaceShadowColor</item>
<item name="android:shadowDx">0.0</item>
<item name="android:shadowDy">1.0</item>
<item name="android:shadowRadius">4.0</item>
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);
}