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

Commit d393eef4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'am-e982b207-2be4-4fdc-8ea8-5807d8b1a2ca' into ub-launcher3-master 

* changes:
  [automerger] Moving GradientView background alpha to resources am: 6d1e9a10
  Moving GradientView background alpha to resources
parents 88c32f5a b52e82d3

res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
    <bool name="is_large_tablet">false</bool>

    <bool name="allow_rotation">false</bool>



    <integer name="extracted_color_gradient_alpha">191</integer>



    <!-- A string pointer to the original app name string. This allows derived projects to

     easily override the app name without providing all translations -->

    <string name="derived_app_name" translatable="false">@string/app_name</string>

src/com/android/launcher3/graphics/GradientView.java

+8 −9
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.graphics.RectF; 
import android.graphics.Shader;

import android.support.v4.graphics.ColorUtils;

import android.util.AttributeSet;

import android.util.DisplayMetrics;

import android.view.View;

import android.view.animation.AccelerateInterpolator;

import android.view.animation.Interpolator;
@@ -46,7 +47,6 @@ public class GradientView extends View implements WallpaperColorInfo.OnChangeLis 
    private static final int DEFAULT_COLOR = Color.WHITE;

    private static final int ALPHA_MASK_HEIGHT_DP = 500;

    private static final int ALPHA_MASK_WIDTH_DP = 2;

    private static final int ALPHA_COLORS = 0xBF;

    private static final boolean DEBUG = false;



    private final Bitmap mAlphaGradientMask;
@@ -62,7 +62,7 @@ public class GradientView extends View implements WallpaperColorInfo.OnChangeLis 
    private final Paint mPaintNoScrim = new Paint();

    private float mProgress;

    private final int mMaskHeight, mMaskWidth;

    private final Context mAppContext;

    private final int mAlphaColors;

    private final Paint mDebugPaint = DEBUG ? new Paint() : null;

    private final Interpolator mAccelerator = new AccelerateInterpolator();

    private final float mAlphaStart;
@@ -71,15 +71,14 @@ public class GradientView extends View implements WallpaperColorInfo.OnChangeLis 


    public GradientView(Context context, AttributeSet attrs) {

        super(context, attrs);

        this.mAppContext = context.getApplicationContext();

        this.mMaskHeight = Utilities.pxFromDp(ALPHA_MASK_HEIGHT_DP,

                mAppContext.getResources().getDisplayMetrics());

        this.mMaskWidth = Utilities.pxFromDp(ALPHA_MASK_WIDTH_DP,

                mAppContext.getResources().getDisplayMetrics());

        DisplayMetrics dm = getResources().getDisplayMetrics();

        this.mMaskHeight = Utilities.pxFromDp(ALPHA_MASK_HEIGHT_DP, dm);

        this.mMaskWidth = Utilities.pxFromDp(ALPHA_MASK_WIDTH_DP, dm);

        Launcher launcher = Launcher.getLauncher(context);

        this.mAlphaStart = launcher.getDeviceProfile().isVerticalBarLayout() ? 0 : 100;

        this.mScrimColor = Themes.getAttrColor(context, R.attr.allAppsScrimColor);

        this.mWallpaperColorInfo = WallpaperColorInfo.getInstance(launcher);

        mAlphaColors = getResources().getInteger(R.integer.extracted_color_gradient_alpha);

        updateColors();

        mAlphaGradientMask = createDitheredAlphaMask();

    }
@@ -104,9 +103,9 @@ public class GradientView extends View implements WallpaperColorInfo.OnChangeLis 


    private void updateColors() {

        this.mColor1 = ColorUtils.setAlphaComponent(mWallpaperColorInfo.getMainColor(),

                ALPHA_COLORS);

                mAlphaColors);

        this.mColor2 = ColorUtils.setAlphaComponent(mWallpaperColorInfo.getSecondaryColor(),

                ALPHA_COLORS);

                mAlphaColors);

        if (mWidth + mHeight > 0) {

            createRadialShader();

        }