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

Commit c19b51e1 authored by Brian Isganitis's avatar Brian Isganitis Committed by Android (Google) Code Review
Browse files

Merge "Refactor all apps to depend on activity context."

parents 78cac516 1664c9f4

quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java

+1 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.content.Context; 
import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.R;

import com.android.launcher3.allapps.AllAppsContainerView;

import com.android.launcher3.util.Themes;



/**
@@ -44,8 +43,7 @@ public class AllAppsState extends LauncherState { 


    @Override

    public String getDescription(Launcher launcher) {

        AllAppsContainerView appsView = launcher.getAppsView();

        return appsView.getDescription();

        return launcher.getAppsView().getDescription();

    }



    @Override

res/layout/secondary_launcher.xml

+3 −2
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@ 
        android:contentDescription="@string/all_apps_button_label"

        android:onClick="onAppsButtonClicked" />



    <com.android.launcher3.allapps.AllAppsContainerView

    <view

        class="com.android.launcher3.allapps.ActivityAllAppsContainerView"

        android:id="@+id/apps_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"
@@ -121,5 +122,5 @@ 
            android:textSize="16sp" />



        <include layout="@layout/all_apps_fast_scroller" />

    </com.android.launcher3.allapps.AllAppsContainerView>

    </view>

</com.android.launcher3.secondarydisplay.SecondaryDragLayer>
 
 No newline at end of file

src/com/android/launcher3/BaseDraggingActivity.java

+4 −3
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ import androidx.annotation.NonNull; 
import androidx.annotation.Nullable;



import com.android.launcher3.LauncherSettings.Favorites;

import com.android.launcher3.allapps.AllAppsContainerView;

import com.android.launcher3.allapps.ActivityAllAppsContainerView;

import com.android.launcher3.allapps.search.DefaultSearchAdapterProvider;

import com.android.launcher3.allapps.search.SearchAdapterProvider;

import com.android.launcher3.logging.InstanceId;
@@ -340,7 +340,8 @@ public abstract class BaseDraggingActivity extends BaseActivity 
     * Creates and returns {@link SearchAdapterProvider} for build variant specific search result

     * views

     */

    public SearchAdapterProvider createSearchAdapterProvider(AllAppsContainerView allapps) {

        return new DefaultSearchAdapterProvider(this, allapps);

    public SearchAdapterProvider<?> createSearchAdapterProvider(

            ActivityAllAppsContainerView<?> allApps) {

        return new DefaultSearchAdapterProvider(this);

    }

}

src/com/android/launcher3/Launcher.java

+4 −3
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ import androidx.annotation.VisibleForTesting; 
import com.android.launcher3.DropTarget.DragObject;

import com.android.launcher3.accessibility.BaseAccessibilityDelegate.LauncherAction;

import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;

import com.android.launcher3.allapps.AllAppsContainerView;

import com.android.launcher3.allapps.ActivityAllAppsContainerView;

import com.android.launcher3.allapps.AllAppsStore;

import com.android.launcher3.allapps.AllAppsTransitionController;

import com.android.launcher3.allapps.DiscoveryBounce;
@@ -314,7 +314,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche 


    // Main container view for the all apps screen.

    @Thunk

    AllAppsContainerView mAppsView;

    ActivityAllAppsContainerView<Launcher> mAppsView;

    AllAppsTransitionController mAllAppsController;



    // Scrim view for the all apps and overview state.
