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

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

Merge "Add 16dp between nav bar and container by setting extra padding to the... 

Merge "Add 16dp between nav bar and container by setting extra padding to the recyclerView." into main
parents c9d07b06 bdb5836a

res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -497,6 +497,7 @@ 
    <dimen name="ps_button_width">40dp</dimen>

    <dimen name="ps_lock_button_width">89dp</dimen>

    <dimen name="ps_app_divider_padding">16dp</dimen>

    <dimen name="ps_extra_bottom_padding">16dp</dimen>

    <dimen name="ps_lock_corner_radius">20dp</dimen>

    <dimen name="ps_lock_icon_size">20dp</dimen>

    <dimen name="ps_lock_icon_margin_top">10dp</dimen>

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

+17 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.launcher3.allapps; 
import static com.android.launcher3.Flags.enableExpandingPauseWorkButton;

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

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

import static com.android.launcher3.allapps.BaseAllAppsAdapter.VIEW_TYPE_PRIVATE_SPACE_HEADER;

import static com.android.launcher3.allapps.BaseAllAppsAdapter.VIEW_TYPE_WORK_DISABLED_CARD;

import static com.android.launcher3.allapps.BaseAllAppsAdapter.VIEW_TYPE_WORK_EDU_CARD;

import static com.android.launcher3.config.FeatureFlags.ALL_APPS_GONE_VISIBILITY;
@@ -97,6 +98,7 @@ import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip; 
import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;

import java.util.Optional;

import java.util.function.Predicate;

import java.util.stream.Stream;
@@ -157,6 +159,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext> 
            };

    private final Paint mNavBarScrimPaint;

    private final int mHeaderProtectionColor;

    private final int mPrivateSpaceBottomExtraSpace;

    private final Path mTmpPath = new Path();

    private final RectF mTmpRectF = new RectF();

    protected AllAppsPagedView mViewPager;
@@ -219,6 +222,8 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext> 
                this,

                mActivityContext.getStatsLogManager(),

                UserCache.INSTANCE.get(mActivityContext));

        mPrivateSpaceBottomExtraSpace = context.getResources().getDimensionPixelSize(

                R.dimen.ps_extra_bottom_padding);

        mAH = Arrays.asList(null, null, null);

        mNavBarScrimPaint = new Paint();

        mNavBarScrimPaint.setColor(Themes.getNavBarScrimColor(mActivityContext));
@@ -1577,6 +1582,14 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext> 
                int bottomOffset = 0;

                if (isWork() && mWorkManager.getWorkModeSwitch() != null) {

                    bottomOffset = mInsets.bottom + mWorkManager.getWorkModeSwitch().getHeight();

                } else if (isMain() && mPrivateProfileManager != null) {

                    Optional<AdapterItem> privateSpaceHeaderItem = mAppsList.getAdapterItems()

                            .stream()

                            .filter(item -> item.viewType == VIEW_TYPE_PRIVATE_SPACE_HEADER)

                            .findFirst();

                    if (privateSpaceHeaderItem.isPresent()) {

                        bottomOffset = mPrivateSpaceBottomExtraSpace;

                    }

                }

                if (isSearchBarFloating()) {

                    bottomOffset += mSearchContainer.getHeight();
@@ -1593,5 +1606,9 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext> 
        private boolean isSearch() {

            return mType == SEARCH;

        }



        private boolean isMain() {

            return mType == MAIN;

        }

    }

}