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

Commit 7bbd0316 authored by Jon Miranda's avatar Jon Miranda
Browse files

Fix contrast issue with folder background and text colors. 

Bug: 187797251
Test: dark wallpaper, light wallpaper, toggle dark theme on both
Change-Id: I57ddfc91878d68735d5ae5ec5ab78222fda101ca
parent d30f4ce5

res/values-v29/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
        <item name="android:windowNoTitle">true</item>

        <item name="android:windowShowWallpaper">true</item>

        <item name="folderTextColor">?attr/workspaceTextColor</item>

        <item name="isFolderDarkText">?attr/isWorkspaceDarkText</item>

        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>

        <item name="android:enforceStatusBarContrast">false</item>

        <item name="android:enforceNavigationBarContrast">false</item>

res/values-v30/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
        <item name="android:windowNoTitle">true</item>

        <item name="android:windowShowWallpaper">true</item>

        <item name="folderTextColor">?attr/workspaceTextColor</item>

        <item name="isFolderDarkText">?attr/isWorkspaceDarkText</item>

        <item name="android:windowLayoutInDisplayCutoutMode">always</item>

        <item name="android:enforceStatusBarContrast">false</item>

        <item name="android:enforceNavigationBarContrast">false</item>

res/values/attrs.xml

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
    <attr name="folderIconBorderColor" format="color" />

    <attr name="folderTextColor" format="color" />

    <attr name="folderHintColor" format="color" />

    <attr name="isFolderDarkText" format="boolean" />

    <attr name="workProfileOverlayTextColor" format="color" />

    <attr name="gridColor" format="color" />

res/values/styles.xml

+7 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
        <item name="android:windowNoTitle">true</item>

        <item name="android:windowShowWallpaper">true</item>

        <item name="folderTextColor">?attr/workspaceTextColor</item>

        <item name="isFolderDarkText">?attr/isWorkspaceDarkText</item>

    </style>



    <style name="LauncherTheme" parent="@style/BaseLauncherTheme">
@@ -50,6 +51,7 @@ 
        <item name="folderFillColor">?android:attr/colorBackground</item>

        <item name="folderIconBorderColor">?android:attr/colorPrimary</item>

        <item name="folderTextColor">?android:attr/textColorPrimary</item>

        <item name="isFolderDarkText">true</item>

        <item name="folderHintColor">#89616161</item>

        <item name="loadingIconColor">#CCFFFFFF</item>

        <item name="iconOnlyShortcutColor">?android:attr/textColorSecondary</item>
@@ -71,6 +73,7 @@ 
    <style name="LauncherTheme.DarkMainColor" parent="@style/LauncherTheme">

        <item name="folderFillColor">#FF3C4043</item> <!-- 100% GM2 800 -->

        <item name="folderTextColor">?attr/workspaceTextColor</item>

        <item name="isFolderDarkText">?attr/isWorkspaceDarkText</item>

        <item name="disabledIconAlpha">.254</item>



    </style>
@@ -86,6 +89,7 @@ 
        <item name="folderFillColor">#CDFFFFFF</item>

        <item name="folderIconBorderColor">#FF80868B</item>

        <item name="folderTextColor">?attr/workspaceTextColor</item>

        <item name="isFolderDarkText">true</item>

    </style>



    <style name="LauncherTheme.Dark" parent="@style/LauncherTheme">
@@ -107,6 +111,7 @@ 
        <item name="folderFillColor">?android:attr/colorBackground</item>

        <item name="folderIconBorderColor">?android:attr/colorPrimary</item>

        <item name="folderTextColor">?android:attr/textColorPrimary</item>

        <item name="isFolderDarkText">false</item>

        <item name="folderHintColor">#89CCCCCC</item>

        <item name="isMainColorDark">true</item>

        <item name="loadingIconColor">#99FFFFFF</item>
@@ -119,6 +124,7 @@ 
    <style name="LauncherTheme.Dark.DarkMainColor" parent="@style/LauncherTheme.Dark">

        <item name="folderFillColor">#FF3C4043</item> <!-- 100% GM2 800 -->

        <item name="folderTextColor">@android:color/white</item>

        <item name="isFolderDarkText">false</item>

        <item name="disabledIconAlpha">.54</item>

    </style>
@@ -126,6 +132,7 @@ 
        <item name="android:colorControlHighlight">#19212121</item>

        <item name="folderFillColor">#CDFFFFFF</item>

        <item name="folderTextColor">?attr/workspaceTextColor</item>

        <item name="isFolderDarkText">?attr/isWorkspaceDarkText</item>

        <item name="workspaceTextColor">@color/workspace_text_color_dark</item>

        <item name="workspaceShadowColor">@android:color/transparent</item>

        <item name="workspaceAmbientShadowColor">@android:color/transparent</item>

src/com/android/launcher3/folder/Folder.java

+2 −0
Original line number Diff line number Diff line
@@ -296,6 +296,8 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo 
        }



        if (Utilities.ATLEAST_S) {

            mColorExtractionIndex = LocalColorExtractor.getColorIndex(

                    !Themes.getAttrBoolean(getContext(), R.attr.isFolderDarkText));

            mColorExtractor = LocalColorExtractor.newInstance(getContext());

            mColorListener = (RectF rect, SparseIntArray extractedColors) -> {

                mColorChangeRunnable = () -> {