diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2017-02-10 16:52:16 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2017-02-16 15:24:37 -0800 |
commit | 1f3f07d47c29cba3b70bcd15ebb65a077f55a558 (patch) | |
tree | d34ba158bcab7f2974d7d7121d14ae914171f0e1 /src/com/android/launcher3/pageindicators | |
parent | 9e76f682f3e52afa1f11172564b883c7dfda5063 (diff) | |
download | android_packages_apps_Trebuchet-1f3f07d47c29cba3b70bcd15ebb65a077f55a558.tar.gz android_packages_apps_Trebuchet-1f3f07d47c29cba3b70bcd15ebb65a077f55a558.tar.bz2 android_packages_apps_Trebuchet-1f3f07d47c29cba3b70bcd15ebb65a077f55a558.zip |
Simplifying some launcher themes
> Replacing some colors with theme attributes
> Simplifying styles definition by removing unnecessary inheritance and inlining some definitions
Change-Id: Ifa167515cae6a7fd3720f1a52ff9ce11abb4495f
Diffstat (limited to 'src/com/android/launcher3/pageindicators')
-rw-r--r-- | src/com/android/launcher3/pageindicators/CaretDrawable.java | 6 | ||||
-rw-r--r-- | src/com/android/launcher3/pageindicators/PageIndicatorDots.java | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/launcher3/pageindicators/CaretDrawable.java b/src/com/android/launcher3/pageindicators/CaretDrawable.java index 4789f69f5..0a00e24e9 100644 --- a/src/com/android/launcher3/pageindicators/CaretDrawable.java +++ b/src/com/android/launcher3/pageindicators/CaretDrawable.java @@ -24,6 +24,7 @@ import android.graphics.Path; import android.graphics.PixelFormat; import com.android.launcher3.R; +import com.android.launcher3.util.Themes; import android.graphics.drawable.Drawable; @@ -45,14 +46,15 @@ public class CaretDrawable extends Drawable { final int strokeWidth = res.getDimensionPixelSize(R.dimen.all_apps_caret_stroke_width); final int shadowSpread = res.getDimensionPixelSize(R.dimen.all_apps_caret_shadow_spread); - mCaretPaint.setColor(res.getColor(R.color.all_apps_caret_color)); + mCaretPaint.setColor(res.getColor(R.color.workspace_icon_text_color)); mCaretPaint.setAntiAlias(true); mCaretPaint.setStrokeWidth(strokeWidth); mCaretPaint.setStyle(Paint.Style.STROKE); mCaretPaint.setStrokeCap(Paint.Cap.SQUARE); mCaretPaint.setStrokeJoin(Paint.Join.MITER); - mShadowPaint.setColor(res.getColor(R.color.all_apps_caret_shadow_color)); + mShadowPaint.setColor(res.getColor(R.color.default_shadow_color_no_alpha)); + mShadowPaint.setAlpha(Themes.getAlpha(context, android.R.attr.spotShadowAlpha)); mShadowPaint.setAntiAlias(true); mShadowPaint.setStrokeWidth(strokeWidth + (shadowSpread * 2)); mShadowPaint.setStyle(Paint.Style.STROKE); diff --git a/src/com/android/launcher3/pageindicators/PageIndicatorDots.java b/src/com/android/launcher3/pageindicators/PageIndicatorDots.java index 4f5edc94f..6276c80c3 100644 --- a/src/com/android/launcher3/pageindicators/PageIndicatorDots.java +++ b/src/com/android/launcher3/pageindicators/PageIndicatorDots.java @@ -37,6 +37,7 @@ import android.view.animation.OvershootInterpolator; import com.android.launcher3.R; import com.android.launcher3.Utilities; +import com.android.launcher3.util.Themes; /** * {@link PageIndicator} which shows dots per page. The active page is shown with the current @@ -111,8 +112,8 @@ public class PageIndicatorDots extends PageIndicator { mDotRadius = getResources().getDimension(R.dimen.page_indicator_dot_size) / 2; setOutlineProvider(new MyOutlineProver()); - mActiveColor = Utilities.getColorAccent(context); - mInActiveColor = getResources().getColor(R.color.page_indicator_dot_color); + mActiveColor = Themes.getColorAccent(context); + mInActiveColor = Themes.getAttrColor(context, android.R.attr.colorControlHighlight); mIsRtl = Utilities.isRtl(getResources()); } |