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

Commit 960dc2b9 authored by Tracy Zhou's avatar Tracy Zhou Committed by Automerger Merge Worker
Browse files

Merge "Cover screen pinning logic around task bar" into tm-dev am: c4b98636 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17463625



Change-Id: I84a13407864ebe649de61163827f2b86e0367e68
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7b0d44f2 c4b98636

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java

+9 −0
Original line number Original line Diff line number Diff line
@@ -427,6 +427,15 @@ public class NavigationBarController implements 
        }

        }

    }

    }





    public boolean isOverviewEnabled(int displayId) {

        final NavigationBarView navBarView = getNavigationBarView(displayId);

        if (navBarView != null) {

            return navBarView.isOverviewEnabled();

        } else {

            return mTaskbarDelegate.isOverviewEnabled();

        }

    }



    /** @return {@link NavigationBar} on the default display. */

    /** @return {@link NavigationBar} on the default display. */

    @Nullable

    @Nullable

    public NavigationBar getDefaultNavigationBar() {

    public NavigationBar getDefaultNavigationBar() {

packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -309,6 +309,10 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, 
                .commitUpdate(mDisplayId);

                .commitUpdate(mDisplayId);

    }

    }





    boolean isOverviewEnabled() {

        return (mSysUiState.getFlags() & View.STATUS_BAR_DISABLE_RECENT) == 0;

    }



    private void updateAssistantAvailability(boolean assistantAvailable) {

    private void updateAssistantAvailability(boolean assistantAvailable) {

        if (mOverviewProxyService.getProxy() == null) {

        if (mOverviewProxyService.getProxy() == null) {

            return;

            return;

packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -271,10 +271,8 @@ public class ScreenPinningRequest implements View.OnClickListener, 




            final Optional<CentralSurfaces> centralSurfacesOptional =

            final Optional<CentralSurfaces> centralSurfacesOptional =

                    mCentralSurfacesOptionalLazy.get();

                    mCentralSurfacesOptionalLazy.get();

            NavigationBarView navigationBarView =

            boolean recentsVisible =

                    centralSurfacesOptional.map(CentralSurfaces::getNavigationBarView).orElse(null);

                    centralSurfacesOptional.map(CentralSurfaces::isOverviewEnabled).orElse(false);

            final boolean recentsVisible = navigationBarView != null

                    && navigationBarView.isRecentsButtonVisible();

            boolean touchExplorationEnabled = mAccessibilityService.isTouchExplorationEnabled();

            boolean touchExplorationEnabled = mAccessibilityService.isTouchExplorationEnabled();

            int descriptionStringResId;

            int descriptionStringResId;

            if (QuickStepContract.isGesturalMode(mNavBarMode)) {

            if (QuickStepContract.isGesturalMode(mNavBarMode)) {
@@ -295,6 +293,8 @@ public class ScreenPinningRequest implements View.OnClickListener, 
                        : R.string.screen_pinning_description_recents_invisible;

                        : R.string.screen_pinning_description_recents_invisible;

            }

            }





            NavigationBarView navigationBarView =

                    centralSurfacesOptional.map(CentralSurfaces::getNavigationBarView).orElse(null);

            if (navigationBarView != null) {

            if (navigationBarView != null) {

                ((ImageView) mLayout.findViewById(R.id.screen_pinning_back_icon))

                ((ImageView) mLayout.findViewById(R.id.screen_pinning_back_icon))

                        .setImageDrawable(navigationBarView.getBackDrawable());

                        .setImageDrawable(navigationBarView.getBackDrawable());

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -3436,6 +3436,10 @@ public class CentralSurfaces extends CoreStartable implements 
        return mNavigationBarController.getNavigationBarView(mDisplayId);

        return mNavigationBarController.getNavigationBarView(mDisplayId);

    }

    }





    public boolean isOverviewEnabled() {

        return mNavigationBarController.isOverviewEnabled(mDisplayId);

    }



    public void showPinningEnterExitToast(boolean entering) {

    public void showPinningEnterExitToast(boolean entering) {

        mNavigationBarController.showPinningEnterExitToast(mDisplayId, entering);

        mNavigationBarController.showPinningEnterExitToast(mDisplayId, entering);

    }

    }