@@ -1489,7 +1489,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche 
        return mDragLayer;

    }



    public AllAppsContainerView getAppsView() {

    @Override

    public ActivityAllAppsContainerView<Launcher> getAppsView() {

        return mAppsView;

    }

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

0 → 100644
+207 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.launcher3.allapps;



import android.content.Context;

import android.content.Intent;

import android.util.AttributeSet;

import android.view.KeyEvent;

import android.view.MotionEvent;

import android.view.View;



import androidx.core.graphics.ColorUtils;

import androidx.recyclerview.widget.RecyclerView;



import com.android.launcher3.BaseDraggingActivity;

import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.allapps.search.SearchAdapterProvider;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.util.PackageManagerHelper;



import java.util.Objects;



/**

 * All apps container view with search support for use in a dragging activity.

 *

 * @param <T> Type of context inflating all apps.

 */

public class ActivityAllAppsContainerView<T extends BaseDraggingActivity> extends

        BaseAllAppsContainerView<T> {



    protected SearchUiManager mSearchUiManager;

    /**

     * View that defines the search box. Result is rendered inside the recycler view defined in the

     * base class.

     */

    private View mSearchContainer;

    /** {@code true} when rendered view is in search state instead of the scroll state. */

    private boolean mIsSearching;



    public ActivityAllAppsContainerView(Context context) {

        this(context, null);

    }



    public ActivityAllAppsContainerView(Context context, AttributeSet attrs) {

        this(context, attrs, 0);

    }



    public ActivityAllAppsContainerView(Context context, AttributeSet attrs, int defStyleAttr) {

        super(context, attrs, defStyleAttr);

        mActivityContext.addOnDeviceProfileChangeListener(this);

    }



    public SearchUiManager getSearchUiManager() {

        return mSearchUiManager;

    }



    public View getSearchView() {

        return mSearchContainer;

    }



    /** Updates all apps container with the latest search query. */

    public void setLastSearchQuery(String query) {

        Intent marketSearchIntent = PackageManagerHelper.getMarketSearchIntent(

                mActivityContext, query);

        OnClickListener marketSearchClickListener = (v) -> mActivityContext.startActivitySafely(v,

                marketSearchIntent, null);

        for (int i = 0; i < mAH.size(); i++) {

            mAH.get(i).adapter.setLastSearchQuery(query, marketSearchClickListener);

        }

        mIsSearching = true;

        rebindAdapters();

        mHeader.setCollapsed(true);

    }



    /** Invoke when the current search session is finished. */

    public void onClearSearchResult() {

        mIsSearching = false;

        mHeader.setCollapsed(false);

        rebindAdapters();

        mHeader.reset(false);

    }



    /** Invoke when the search results change. */

    public void onSearchResultsChanged() {

        for (int i = 0; i < mAH.size(); i++) {

            if (mAH.get(i).mRecyclerView != null) {

                mAH.get(i).mRecyclerView.onSearchResultsChanged();

            }

        }

    }



    /** Handles selection on focused view and returns {@code true} on success. */

    public boolean launchHighlightedItem() {

        return getMainAdapterProvider().launchHighlightedItem();

    }



    @Override

    protected SearchAdapterProvider<?> createMainAdapterProvider() {

        return mActivityContext.createSearchAdapterProvider(this);

    }



    @Override

    public boolean shouldContainerScroll(MotionEvent ev) {

        // IF the MotionEvent is inside the search box, and the container keeps on receiving

        // touch input, container should move down.

        if (mActivityContext.getDragLayer().isEventOverView(mSearchContainer, ev)) {

            return true;

        }

        return super.shouldContainerScroll(ev);

    }



    @Override

    public void reset(boolean animate) {

        super.reset(animate);

        // Reset the search bar after transitioning home.

        mSearchUiManager.resetSearch();

    }



    @Override

    protected void onFinishInflate() {

        super.onFinishInflate();

        mSearchContainer = findViewById(R.id.search_container_all_apps);

        mSearchUiManager = (SearchUiManager) mSearchContainer;

        mSearchUiManager.initializeSearch(this);

    }



    @Override

    public boolean dispatchKeyEvent(KeyEvent event) {

        mSearchUiManager.preDispatchKeyEvent(event);

        return super.dispatchKeyEvent(event);

    }



    @Override

    public String getDescription() {

        if (!mUsingTabs && mIsSearching) {

            return getContext().getString(R.string.all_apps_search_results);

        } else {

            return super.getDescription();

        }

    }



    @Override

    protected boolean showTabs() {

        return super.showTabs() && !mIsSearching;

    }



    @Override

    protected void rebindAdapters(boolean force) {

        super.rebindAdapters(force);

        if (!FeatureFlags.ENABLE_DEVICE_SEARCH.get()

                || getMainAdapterProvider().getDecorator() == null) {

            return;

        }



        RecyclerView.ItemDecoration decoration = getMainAdapterProvider().getDecorator();

        mAH.stream()

                .map(adapterHolder -> adapterHolder.mRecyclerView)

                .filter(Objects::nonNull)

                .forEach(v -> {

                    v.removeItemDecoration(decoration); // Remove in case it is already added.

                    v.addItemDecoration(decoration);

                });

    }



    @Override

    protected void updateHeaderScroll(int scrolledOffset) {

        super.updateHeaderScroll(scrolledOffset);

        if (mSearchUiManager.getEditText() == null) {

            return;

        }



        float prog = Utilities.boundToRange((float) scrolledOffset / mHeaderThreshold, 0f, 1f);

        boolean bgVisible = mSearchUiManager.getBackgroundVisibility();

        if (scrolledOffset == 0 && !mIsSearching) {

            bgVisible = true;

        } else if (scrolledOffset > mHeaderThreshold) {

            bgVisible = false;

        }

        mSearchUiManager.setBackgroundVisibility(bgVisible, 1 - prog);

    }



    @Override

    protected int getHeaderColor(float blendRatio) {

        return ColorUtils.setAlphaComponent(

                super.getHeaderColor(blendRatio),

                (int) (mSearchContainer.getAlpha() * 255));

    }



    @Override

    protected int getHeaderBottom() {

        return super.getHeaderBottom() + mSearchContainer.getBottom();

    }

}