This enables blur both for Taskbar and Launcher, but in slightly different ways. For Taskbar All Apps, we apply blur to the overlay window, and for Launcher All Apps, we utilize the existing DepthController to blur the wallpaper window. For similicity, we currently fade out workspace/hotseat to avoid awkward view + window blurs which don't look that good. This is not the POR, but I think it achieves most of the effect and will help us get some blur exposure. Separately I will continue to investigate options such as blurring workspace in a clever way so it feels blended with the wallpaper, reusing the Taskbar window and connecting it to LauncherState, or using a SurfaceView (though I spent quite some time trying this and it seemed the same as the original issue). In both cases, we use a 20-30% opacity scrim with a set color, and a panel that blends 40% opacity of a dark/light color with 10% white. Also updated some incorrect isTablet checks which really should have been checking shouldShowAllAppsOnSheet(), which includes the all_apps_sheet_for_handheld flag. Demo: https://drive.google.com/file/d/1Ov9Dg3R9YHNfisfxNf97ZIhlDeEA1IWj/view?usp=sharing&resourcekey=0-l_SDpqpS4HtOb10a3b_jNg Other upcoming improvements: interpolator tweaks, colors of things inside the app panel (tabs, private space, search results, etc). Bug: 400827727 Bug: 371343636 Test: Manual Flag: com.android.launcher3.all_apps_blur Change-Id: Ic7063cd822f39a5977715b5477f825bf11e57bdf
206 lines
6.6 KiB
Java
206 lines
6.6 KiB
Java
/*
|
|
* Copyright (C) 2018 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.
|
|
*/
|
|
package com.android.launcher3.views;
|
|
|
|
import static com.android.launcher3.util.SystemUiController.UI_STATE_SCRIM_VIEW;
|
|
|
|
import android.content.Context;
|
|
import android.graphics.Canvas;
|
|
import android.graphics.Color;
|
|
import android.graphics.Rect;
|
|
import android.graphics.drawable.ColorDrawable;
|
|
import android.util.AttributeSet;
|
|
import android.view.View;
|
|
|
|
import androidx.annotation.NonNull;
|
|
import androidx.annotation.Px;
|
|
import androidx.core.graphics.ColorUtils;
|
|
|
|
import com.android.launcher3.Insettable;
|
|
import com.android.launcher3.util.SystemUiController;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
/**
|
|
* Simple scrim which draws a flat color
|
|
*/
|
|
public class ScrimView extends View implements Insettable {
|
|
private static final float STATUS_BAR_COLOR_FORCE_UPDATE_THRESHOLD = 0.9f;
|
|
|
|
private final ArrayList<Runnable> mOpaquenessListeners = new ArrayList<>(1);
|
|
private SystemUiController mSystemUiController;
|
|
private ScrimDrawingController mDrawingController;
|
|
private int mBackgroundColor;
|
|
private boolean mIsVisible = true;
|
|
private boolean mLastDispatchedOpaqueness;
|
|
private float mHeaderScale = 1f;
|
|
|
|
public ScrimView(Context context, AttributeSet attrs) {
|
|
super(context, attrs);
|
|
setFocusable(false);
|
|
}
|
|
|
|
@Override
|
|
public void setInsets(Rect insets) {}
|
|
|
|
@Override
|
|
public boolean hasOverlappingRendering() {
|
|
return false;
|
|
}
|
|
|
|
@Override
|
|
protected boolean onSetAlpha(int alpha) {
|
|
updateSysUiColors();
|
|
dispatchVisibilityListenersIfNeeded();
|
|
return super.onSetAlpha(alpha);
|
|
}
|
|
|
|
@Override
|
|
public void setBackgroundColor(int color) {
|
|
mBackgroundColor = color;
|
|
updateSysUiColors();
|
|
dispatchVisibilityListenersIfNeeded();
|
|
super.setBackgroundColor(color);
|
|
}
|
|
|
|
public int getBackgroundColor() {
|
|
return mBackgroundColor;
|
|
}
|
|
|
|
@Override
|
|
public void onVisibilityAggregated(boolean isVisible) {
|
|
super.onVisibilityAggregated(isVisible);
|
|
mIsVisible = isVisible;
|
|
dispatchVisibilityListenersIfNeeded();
|
|
}
|
|
|
|
public boolean isFullyOpaque() {
|
|
return mIsVisible && getAlpha() == 1 && Color.alpha(mBackgroundColor) == 255;
|
|
}
|
|
|
|
@Override
|
|
protected void onDraw(Canvas canvas) {
|
|
super.onDraw(canvas);
|
|
if (mDrawingController != null) {
|
|
mDrawingController.drawOnScrimWithScale(canvas, mHeaderScale);
|
|
}
|
|
}
|
|
|
|
/** Set scrim header's scale and bottom offset. */
|
|
public void setScrimHeaderScale(float scale) {
|
|
boolean hasChanged = mHeaderScale != scale;
|
|
mHeaderScale = scale;
|
|
if (hasChanged) {
|
|
invalidate();
|
|
}
|
|
}
|
|
|
|
@Override
|
|
protected void onVisibilityChanged(View changedView, int visibility) {
|
|
super.onVisibilityChanged(changedView, visibility);
|
|
updateSysUiColors();
|
|
}
|
|
|
|
private void updateSysUiColors() {
|
|
// Use a light system UI (dark icons) if all apps is behind at least half of the
|
|
// status bar.
|
|
final float threshold = STATUS_BAR_COLOR_FORCE_UPDATE_THRESHOLD;
|
|
boolean forceChange = getVisibility() == VISIBLE
|
|
&& getAlpha() > threshold
|
|
&& (Color.alpha(mBackgroundColor) / 255f) > threshold;
|
|
if (forceChange) {
|
|
getSystemUiController().updateUiState(UI_STATE_SCRIM_VIEW, !isScrimDark());
|
|
} else {
|
|
getSystemUiController().updateUiState(UI_STATE_SCRIM_VIEW, 0);
|
|
}
|
|
}
|
|
|
|
private void dispatchVisibilityListenersIfNeeded() {
|
|
boolean fullyOpaque = isFullyOpaque();
|
|
if (mLastDispatchedOpaqueness == fullyOpaque) {
|
|
return;
|
|
}
|
|
mLastDispatchedOpaqueness = fullyOpaque;
|
|
for (int i = 0; i < mOpaquenessListeners.size(); i++) {
|
|
mOpaquenessListeners.get(i).run();
|
|
}
|
|
}
|
|
|
|
private SystemUiController getSystemUiController() {
|
|
if (mSystemUiController == null) {
|
|
mSystemUiController =
|
|
ActivityContext.lookupContext(getContext()).getSystemUiController();
|
|
}
|
|
return mSystemUiController;
|
|
}
|
|
|
|
private boolean isScrimDark() {
|
|
if (!(getBackground() instanceof ColorDrawable)) {
|
|
throw new IllegalStateException(
|
|
"ScrimView must have a ColorDrawable background, this one has: "
|
|
+ getBackground());
|
|
}
|
|
return ColorUtils.calculateLuminance(
|
|
((ColorDrawable) getBackground()).getColor()) < 0.5f;
|
|
}
|
|
|
|
/**
|
|
* Sets drawing controller. Invalidates ScrimView if drawerController has changed.
|
|
*/
|
|
public void setDrawingController(ScrimDrawingController drawingController) {
|
|
if (mDrawingController != drawingController) {
|
|
mDrawingController = drawingController;
|
|
invalidate();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Registers a listener to be notified of whether the scrim is occluding other UI elements.
|
|
* @see #isFullyOpaque()
|
|
*/
|
|
public void addOpaquenessListener(@NonNull Runnable listener) {
|
|
mOpaquenessListeners.add(listener);
|
|
}
|
|
|
|
/**
|
|
* Removes previously registered listener.
|
|
* @see #addOpaquenessListener(Runnable)
|
|
*/
|
|
public void removeOpaquenessListener(@NonNull Runnable listener) {
|
|
mOpaquenessListeners.remove(listener);
|
|
}
|
|
|
|
/**
|
|
* A Utility interface allowing for other surfaces to draw on ScrimView
|
|
*/
|
|
public interface ScrimDrawingController {
|
|
|
|
/** Draw scrim view on canvas with scale. */
|
|
default void drawOnScrimWithScale(Canvas canvas, float scale) {
|
|
drawOnScrimWithScaleAndBottomOffset(canvas, scale, 0);
|
|
}
|
|
|
|
/** Draw scrim view on canvas with bottomOffset. */
|
|
default void drawOnScrimWithBottomOffset(Canvas canvas, @Px int bottomOffsetPx) {
|
|
drawOnScrimWithScaleAndBottomOffset(canvas, 1f, bottomOffsetPx);
|
|
}
|
|
|
|
/** Draw scrim view on canvas with scale and bottomOffset. */
|
|
void drawOnScrimWithScaleAndBottomOffset(
|
|
Canvas canvas, float scale, @Px int bottomOffsetPx);
|
|
}
|
|
}
|