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

Commit 4d9af652 authored by Brian Isganitis's avatar Brian Isganitis
Browse files

Remove light theme support for split screen surface. 

Test: Split screen backgrounds should be dark with white divider.
Fix: 276584850
Change-Id: I90a0da5660d64498dbc83b8d37c55eeb55dc9f80
parent c7ac88d4

libs/WindowManager/Shell/res/color/taskbar_background.xml

deleted100644 → 0
+0 −20
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.

  -->

<!-- Should be the same as in packages/apps/Launcher3/res/color-v31/taskbar_background.xml -->

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

    <item android:color="@android:color/system_neutral1_500" android:lStar="98" />

</selector>
 
 No newline at end of file

libs/WindowManager/Shell/res/values-night/colors.xml

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



<resources>

    <color name="docked_divider_handle">#ffffff</color>

    <!-- Bubbles -->

    <color name="bubbles_icon_tint">@color/GM2_grey_200</color>

    <!-- Splash screen-->

libs/WindowManager/Shell/res/values/colors.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
 */

-->

<resources>

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

    <color name="split_divider_background">@color/taskbar_background</color>

    <color name="docked_divider_handle">#ffffff</color>

    <color name="split_divider_background">@color/taskbar_background_dark</color>

    <drawable name="forced_resizable_background">#59000000</drawable>

    <color name="minimize_dock_shadow_start">#60000000</color>

    <color name="minimize_dock_shadow_end">#00000000</color>

libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DropZoneView.java

+2 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ public class DropZoneView extends FrameLayout { 
        setContainerMargin(0, 0, 0, 0); // make sure it's populated



        mCornerRadius = ScreenDecorationsUtils.getWindowCornerRadius(context);

        mMarginColor = getResources().getColor(R.color.taskbar_background);

        mMarginColor = getResources().getColor(R.color.taskbar_background_dark);

        int c = getResources().getColor(android.R.color.system_accent1_500);

        mHighlightColor =  Color.argb(HIGHLIGHT_ALPHA, Color.red(c), Color.green(c), Color.blue(c));

        mSplashScreenColor = Color.argb(SPLASHSCREEN_ALPHA, 0, 0, 0);
@@ -125,7 +125,7 @@ public class DropZoneView extends FrameLayout { 


    public void onThemeChange() {

        mCornerRadius = ScreenDecorationsUtils.getWindowCornerRadius(getContext());

        mMarginColor = getResources().getColor(R.color.taskbar_background);

        mMarginColor = getResources().getColor(R.color.taskbar_background_dark);

        mHighlightColor = getResources().getColor(android.R.color.system_accent1_500);



        if (mMarginPercent > 0) {