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

Merge "Make resize veil background adapt to theme." into udc-dev

Browse Source
This commit is contained in:
Matt Sziklay
2023-05-04 23:06:32 +00:00
committed by Android (Google) Code Review
parent 8f85ec1e56 c8f118f97c
commit 2ce7451ad2
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,4 +67,6 @@
<color name="desktop_mode_caption_menu_text_color">#191C1D</color> <color name="desktop_mode_caption_menu_text_color">#191C1D</color>
<color name="desktop_mode_caption_menu_buttons_color_inactive">#191C1D</color> <color name="desktop_mode_caption_menu_buttons_color_inactive">#191C1D</color>
<color name="desktop_mode_caption_menu_buttons_color_active">#00677E</color> <color name="desktop_mode_caption_menu_buttons_color_active">#00677E</color>
<color name="desktop_mode_resize_veil_light">#EFF1F2</color>
<color name="desktop_mode_resize_veil_dark">#1C1C17</color>
</resources> </resources>

17
libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/ResizeVeil.java
View File

@@ -19,8 +19,10 @@ package com.android.wm.shell.windowdecor;
import android.animation.Animator; import android.animation.Animator;
import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorListenerAdapter;
import android.animation.ValueAnimator; import android.animation.ValueAnimator;
import android.annotation.ColorRes;
import android.app.ActivityManager.RunningTaskInfo; import android.app.ActivityManager.RunningTaskInfo;
import android.content.Context; import android.content.Context;
import android.content.res.Configuration;
import android.graphics.PixelFormat; import android.graphics.PixelFormat;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
@@ -109,6 +111,10 @@ public class ResizeVeil {
t.reparent(mVeilSurface, parentSurface); t.reparent(mVeilSurface, parentSurface);
mParentSurface = parentSurface; mParentSurface = parentSurface;
} }
int backgroundColorId = getBackgroundColorId();
mViewHost.getView().setBackgroundColor(mContext.getColor(backgroundColorId));
t.show(mVeilSurface) t.show(mVeilSurface)
.apply(); .apply();
final ValueAnimator animator = new ValueAnimator(); final ValueAnimator animator = new ValueAnimator();
@@ -158,6 +164,17 @@ public class ResizeVeil {
animator.start(); animator.start();
} }
@ColorRes
private int getBackgroundColorId() {
Configuration configuration = mContext.getResources().getConfiguration();
if ((configuration.uiMode & Configuration.UI_MODE_NIGHT_MASK)
== Configuration.UI_MODE_NIGHT_YES) {
return R.color.desktop_mode_resize_veil_dark;
} else {
return R.color.desktop_mode_resize_veil_light;
}
}
/** /**
* Dispose of veil when it is no longer needed, likely on close of its container decor. * Dispose of veil when it is no longer needed, likely on close of its container decor.
*/ */