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

Merge "Remove light theme support for split screen surface." into udc-dev

Browse Source
This commit is contained in:
Brian Isganitis
2023-05-02 20:06:53 +00:00
committed by Android (Google) Code Review
parent cf3cbe8a0b 4d9af652f1
commit 9779b22cd9
5 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,20 +0,0 @@
<?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>

0
libs/WindowManager/Shell/res/color-night/taskbar_background.xml → libs/WindowManager/Shell/res/color/taskbar_background_dark.xml
View File

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

@@ -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-->

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

@@ -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>

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

@@ -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) {