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

Commit d47f715b authored by Jon Miranda's avatar Jon Miranda
Browse files

Fix folders being light in dark mode. 

- Simplifying the styles here, following the same pattern as
  the popup colors.

Bug: 175329686
Test: test wallpaper with light text, light mode
      test again in dark mode
      test wallpaper with dark text, light mode
      test again in dark mode

Change-Id: I04f92bd64de69c5e33fc1bff50c4ecc0e7c17d37
parent 61bc5c6c

res/values-v29/styles.xml

+0 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ 
        <item name="android:windowBackground">@android:color/transparent</item>

        <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

+0 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ 
        <item name="android:windowBackground">@android:color/transparent</item>

        <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/styles.xml

+0 −20
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ 
        <item name="android:windowBackground">@android:color/transparent</item>

        <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">
@@ -72,10 +70,6 @@ 
    </style>



    <style name="LauncherTheme.DarkMainColor" parent="@style/LauncherTheme">

        <item name="folderFillColor">@color/folder_background_dark</item>

        <item name="folderTextColor">@color/workspace_text_color_light</item>

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

        <item name="folderHintColor">@color/folder_hint_text_color_light</item>

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



    </style>
@@ -87,12 +81,6 @@ 
        <item name="workspaceKeyShadowColor">@android:color/transparent</item>

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

        <item name="workspaceStatusBarScrim">@null</item>

        <item name="folderDotColor">@color/folder_dot_color</item>

        <item name="folderFillColor">@color/folder_background_light</item>

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

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

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

        <item name="folderHintColor">@color/folder_hint_text_color_dark</item>

    </style>



    <style name="LauncherTheme.Dark" parent="@style/LauncherTheme">
@@ -125,25 +113,17 @@ 
    </style>



    <style name="LauncherTheme.Dark.DarkMainColor" parent="@style/LauncherTheme.Dark">

        <item name="folderFillColor">@color/folder_background_dark</item>

        <item name="folderTextColor">@color/workspace_text_color_light</item>

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

        <item name="folderHintColor">@color/folder_hint_text_color_light</item>

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

    </style>



    <style name="LauncherTheme.Dark.DarkText" parent="@style/LauncherTheme.Dark">

        <item name="android:colorControlHighlight">#19212121</item>

        <item name="folderFillColor">@color/folder_background_light</item>

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

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

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

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

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

        <item name="workspaceStatusBarScrim">@null</item>

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

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

        <item name="folderHintColor">@color/folder_hint_text_color_dark</item>

    </style>



    <!-- A derivative project can extend these themes to customize the application theme without