diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-07-18 18:44:06 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-07-18 18:44:06 +0000 |
commit | 7e123ea68b0b59fb286e11142d61267edfe7422e (patch) | |
tree | 3fe4fe1d046b9bfd054e052894c0e7beb86cd92f /src/com/android/launcher3 | |
parent | a911c4b3a0d325c369fa39f2bd4c5fefc2edc691 (diff) | |
parent | 3120b1141291ed29e7256305430cacc6f4392a4f (diff) | |
download | android_packages_apps_Trebuchet-7e123ea68b0b59fb286e11142d61267edfe7422e.tar.gz android_packages_apps_Trebuchet-7e123ea68b0b59fb286e11142d61267edfe7422e.tar.bz2 android_packages_apps_Trebuchet-7e123ea68b0b59fb286e11142d61267edfe7422e.zip |
Merge changes from topic 'am-9a359cd5-d018-48ab-ad8e-de4e1c0151e4' into ub-launcher3-dorval-polish2
* changes:
Dark page indicator for wallpapers that support dark text. am: b2b0333a62
Dark page indicator for wallpapers that support dark text.
Diffstat (limited to 'src/com/android/launcher3')
-rw-r--r-- | src/com/android/launcher3/pageindicators/PageIndicatorLineCaret.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/launcher3/pageindicators/PageIndicatorLineCaret.java b/src/com/android/launcher3/pageindicators/PageIndicatorLineCaret.java index 6b992fc22..29834d764 100644 --- a/src/com/android/launcher3/pageindicators/PageIndicatorLineCaret.java +++ b/src/com/android/launcher3/pageindicators/PageIndicatorLineCaret.java @@ -21,7 +21,9 @@ import android.widget.ImageView; import com.android.launcher3.Launcher; import com.android.launcher3.R; import com.android.launcher3.Utilities; +import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.dynamicui.ExtractedColors; +import com.android.launcher3.dynamicui.WallpaperColorInfo; /** * A PageIndicator that briefly shows a fraction of a line when moving between pages. @@ -128,6 +130,10 @@ public class PageIndicatorLineCaret extends PageIndicator { mLauncher = Launcher.getLauncher(context); mLineHeight = res.getDimensionPixelSize(R.dimen.dynamic_grid_page_indicator_line_height); setCaretDrawable(new CaretDrawable(context)); + + boolean darkText = WallpaperColorInfo.getInstance(context).supportsDarkText(); + mActiveAlpha = darkText ? BLACK_ALPHA : WHITE_ALPHA; + mLinePaint.setColor(darkText ? Color.BLACK : Color.WHITE); } @Override @@ -219,6 +225,9 @@ public class PageIndicatorLineCaret extends PageIndicator { * - mostly opaque black if the hotseat is black (ignoring alpha) */ public void updateColor(ExtractedColors extractedColors) { + if (FeatureFlags.LAUNCHER3_GRADIENT_ALL_APPS) { + return; + } int originalLineAlpha = mLinePaint.getAlpha(); int color = extractedColors.getColor(ExtractedColors.HOTSEAT_INDEX); if (color != Color.TRANSPARENT) { |