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

Commit 468646ca authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Style updates" into sc-dev

parents 05693756 993fed23

res/values-v31/colors.xml

0 → 100644
+33 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

**

** Copyright 2021, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->

<resources>

    <color name="popup_color_primary_light">@android:color/system_main_50</color>

    <color name="popup_color_secondary_light">@android:color/system_main_100</color>

    <color name="popup_color_tertiary_light">@android:color/system_main_300</color>

    <color name="popup_color_primary_dark">@android:color/system_main_800</color>

    <color name="popup_color_secondary_dark">@android:color/system_main_900</color>

    <color name="popup_color_tertiary_dark">@android:color/system_main_700</color>



    <color name="workspace_text_color_light">@android:color/system_main_50</color>

    <color name="workspace_text_color_dark">@android:color/system_main_900</color>



    <color name="text_color_primary_dark">@android:color/system_main_50</color>

    <color name="text_color_secondary_dark">@android:color/system_main_200</color>

    <color name="text_color_tertiary_dark">@android:color/system_main_400</color>

</resources>
 
 No newline at end of file

res/values/colors.xml

+15 −0
Original line number Diff line number Diff line
@@ -40,4 +40,19 @@ 
    <color name="gesture_tutorial_fake_previous_task_view_color">#9CCC65</color> <!-- Light Green -->

    <color name="gesture_tutorial_action_button_label_color">#FFFFFFFF</color>

    <color name="gesture_tutorial_primary_color">#1A73E8</color> <!-- Blue -->



    <color name="popup_color_primary_light">#FFF</color>

    <color name="popup_color_secondary_light">#F1F3F4</color>

    <color name="popup_color_tertiary_light">#E0E0E0</color> <!-- Gray 300 -->

    <color name="popup_color_primary_dark">#3C4043</color> <!-- Gray 800 -->

    <color name="popup_color_secondary_dark">#202124</color>

    <color name="popup_color_tertiary_dark">#757575</color> <!-- Gray 600 -->



    <color name="workspace_text_color_light">#FFF</color>

    <color name="workspace_text_color_dark">#FF212121</color>



    <color name="text_color_primary_dark">#FFFFFFFF</color>

    <color name="text_color_secondary_dark">#FFFFFFFF</color>

    <color name="text_color_tertiary_dark">#CCFFFFFF</color>



</resources>

res/values/styles.xml

+12 −12
Original line number Diff line number Diff line
@@ -35,12 +35,12 @@ 
        <item name="allAppsInterimScrimAlpha">46</item>

        <item name="allAppsNavBarScrimColor">#66FFFFFF</item>

        <item name="allAppsTheme">@style/AllAppsTheme</item>

        <item name="popupColorPrimary">#FFF</item>

        <item name="popupColorSecondary">#F1F3F4</item>

        <item name="popupColorTertiary">#E0E0E0</item> <!-- Gray 300 -->

        <item name="popupColorPrimary">@color/popup_color_primary_light</item>

        <item name="popupColorSecondary">@color/popup_color_secondary_light</item>

        <item name="popupColorTertiary">@color/popup_color_tertiary_light</item>

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

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

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

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

        <item name="workspaceShadowColor">#B0000000</item>

        <item name="workspaceAmbientShadowColor">#33000000</item>

        <item name="workspaceKeyShadowColor">#44000000</item>
@@ -74,7 +74,7 @@ 
    </style>



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

        <item name="workspaceTextColor">#FF212121</item>

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

        <item name="allAppsInterimScrimAlpha">128</item>

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

        <item name="workspaceAmbientShadowColor">@android:color/transparent</item>
@@ -88,9 +88,9 @@ 
    </style>



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

        <item name="android:textColorPrimary">#FFFFFFFF</item>

        <item name="android:textColorSecondary">#FFFFFFFF</item>

        <item name="android:textColorTertiary">#CCFFFFFF</item>

        <item name="android:textColorPrimary">@color/text_color_primary_dark</item>

        <item name="android:textColorSecondary">@color/text_color_secondary_dark</item>

        <item name="android:textColorTertiary">@color/text_color_tertiary_dark</item>

        <item name="android:textColorHint">#A0FFFFFF</item>

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

        <item name="android:colorPrimary">#FF212121</item>
@@ -98,9 +98,9 @@ 
        <item name="allAppsInterimScrimAlpha">102</item>

        <item name="allAppsNavBarScrimColor">#80000000</item>

        <item name="allAppsTheme">@style/AllAppsTheme.Dark</item>

        <item name="popupColorPrimary">#3C4043</item> <!-- Gray 800 -->

        <item name="popupColorSecondary">#202124</item>

        <item name="popupColorTertiary">#757575</item> <!-- Gray 600 -->

        <item name="popupColorPrimary">@color/popup_color_primary_dark</item>

        <item name="popupColorSecondary">@color/popup_color_secondary_dark</item>

        <item name="popupColorTertiary">@color/popup_color_tertiary_dark</item>

        <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item>

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

        <item name="folderFillColor">?android:attr/colorBackground</item>
@@ -125,7 +125,7 @@ 
        <item name="allAppsInterimScrimAlpha">25</item>

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

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

        <item name="workspaceTextColor">#FF212121</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>