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

Commit 106aa0d6 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

Merge "Apply Silk/ colorBackground(Floating) to AllApps" into sc-dev

parents 0d1fa0ee b3d739df

src/com/android/launcher3/allapps/AllAppsSectionDecorator.java

+2 −3
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration { 
     */

    public static class SectionDecorationHandler {

        private static final int FILL_ALPHA = 0;

        private static final int FOCUS_ALPHA = (int) (.9f * 255);



        protected RectF mBounds = new RectF();

        private final boolean mIsFullWidth;
@@ -123,9 +122,9 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration { 


        public SectionDecorationHandler(Context context, boolean isFullWidth) {

            mIsFullWidth = isFullWidth;

            int endScrim = Themes.getAttrColor(context, R.attr.allAppsScrimColor);

            int endScrim = Themes.getColorBackground(context);

            mFillcolor = ColorUtils.setAlphaComponent(endScrim, FILL_ALPHA);

            mFocusColor = ColorUtils.setAlphaComponent(endScrim, FOCUS_ALPHA);

            mFocusColor = endScrim;

            mRadius = Themes.getDialogCornerRadius(context);

        }

src/com/android/launcher3/util/Themes.java

+5 −0
Original line number Diff line number Diff line
@@ -81,6 +81,11 @@ public class Themes { 
        return getAttrColor(context, android.R.attr.colorAccent);

    }



    /** Returns the floating background color attribute. */

    public static int getColorBackground(Context context) {

        return getAttrColor(context, android.R.attr.colorBackground);

    }



    /** Returns the floating background color attribute. */

    public static int getColorBackgroundFloating(Context context) {

        return getAttrColor(context, android.R.attr.colorBackgroundFloating);

src/com/android/launcher3/views/ScrimView.java

+2 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ import com.android.launcher3.util.Themes; 
 */

public class ScrimView<T extends Launcher> extends View implements Insettable, OnChangeListener {



    private static final float SCRIM_ALPHA = .75f;

    private static final float SCRIM_ALPHA = .95f;

    protected final T mLauncher;

    private final WallpaperColorInfo mWallpaperColorInfo;

    protected final int mEndScrim;
@@ -63,6 +63,7 @@ public class ScrimView<T extends Launcher> extends View implements Insettable, O 
        mWallpaperColorInfo = WallpaperColorInfo.INSTANCE.get(context);

        int endScrim = Themes.getAttrColor(context, R.attr.allAppsScrimColor);

        if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {

            endScrim = Themes.getColorBackgroundFloating(context);

            endScrim = ColorUtils.setAlphaComponent(endScrim, (int) (255  * SCRIM_ALPHA));

        }

        mEndScrim = endScrim;