Make resize veil background adapt to theme.
Set the background of the resize veil to light or dark based on whether dark theme is applied. Video: http://recall/-/hJNEr4C0IUowK3TyPPf4wT/diSieIqfY6tdF5rsoOT0PH Bug: 274773589 Test: Manual; resize apps with different caption colors. Change-Id: Id94d81ae01ad0e9edeaed51591f539d4fe5eb913
This commit is contained in:
@@ -67,4 +67,6 @@
|
||||
<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_active">#00677E</color>
|
||||
<color name="desktop_mode_resize_veil_light">#EFF1F2</color>
|
||||
<color name="desktop_mode_resize_veil_dark">#1C1C17</color>
|
||||
</resources>
|
||||
|
||||
@@ -19,8 +19,10 @@ package com.android.wm.shell.windowdecor;
|
||||
import android.animation.Animator;
|
||||
import android.animation.AnimatorListenerAdapter;
|
||||
import android.animation.ValueAnimator;
|
||||
import android.annotation.ColorRes;
|
||||
import android.app.ActivityManager.RunningTaskInfo;
|
||||
import android.content.Context;
|
||||
import android.content.res.Configuration;
|
||||
import android.graphics.PixelFormat;
|
||||
import android.graphics.Rect;
|
||||
import android.graphics.drawable.Drawable;
|
||||
@@ -109,6 +111,10 @@ public class ResizeVeil {
|
||||
t.reparent(mVeilSurface, parentSurface);
|
||||
mParentSurface = parentSurface;
|
||||
}
|
||||
|
||||
int backgroundColorId = getBackgroundColorId();
|
||||
mViewHost.getView().setBackgroundColor(mContext.getColor(backgroundColorId));
|
||||
|
||||
t.show(mVeilSurface)
|
||||
.apply();
|
||||
final ValueAnimator animator = new ValueAnimator();
|
||||
@@ -158,6 +164,17 @@ public class ResizeVeil {
|
||||
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.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user