diff --git a/res/color-v24/all_apps_bg_hand_fill_dark.xml b/res/color-v24/all_apps_bg_hand_fill_dark.xml new file mode 100644 index 0000000000..bb9c71cbcf --- /dev/null +++ b/res/color-v24/all_apps_bg_hand_fill_dark.xml @@ -0,0 +1,28 @@ + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/ic_all_apps_bg_hand.xml b/res/drawable/ic_all_apps_bg_hand.xml index 94af008706..7f3fe14fb1 100644 --- a/res/drawable/ic_all_apps_bg_hand.xml +++ b/res/drawable/ic_all_apps_bg_hand.xml @@ -42,7 +42,7 @@ c0.3,1.7,1.9,2.9,3.6,2.7l40-6.1c1.7-0.3,2.9-1.9,2.7-3.6L54.4,21L41.7,23z M37.5,23.6l-12.6,1.9l-0.3-2.1l12.6-1.9L37.5,23.6z"/> @@ -92,7 +92,7 @@ c-0.7-0.1-1.3-0.2-2,0.2c-1,0.6-1.2,1.5-1.3,2.4c-0.2,1.8,0.6,3.9,1.6,5.9L107,87.3l0.2,0.4l6.6,11.7l0,0 c2.5,4.5,4.4,10.5,4.4,10.7L129.7,125.1"/> \ No newline at end of file diff --git a/res/drawable/ic_all_apps_bg_icon_2.xml b/res/drawable/ic_all_apps_bg_icon_2.xml index b6269e3ab2..5966d9969f 100644 --- a/res/drawable/ic_all_apps_bg_icon_2.xml +++ b/res/drawable/ic_all_apps_bg_icon_2.xml @@ -26,7 +26,7 @@ c-0.25-0.58-0.9-0.99-1.89-1.1L6.2,5.99C5.39,5.91,4.74,6.08,4.32,6.44l0,0C3.7,6.97,3.55,7.88,4.01,8.96l14.54,34.09 C19,44.13,19.75,44.65,20.54,44.59L20.54,44.59z" /> diff --git a/res/drawable/ic_all_apps_bg_icon_3.xml b/res/drawable/ic_all_apps_bg_icon_3.xml index 4c255a9096..b18f8bc473 100644 --- a/res/drawable/ic_all_apps_bg_icon_3.xml +++ b/res/drawable/ic_all_apps_bg_icon_3.xml @@ -26,11 +26,11 @@ s22.31-9.99,22.31-22.31S37.5,1.27,25.18,1.27z M25.18,33.55c-5.5,0-14.35-5.1-14.35-10.6s8.32-12.19,13.82-12.19 c5.5,0,10.49,7.33,10.49,12.83S30.68,33.55,25.18,33.55z" /> diff --git a/res/drawable/ic_all_apps_bg_icon_4.xml b/res/drawable/ic_all_apps_bg_icon_4.xml index 12e05bc6bb..8eb4d90126 100644 --- a/res/drawable/ic_all_apps_bg_icon_4.xml +++ b/res/drawable/ic_all_apps_bg_icon_4.xml @@ -25,7 +25,7 @@ android:pathData="M11.53,8.02l23.39-5.73c1.61-0.39,3.25,0.6,3.64,2.21l7.64,31.19 c0.39,1.61-0.6,3.25-2.21,3.64L12.8,46.97c-1.61,0.39-3.25-0.6-3.64-2.21L3.43,21.37L11.53,8.02z" /> - + diff --git a/res/values/colors.xml b/res/values/colors.xml index 4f7c1a73d3..b44a31e40d 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -39,4 +39,5 @@ #FFFFFF #E5E5E5 + #9AA0A6 diff --git a/res/values/styles.xml b/res/values/styles.xml index 594c7dbdea..b982136da7 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -156,4 +156,15 @@ + + + diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java index 8a477d809f..e4a322622c 100644 --- a/src/com/android/launcher3/ButtonDropTarget.java +++ b/src/com/android/launcher3/ButtonDropTarget.java @@ -102,8 +102,8 @@ public abstract class ButtonDropTarget extends TextView protected void setDrawable(int resId) { // We do not set the drawable in the xml as that inflates two drawables corresponding to // drawableLeft and drawableStart. - mDrawable = getResources().getDrawable(resId); - setCompoundDrawablesRelativeWithIntrinsicBounds(mDrawable, null, null, null); + setCompoundDrawablesRelativeWithIntrinsicBounds(resId, 0, 0, 0); + mDrawable = getCompoundDrawablesRelative()[0]; } public void setDropTargetBar(DropTargetBar dropTargetBar) { diff --git a/src/com/android/launcher3/allapps/AllAppsBackgroundDrawable.java b/src/com/android/launcher3/allapps/AllAppsBackgroundDrawable.java index 54c5bd0b21..3830a9333d 100644 --- a/src/com/android/launcher3/allapps/AllAppsBackgroundDrawable.java +++ b/src/com/android/launcher3/allapps/AllAppsBackgroundDrawable.java @@ -23,10 +23,12 @@ import android.graphics.ColorFilter; import android.graphics.PixelFormat; import android.graphics.Rect; import android.graphics.drawable.Drawable; +import android.view.ContextThemeWrapper; import android.view.Gravity; import com.android.launcher3.LauncherAnimUtils; import com.android.launcher3.R; +import com.android.launcher3.util.Themes; /** * This is a custom composite drawable that has a fixed virtual size and dynamically lays out its @@ -36,7 +38,7 @@ import com.android.launcher3.R; public class AllAppsBackgroundDrawable extends Drawable { /** - * A helper class to positon and orient a drawable to be drawn. + * A helper class to position and orient a drawable to be drawn. */ protected static class TransformedImageDrawable { private Drawable mImage; @@ -49,9 +51,9 @@ public class AllAppsBackgroundDrawable extends Drawable { * @param gravity If one of the Gravity center values, the x and y offset will take the width * and height of the image into account to center the image to the offset. */ - public TransformedImageDrawable(Resources res, int resourceId, float xPct, float yPct, + public TransformedImageDrawable(Context context, int resourceId, float xPct, float yPct, int gravity) { - mImage = res.getDrawable(resourceId); + mImage = context.getDrawable(resourceId); mXPercent = xPct; mYPercent = yPct; mGravity = gravity; @@ -98,19 +100,24 @@ public class AllAppsBackgroundDrawable extends Drawable { public AllAppsBackgroundDrawable(Context context) { Resources res = context.getResources(); - mHand = new TransformedImageDrawable(res, R.drawable.ic_all_apps_bg_hand, - 0.575f, 0.f, Gravity.CENTER_HORIZONTAL); - mIcons = new TransformedImageDrawable[4]; - mIcons[0] = new TransformedImageDrawable(res, R.drawable.ic_all_apps_bg_icon_1, - 0.375f, 0, Gravity.CENTER_HORIZONTAL); - mIcons[1] = new TransformedImageDrawable(res, R.drawable.ic_all_apps_bg_icon_2, - 0.3125f, 0.2f, Gravity.CENTER_HORIZONTAL); - mIcons[2] = new TransformedImageDrawable(res, R.drawable.ic_all_apps_bg_icon_3, - 0.475f, 0.26f, Gravity.CENTER_HORIZONTAL); - mIcons[3] = new TransformedImageDrawable(res, R.drawable.ic_all_apps_bg_icon_4, - 0.7f, 0.125f, Gravity.CENTER_HORIZONTAL); mWidth = res.getDimensionPixelSize(R.dimen.all_apps_background_canvas_width); mHeight = res.getDimensionPixelSize(R.dimen.all_apps_background_canvas_height); + + context = new ContextThemeWrapper(context, + Themes.getAttrBoolean(context, R.attr.isMainColorDark) + ? R.style.AllAppsEmptySearchBackground_Dark + : R.style.AllAppsEmptySearchBackground); + mHand = new TransformedImageDrawable(context, R.drawable.ic_all_apps_bg_hand, + 0.575f, 0.f, Gravity.CENTER_HORIZONTAL); + mIcons = new TransformedImageDrawable[4]; + mIcons[0] = new TransformedImageDrawable(context, R.drawable.ic_all_apps_bg_icon_1, + 0.375f, 0, Gravity.CENTER_HORIZONTAL); + mIcons[1] = new TransformedImageDrawable(context, R.drawable.ic_all_apps_bg_icon_2, + 0.3125f, 0.2f, Gravity.CENTER_HORIZONTAL); + mIcons[2] = new TransformedImageDrawable(context, R.drawable.ic_all_apps_bg_icon_3, + 0.475f, 0.26f, Gravity.CENTER_HORIZONTAL); + mIcons[3] = new TransformedImageDrawable(context, R.drawable.ic_all_apps_bg_icon_4, + 0.7f, 0.125f, Gravity.CENTER_HORIZONTAL); } /** diff --git a/src/com/android/launcher3/graphics/ShadowDrawable.java b/src/com/android/launcher3/graphics/ShadowDrawable.java index 45c1b6afb4..ffcedb26aa 100644 --- a/src/com/android/launcher3/graphics/ShadowDrawable.java +++ b/src/com/android/launcher3/graphics/ShadowDrawable.java @@ -17,7 +17,6 @@ package com.android.launcher3.graphics; import android.annotation.TargetApi; -import android.content.res.ColorStateList; import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.Bitmap; @@ -28,7 +27,6 @@ import android.graphics.ColorFilter; import android.graphics.Paint; import android.graphics.PixelFormat; import android.graphics.Rect; -import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Build; import android.util.AttributeSet; @@ -111,12 +109,11 @@ public class ShadowDrawable extends Drawable { @Override public void applyTheme(Resources.Theme t) { - if (mState.canApplyTheme()) { - // Workaround since ColorStateList does not expose applyTheme method - ColorDrawable cd = new ColorDrawable(); - cd.setTintList(mState.mTintColor); - cd.applyTheme(t); - + TypedArray ta = t.obtainStyledAttributes(new int[] {R.attr.isWorkspaceDarkText}); + boolean isDark = ta.getBoolean(0, false); + ta.recycle(); + if (mState.mIsDark != isDark) { + mState.mIsDark = isDark; mState.mLastDrawnBitmap = null; invalidateSelf(); } @@ -132,21 +129,22 @@ public class ShadowDrawable extends Drawable { d.setBounds(mState.mShadowSize, mState.mShadowSize, mState.mIntrinsicWidth - mState.mShadowSize, mState.mIntrinsicHeight - mState.mShadowSize); - if (mState.mTintColor != null) { - d.setTint(mState.mTintColor.getDefaultColor()); + d.setTint(mState.mIsDark ? mState.mDarkTintColor : Color.WHITE); + d.draw(canvas); + + // Do not draw shadow on dark theme + if (!mState.mIsDark) { + Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG); + paint.setMaskFilter(new BlurMaskFilter(mState.mShadowSize, BlurMaskFilter.Blur.NORMAL)); + int[] offset = new int[2]; + Bitmap shadow = bitmap.extractAlpha(paint, offset); + + paint.setMaskFilter(null); + paint.setColor(mState.mShadowColor); + bitmap.eraseColor(Color.TRANSPARENT); + canvas.drawBitmap(shadow, offset[0], offset[1], paint); + d.draw(canvas); } - d.draw(canvas); - - Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG); - paint.setMaskFilter(new BlurMaskFilter(mState.mShadowSize, BlurMaskFilter.Blur.NORMAL)); - int[] offset = new int[2]; - Bitmap shadow = bitmap.extractAlpha(paint, offset); - - paint.setMaskFilter(null); - paint.setColor(mState.mShadowColor); - bitmap.eraseColor(Color.TRANSPARENT); - canvas.drawBitmap(shadow, offset[0], offset[1], paint); - d.draw(canvas); if (Utilities.isAtLeastO()) { bitmap = bitmap.copy(Bitmap.Config.HARDWARE, false); @@ -162,7 +160,6 @@ public class ShadowDrawable extends Drawable { final TypedArray a = theme == null ? r.obtainAttributes(attrs, R.styleable.ShadowDrawable) : theme.obtainStyledAttributes(attrs, R.styleable.ShadowDrawable, 0, 0); - try { Drawable d = a.getDrawable(R.styleable.ShadowDrawable_android_src); if (d == null) { @@ -172,7 +169,8 @@ public class ShadowDrawable extends Drawable { R.styleable.ShadowDrawable_android_shadowColor, Color.BLACK); mState.mShadowSize = a.getDimensionPixelSize( R.styleable.ShadowDrawable_android_elevation, 0); - mState.mTintColor = a.getColorStateList(R.styleable.ShadowDrawable_android_tint); + mState.mDarkTintColor = a.getColor( + R.styleable.ShadowDrawable_darkTintColor, Color.BLACK); mState.mIntrinsicHeight = d.getIntrinsicHeight() + 2 * mState.mShadowSize; mState.mIntrinsicWidth = d.getIntrinsicWidth() + 2 * mState.mShadowSize; @@ -192,8 +190,9 @@ public class ShadowDrawable extends Drawable { int mShadowColor; int mShadowSize; - ColorStateList mTintColor; + int mDarkTintColor; + boolean mIsDark; Bitmap mLastDrawnBitmap; ConstantState mChildState; @@ -209,7 +208,7 @@ public class ShadowDrawable extends Drawable { @Override public boolean canApplyTheme() { - return mTintColor != null; + return true; } } }