Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e123ea6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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: b2b0333a
  Dark page indicator for wallpapers that support dark text.
parents a911c4b3 3120b114

src/com/android/launcher3/pageindicators/PageIndicatorLineCaret.java

+9 −0
Original line number Diff line number Diff line
@@ -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) {