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

Dark text support for caret, drop target text and cell layout drop outline

Browse Source 
am: 54ba601a99

Change-Id: Ie3169f9bbbeaae3d9d8c3826d93666ac1857a35b
This commit is contained in:
Mario Bertschler
2017-06-08 18:17:36 +00:00
committed by android-build-merger
parent 245a575be9 54ba601a99
commit ca20dc56b7
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/layout/drop_target_bar_vert.xml
+1 -4
View File
@@ -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>
res/values-sw720dp/styles.xml
+1 -1
View File
@@ -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>
res/values/styles.xml
+2 -2
View File
@@ -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>
src/com/android/launcher3/CellLayout.java
+1 -1
View File
@@ -236,7 +236,7 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler {
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
src/com/android/launcher3/pageindicators/CaretDrawable.java
+5 -2
View File
@@ -38,6 +38,7 @@ public class CaretDrawable extends Drawable {
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 @@ public class CaretDrawable extends Drawable {
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 @@ public class CaretDrawable extends Drawable {
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);
}