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

Commit dbc5e56e authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Merging unnecessary subclass of ActivityAllAppsContainerView" into tm-qpr-dev

parents e73db2a0 34c499dc

src/com/android/launcher3/Launcher.java

+1 −2
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ import com.android.launcher3.allapps.ActivityAllAppsContainerView; 
import com.android.launcher3.allapps.AllAppsRecyclerView;

import com.android.launcher3.allapps.AllAppsStore;

import com.android.launcher3.allapps.AllAppsTransitionController;

import com.android.launcher3.allapps.BaseAllAppsContainerView;

import com.android.launcher3.allapps.BaseSearchConfig;

import com.android.launcher3.allapps.DiscoveryBounce;

import com.android.launcher3.anim.PropertyListBuilder;
@@ -1697,7 +1696,7 @@ public class Launcher extends StatefulActivity<LauncherState> 


    private void showAllAppsWorkTabFromIntent(boolean alreadyOnHome) {

        showAllAppsFromIntent(alreadyOnHome);

        mAppsView.switchToTab(BaseAllAppsContainerView.AdapterHolder.WORK);

        mAppsView.switchToTab(ActivityAllAppsContainerView.AdapterHolder.WORK);

    }



    /**

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

+887 −29

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ public class AllAppsRecyclerView extends FastScrollRecyclerView { 
            return;

        } else if (appsView.mViewPager != null) {

            int currentPage = appsView.mViewPager.getCurrentPage();

            if (currentPage == BaseAllAppsContainerView.AdapterHolder.WORK) {

            if (currentPage == ActivityAllAppsContainerView.AdapterHolder.WORK) {

                // In work A-Z list

                mgr.logger().withContainerInfo(containerInfo).log((mCumulativeVerticalScroll > 0)

                        ? LAUNCHER_WORK_FAB_BUTTON_COLLAPSE

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

deleted100644 → 0
+0 −996

File deleted.

Preview size limit exceeded, changes collapsed.

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

+4 −4
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import androidx.recyclerview.widget.RecyclerView; 


import com.android.launcher3.Insettable;

import com.android.launcher3.R;

import com.android.launcher3.allapps.BaseAllAppsContainerView.AdapterHolder;

import com.android.launcher3.allapps.ActivityAllAppsContainerView.AdapterHolder;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;

import com.android.launcher3.views.ActivityContext;
@@ -72,8 +72,8 @@ public class FloatingHeaderView extends LinearLayout implements 
                    moved(current);

                    applyVerticalMove();

                    if (headerCollapsed != mHeaderCollapsed) {

                        BaseAllAppsContainerView<?> parent =

                                (BaseAllAppsContainerView<?>) getParent();

                        ActivityAllAppsContainerView<?> parent =

                                (ActivityAllAppsContainerView<?>) getParent();

                        parent.invalidateHeader();

                    }

                }
@@ -191,7 +191,7 @@ public class FloatingHeaderView extends LinearLayout implements 
        updateExpectedHeight();



        if (mMaxTranslation != oldMaxHeight || mFloatingRowsCollapsed) {

            BaseAllAppsContainerView<?> parent = (BaseAllAppsContainerView<?>) getParent();

            ActivityAllAppsContainerView parent = (ActivityAllAppsContainerView) getParent();

            if (parent != null) {

                parent.setupHeader();

            }