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

Commit 89233c49 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Fix unreadable clock 

- Always use white text with shadows on media
- Use lock screen colors for shade theme
- Remove legacy wallpaper visibility listener
- Remove shadow from black title

Test: set white wallpaper
Test: set dark wallpaper
Test: set dark wallpaper on home, light on ls
Test: set dark wallpaper on ls, light on home
Test: atest SysuiColorExtractorTests
Fixes: 134119878
Change-Id: I64ee2dee14322b2c02891c3ffe5fc0b25d1f100b
parent d434adf1

core/java/com/android/internal/colorextraction/ColorExtractor.java

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ public class ColorExtractor implements WallpaperManager.OnColorsChangedListener 
        }

    }



    private void extractWallpaperColors() {

    protected void extractWallpaperColors() {

        GradientColors[] systemColors = mGradientColors.get(WallpaperManager.FLAG_SYSTEM);

        GradientColors[] lockColors = mGradientColors.get(WallpaperManager.FLAG_LOCK);

        extractInto(mSystemColors,

packages/SystemUI/legacy/recents/src/com/android/systemui/recents/RecentsActivity.java

+1 −3
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD 
        mColorExtractor = Dependency.get(SysuiColorExtractor.class);

        mColorExtractor.addOnColorsChangedListener(this);

        mUsingDarkText = mColorExtractor.getColors(ColorExtractor.TYPE_DARK,

                WallpaperManager.FLAG_SYSTEM, true).supportsDarkText();

                WallpaperManager.FLAG_SYSTEM).supportsDarkText();

        setTheme(mUsingDarkText ? R.style.RecentsTheme_Wallpaper_Light

                : R.style.RecentsTheme_Wallpaper);
@@ -394,8 +394,6 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD 
    @Override

    public void onColorsChanged(ColorExtractor colorExtractor, int which) {

        if ((which & WallpaperManager.FLAG_SYSTEM) != 0) {

            // Recents doesn't care about the wallpaper being visible or not, it always

            // wants to scrim with wallpaper colors

            ColorExtractor.GradientColors colors = mColorExtractor.getNeutralColors();

            boolean darkText = colors.supportsDarkText();

            if (darkText != mUsingDarkText) {

packages/SystemUI/res-keyguard/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ 
        <item name="android:colorBackground">@*android:color/background_material_dark</item>

    </style>



    <style name="TextAppearance.Keyguard" parent="Theme.SystemUI">

    <style name="TextAppearance.Keyguard">

        <item name="android:textSize">@dimen/widget_title_font_size</item>

        <item name="android:gravity">center</item>

        <item name="android:ellipsize">end</item>

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ public class KeyguardClockSwitch extends RelativeLayout { 


    private void updateColors() {

        ColorExtractor.GradientColors colors = mSysuiColorExtractor.getColors(

                WallpaperManager.FLAG_LOCK, true);

                WallpaperManager.FLAG_LOCK);

        mSupportsDarkText = colors.supportsDarkText();

        mColorPalette = colors.getColorPalette();

        if (mClockPlugin != null) {

packages/SystemUI/src/com/android/keyguard/clock/AnalogClockController.java

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ public class AnalogClockController implements ClockPlugin { 
        setDarkAmount(1f);

        setTextColor(Color.WHITE);

        ColorExtractor.GradientColors colors = mColorExtractor.getColors(

                WallpaperManager.FLAG_LOCK, true);

                WallpaperManager.FLAG_LOCK);

        setColorPalette(colors.supportsDarkText(), colors.getColorPalette());

        onTimeTick();