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 | 79cb8302311c4c36fadd060cb389e33eb05627d0 (patch) | |
| tree | ce0b44b757e3baf81615d3f69067e53bb6ede8bf /src/com/android/launcher3 | |
| parent | b24fa300250bd9b5d6498be0326c97190ecd4ae1 (diff) | |
| parent | b2b0333a62d2c00fbcf6e40dd78a751ea46c3851 (diff) | |
| download | android_packages_apps_Trebuchet-79cb8302311c4c36fadd060cb389e33eb05627d0.tar.gz android_packages_apps_Trebuchet-79cb8302311c4c36fadd060cb389e33eb05627d0.tar.bz2 android_packages_apps_Trebuchet-79cb8302311c4c36fadd060cb389e33eb05627d0.zip | |
Merge "Dark page indicator for wallpapers that support dark text." into ub-launcher3-dorval-polish
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) { |