Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 573e6ec9 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Shutdown scrim opacity at 95%" into oc-dr1-dev 

am: 53ddffdf

Change-Id: I42729d1a98ec4272671fa8ae8da7ccb6798a82fa
parents 1b891e09 53ddffdf

packages/SystemUI/src/com/android/systemui/colorextraction/SysuiColorExtractor.java

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ public class SysuiColorExtractor extends ColorExtractor { 
     */

    @Override

    public GradientColors getColors(int which) {

        return getColors(which, TYPE_NORMAL);

        return getColors(which, TYPE_DARK);

    }



    /**

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

+8 −4
Original line number Diff line number Diff line
@@ -25,8 +25,10 @@ import com.android.internal.telephony.TelephonyProperties; 
import com.android.internal.widget.LockPatternUtils;

import com.android.systemui.Dependency;

import com.android.systemui.HardwareUiLayout;

import com.android.systemui.Interpolators;

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.plugins.GlobalActions.GlobalActionsManager;

import com.android.systemui.statusbar.notification.NotificationUtils;

import com.android.systemui.statusbar.phone.ScrimController;

import com.android.systemui.volume.VolumeDialogMotion.LogAccelerateInterpolator;

import com.android.systemui.volume.VolumeDialogMotion.LogDecelerateInterpolator;
@@ -65,6 +67,7 @@ import android.telephony.TelephonyManager; 
import android.text.TextUtils;

import android.util.ArraySet;

import android.util.Log;

import android.util.MathUtils;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;
@@ -112,6 +115,8 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener, DialogIn 
    private static final String GLOBAL_ACTION_KEY_ASSIST = "assist";

    private static final String GLOBAL_ACTION_KEY_RESTART = "restart";



    private static final float SHUTDOWN_SCRIM_ALPHA = 0.95f;



    private final Context mContext;

    private final GlobalActionsManager mWindowManagerFuncs;

    private final AudioManager mAudioManager;
@@ -1291,7 +1296,7 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener, DialogIn 
                    .alpha(1)

                    .translationX(0)

                    .setDuration(300)

                    .setInterpolator(new LogDecelerateInterpolator())

                    .setInterpolator(Interpolators.FAST_OUT_SLOW_IN)

                    .setUpdateListener(animation -> {

                        int alpha = (int) ((Float) animation.getAnimatedValue()

                                * ScrimController.GRADIENT_SCRIM_ALPHA * 255);
@@ -1329,9 +1334,8 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener, DialogIn 
                    .setInterpolator(new LogAccelerateInterpolator())

                    .setUpdateListener(animation -> {

                        float frac = animation.getAnimatedFraction();

                        float alpha = frac *(ScrimController.GRADIENT_SCRIM_ALPHA_BUSY

                                        - ScrimController.GRADIENT_SCRIM_ALPHA)

                                + ScrimController.GRADIENT_SCRIM_ALPHA;

                        float alpha = NotificationUtils.interpolate(

                                ScrimController.GRADIENT_SCRIM_ALPHA, SHUTDOWN_SCRIM_ALPHA, frac);

                        mGradientDrawable.setAlpha((int) (alpha * 255));

                    })

                    .start();