Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update split screen UI to support light theme." into tm-qpr-dev am: 767ab1e8c4

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21592580

Change-Id: Ia4f5f97c44198fc9d78906a33a643b8fc4ed52f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Brian Isganitis
2023-03-06 23:48:02 +00:00
committed by Automerger Merge Worker
parent 6998a66f74 767ab1e8c4
commit 3112d073c0
5 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?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"); ~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with 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 ~ See the License for the specific language governing permissions and
~ limitations under the License. ~ 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"> <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="15" />
</selector> </selector>

2
libs/WindowManager/Shell/res/color/taskbar_background.xml
View File

@@ -16,5 +16,5 @@
--> -->
<!-- Should be the same as in packages/apps/Launcher3/res/color-v31/taskbar_background.xml --> <!-- 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"> <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> </selector>

1
libs/WindowManager/Shell/res/values-night/colors.xml
View File

@@ -15,6 +15,7 @@
--> -->
<resources> <resources>
<color name="docked_divider_handle">#ffffff</color>
<!-- Bubbles --> <!-- Bubbles -->
<color name="bubbles_icon_tint">@color/GM2_grey_200</color> <color name="bubbles_icon_tint">@color/GM2_grey_200</color>
<!-- Splash screen--> <!-- Splash screen-->

3
libs/WindowManager/Shell/res/values/colors.xml
View File

@@ -17,7 +17,8 @@
*/ */
--> -->
<resources> <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> <drawable name="forced_resizable_background">#59000000</drawable>
<color name="minimize_dock_shadow_start">#60000000</color> <color name="minimize_dock_shadow_start">#60000000</color>
<color name="minimize_dock_shadow_end">#00000000</color> <color name="minimize_dock_shadow_end">#00000000</color>

4
libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java
View File

@@ -120,6 +120,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
private int mOrientation; private int mOrientation;
private int mRotation; private int mRotation;
private int mDensity; private int mDensity;
private int mUiMode;
private final boolean mDimNonImeSide; private final boolean mDimNonImeSide;
private ValueAnimator mDividerFlingAnimator; private ValueAnimator mDividerFlingAnimator;
@@ -295,10 +296,12 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
final Rect rootBounds = configuration.windowConfiguration.getBounds(); final Rect rootBounds = configuration.windowConfiguration.getBounds();
final int orientation = configuration.orientation; final int orientation = configuration.orientation;
final int density = configuration.densityDpi; final int density = configuration.densityDpi;
final int uiMode = configuration.uiMode;
if (mOrientation == orientation if (mOrientation == orientation
&& mRotation == rotation && mRotation == rotation
&& mDensity == density && mDensity == density
&& mUiMode == uiMode
&& mRootBounds.equals(rootBounds)) { && mRootBounds.equals(rootBounds)) {
return false; return false;
} }
@@ -310,6 +313,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
mRootBounds.set(rootBounds); mRootBounds.set(rootBounds);
mRotation = rotation; mRotation = rotation;
mDensity = density; mDensity = density;
mUiMode = uiMode;
mDividerSnapAlgorithm = getSnapAlgorithm(mContext, mRootBounds, null); mDividerSnapAlgorithm = getSnapAlgorithm(mContext, mRootBounds, null);
updateDividerConfig(mContext); updateDividerConfig(mContext);
initDividerPosition(mTempRect); initDividerPosition(mTempRect);