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

Commit 3121768f authored by Brian Isganitis's avatar Brian Isganitis
Browse files

Update split screen UI to support light theme. 

Persistent Taskbar supports light/dark themeing, so split screen should
blend with the current mode.

Test: Manual
Fix: 268052229
Change-Id: I4a2857c89a04bdacb35c2189b82b8396cbf712ee
Merged-In: I4a2857c89a04bdacb35c2189b82b8396cbf712ee
parent c0b37557

libs/WindowManager/Shell/res/color/split_divider_background.xml→libs/WindowManager/Shell/res/color-night/taskbar_background.xml

+2 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~ Copyright (C) 2023 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.
@@ -14,6 +14,7 @@ 
  ~ 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-night-v31/taskbar_background.xml -->

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

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

</selector>
 
 No newline at end of file

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

+1 −1
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@ 
  -->

<!-- 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="15" />

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

</selector>
 
 No newline at end of file

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

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



<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 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
 */

-->

<resources>

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

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

    <color name="split_divider_background">@color/taskbar_background</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/common/split/SplitLayout.java

+4 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
    private int mOrientation;

    private int mRotation;

    private int mDensity;

    private int mUiMode;



    private final boolean mDimNonImeSide;

    private ValueAnimator mDividerFlingAnimator;
@@ -295,10 +296,12 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
        final Rect rootBounds = configuration.windowConfiguration.getBounds();

        final int orientation = configuration.orientation;

        final int density = configuration.densityDpi;

        final int uiMode = configuration.uiMode;



        if (mOrientation == orientation

                && mRotation == rotation

                && mDensity == density

                && mUiMode == uiMode

                && mRootBounds.equals(rootBounds)) {

            return false;

        }
@@ -310,6 +313,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
        mRootBounds.set(rootBounds);

        mRotation = rotation;

        mDensity = density;

        mUiMode = uiMode;

        mDividerSnapAlgorithm = getSnapAlgorithm(mContext, mRootBounds, null);

        updateDividerConfig(mContext);

        initDividerPosition(mTempRect);