From e92074dc6697dfe1f95c0eb66a40ff2fc0169b32 Mon Sep 17 00:00:00 2001 From: Miranda Kephart Date: Thu, 19 Sep 2019 16:33:05 +0000 Subject: [PATCH] Revert "Add shadow to assistant handles" This reverts commit c445bbf3eb07ab0282ef94cf666545a9f683b18d. Reason for revert: Causes memory issues on the GPU (~50mb -> ~70mb) Test: Memory usage goes back down to 53mb with this revert. https://sponge.corp.google.com/invocation?tab=Logfile+Index&id=7643bf50-41bb-45a7-8c93-d0ddb1f82a04&searchFor= (last file, search for com.android.systemui#anon-and-swap-avg-median) Bug: 141187457 Change-Id: Ia48eca3f95097562771abc3a523bd32b74f2d443 --- .../com/android/systemui/CornerHandleView.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/CornerHandleView.java b/packages/SystemUI/src/com/android/systemui/CornerHandleView.java index 6209c2c362063..a94952c5bc19f 100644 --- a/packages/SystemUI/src/com/android/systemui/CornerHandleView.java +++ b/packages/SystemUI/src/com/android/systemui/CornerHandleView.java @@ -19,7 +19,6 @@ package com.android.systemui; import android.animation.ArgbEvaluator; import android.content.Context; import android.graphics.Canvas; -import android.graphics.Color; import android.graphics.Paint; import android.graphics.Path; import android.graphics.RectF; @@ -28,7 +27,6 @@ import android.util.DisplayMetrics; import android.view.ContextThemeWrapper; import android.view.View; -import com.android.internal.graphics.ColorUtils; import com.android.settingslib.Utils; /** @@ -109,7 +107,6 @@ public class CornerHandleView extends View { mPaint.setColor((int) ArgbEvaluator.getInstance().evaluate(darkIntensity, mLightColor, mDarkColor)); - updateShadow(); if (getVisibility() == VISIBLE) { invalidate(); } @@ -121,21 +118,6 @@ public class CornerHandleView extends View { canvas.drawPath(mPath, mPaint); } - private void updateShadow() { - if (ColorUtils.calculateLuminance(mPaint.getColor()) > 0.7f) { - mPaint.setShadowLayer(/** radius */ 5,/** shadowDx */ 0, /** shadowDy */ -1, - /** color */ ColorUtils.setAlphaComponent(/** color */ Color.BLACK, - /** alpha */ 102)); - } else { - mPaint.setShadowLayer(/** radius */ 0, /** shadowDx */ 0, /** shadowDy */ 0, - /** color */ Color.TRANSPARENT); - } - - if (getVisibility() == VISIBLE) { - invalidate(); - } - } - private static float convertDpToPixel(float dp, Context context) { return dp * ((float) context.getResources().getDisplayMetrics().densityDpi / DisplayMetrics.DENSITY_DEFAULT);