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

Commit 3f45639b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "NIU Actions: Update background and dark mode colors" into sc-dev

parents 871d435b 2a2eee19

go/quickstep/res/layout/overview_panel.xml

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

     Copyright (C) 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.

-->

<merge xmlns:android="http://schemas.android.com/apk/res/android">



    <com.android.quickstep.views.LauncherRecentsView

        android:id="@+id/overview_panel"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:accessibilityPaneTitle="@string/accessibility_recent_apps"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:background="?attr/overviewBackgroundColor"

        android:visibility="invisible" />



    <com.android.quickstep.views.SplitPlaceholderView

        android:id="@+id/split_placeholder"

        android:layout_width="match_parent"

        android:layout_height="@dimen/split_placeholder_size"

        android:background="@android:color/darker_gray"

        android:visibility="gone" />



    <include

        android:id="@+id/overview_actions_view"

        layout="@layout/overview_actions_container" />



</merge>

go/quickstep/res/values/attrs.xml

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
-->

<resources>

    <!-- Attributes used for Overview theming -->

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

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

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

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

go/quickstep/res/values/colors.xml

+1 −3
Original line number Diff line number Diff line
@@ -16,10 +16,8 @@ 
-->

<resources>

    <!-- Overview -->

    <color name="go_overview_background_color">#DADADA</color>

    <color name="go_overview_background_color_dark">#000000</color>

    <color name="go_overview_text_color">#3C4043</color>

    <color name="go_overview_text_color_dark">#F8F9FA</color>

    <color name="go_overview_button_color">#70FFFFFF</color>

    <color name="go_overview_button_color_dark">#303030</color>

    <color name="go_overview_button_color_dark">#474747</color>

</resources>

go/quickstep/res/values/styles.xml

+0 −2
Original line number Diff line number Diff line
@@ -17,14 +17,12 @@ 
<resources>

    <!-- App themes -->

    <style name="AppTheme" parent="@style/LauncherTheme">

        <item name="overviewBackgroundColor">@color/go_overview_background_color</item>

        <item name="overviewButtonTextColor">@color/go_overview_text_color</item>

        <item name="overviewButtonIconColor">@color/go_overview_text_color</item>

        <item name="overviewButtonBackgroundColor">@color/go_overview_button_color</item>

    </style>



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

        <item name="overviewBackgroundColor">@color/go_overview_background_color_dark</item>

        <item name="overviewButtonTextColor">@color/go_overview_text_color_dark</item>

        <item name="overviewButtonIconColor">@color/go_overview_text_color_dark</item>

        <item name="overviewButtonBackgroundColor">@color/go_overview_button_color_dark</item>