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

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

Merge "Introduce transparency in all apps for OnDeviceSearch Bug: 165999272"... 

Merge "Introduce transparency in all apps for OnDeviceSearch Bug: 165999272" into ub-launcher3-master
parents 3cc22175 d9d340c8

res/values/colors.xml

+0 −3
Original line number Diff line number Diff line
@@ -35,9 +35,6 @@ 


    <color name="icon_background">#E0E0E0</color> <!-- Gray 300 -->



    <color name="all_apps_section_fill">#32c0c0c0</color>

    <color name="all_apps_section_focused_item">#40c0c0c0</color>



    <color name="gesture_tutorial_ripple_color">#A0C2F9</color> <!-- Light Blue -->

    <color name="gesture_tutorial_fake_task_view_color">#6DA1FF</color> <!-- Light Blue -->

    <color name="gesture_tutorial_action_button_label_color">#FFFFFFFF</color>

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

+7 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.graphics.RectF; 
import android.view.View;



import androidx.annotation.Nullable;

import androidx.core.graphics.ColorUtils;

import androidx.recyclerview.widget.RecyclerView;



import com.android.launcher3.R;
@@ -100,6 +101,9 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration { 
     * Handles grouping and drawing of items in the same all apps sections.

     */

    public static class SectionDecorationHandler {

        private static final int FILL_ALPHA = (int) (.3f * 255);

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



        protected RectF mBounds = new RectF();

        private final boolean mIsFullWidth;

        private final float mRadius;
@@ -111,8 +115,9 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration { 


        public SectionDecorationHandler(Context context, boolean isFullWidth) {

            mIsFullWidth = isFullWidth;

            mFillcolor = context.getColor(R.color.all_apps_section_fill);

            mFocusColor = context.getColor(R.color.all_apps_section_focused_item);

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

            mFillcolor = ColorUtils.setAlphaComponent(endScrim, FILL_ALPHA);

            mFocusColor = ColorUtils.setAlphaComponent(endScrim, FOCUS_ALPHA);

            mRadius = Themes.getDialogCornerRadius(context);

        }

src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java

+2 −2
Original line number Diff line number Diff line
@@ -139,8 +139,8 @@ public class AppsSearchContainerLayout extends ExtendedEditText 
        mApps = appsView.getApps();

        mAppsView = appsView;

        mSearchBarController.initialize(

                new DefaultAppSearchAlgorithm(LauncherAppState.getInstance(mLauncher)), this,

                mLauncher, this, this);

                new DefaultAppSearchAlgorithm(mLauncher, LauncherAppState.getInstance(mLauncher)),

                this, mLauncher, this, this);

    }



    @Override

src/com/android/launcher3/allapps/search/AppsSearchPipeline.java

+5 −4
Original line number Diff line number Diff line
@@ -53,15 +53,16 @@ public class AppsSearchPipeline implements SearchPipeline { 
    private final LauncherAppState mLauncherAppState;

    private final boolean mHeroSectionSupported;



    public AppsSearchPipeline(LauncherAppState launcherAppState) {

        this(launcherAppState, true);

    public AppsSearchPipeline(Context context, LauncherAppState launcherAppState) {

        this(context, launcherAppState, true);

    }



    public AppsSearchPipeline(LauncherAppState launcherAppState, boolean supportsHeroView) {

    public AppsSearchPipeline(Context context, LauncherAppState launcherAppState,

            boolean supportsHeroView) {

        mLauncherAppState = launcherAppState;

        mSearchSectionInfo = new SearchSectionInfo();

        mSearchSectionInfo.setDecorationHandler(

                new SectionDecorationHandler(launcherAppState.getContext(), true));

                new SectionDecorationHandler(context, true));

        mHeroSectionSupported = supportsHeroView;

    }

src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java

+3 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package com.android.launcher3.allapps.search;



import android.content.Context;

import android.os.Handler;



import com.android.launcher3.LauncherAppState;
@@ -30,9 +31,9 @@ public class DefaultAppSearchAlgorithm implements SearchAlgorithm { 
    protected final Handler mResultHandler;

    private final AppsSearchPipeline mAppsSearchPipeline;



    public DefaultAppSearchAlgorithm(LauncherAppState launcherAppState) {

    public DefaultAppSearchAlgorithm(Context context, LauncherAppState launcherAppState) {

        mResultHandler = new Handler();

        mAppsSearchPipeline = new AppsSearchPipeline(launcherAppState, false);

        mAppsSearchPipeline = new AppsSearchPipeline(context, launcherAppState, false);

    }



    @Override