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

Commit 136b0565 authored by Jiaming Liu's avatar Jiaming Liu Committed by Automerger Merge Worker
Browse files

Merge "Get FoldingFeatures only when needed" into udc-qpr-dev am: 15e79656 

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



Change-Id: Id2590a836b66af2a428b37a3caaf45635426f03b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1b0ffdcd 15e79656

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java

+15 −2
Original line number Diff line number Diff line
@@ -651,7 +651,8 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { 
        if (minDimensionsPair == null) {

            return splitAttributes;

        }

        final FoldingFeature foldingFeature = getFoldingFeature(taskProperties);

        final FoldingFeature foldingFeature = getFoldingFeatureForHingeType(

                taskProperties, splitAttributes);

        final Configuration taskConfiguration = taskProperties.getConfiguration();

        final Rect primaryBounds = getPrimaryBounds(taskConfiguration, splitAttributes,

                foldingFeature);
@@ -726,7 +727,8 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { 
    Rect getRelBoundsForPosition(@Position int position, @NonNull TaskProperties taskProperties,

            @NonNull SplitAttributes splitAttributes) {

        final Configuration taskConfiguration = taskProperties.getConfiguration();

        final FoldingFeature foldingFeature = getFoldingFeature(taskProperties);

        final FoldingFeature foldingFeature = getFoldingFeatureForHingeType(

                taskProperties, splitAttributes);

        if (!shouldShowSplit(splitAttributes)) {

            return new Rect();

        }
@@ -932,6 +934,17 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { 
        }

    }



    @Nullable

    private FoldingFeature getFoldingFeatureForHingeType(

            @NonNull TaskProperties taskProperties,

            @NonNull SplitAttributes splitAttributes) {

        SplitType splitType = splitAttributes.getSplitType();

        if (!(splitType instanceof HingeSplitType)) {

            return null;

        }

        return getFoldingFeature(taskProperties);

    }



    @Nullable

    @VisibleForTesting

    FoldingFeature getFoldingFeature(@NonNull TaskProperties taskProperties) {