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

Commit 90d47aa2 authored by Diego Vela's avatar Diego Vela Committed by Automerger Merge Worker
Browse files

Merge "Fix no features emitting." into tm-qpr-dev am: f85539b1 

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



Change-Id: Ibd25e0fa97240974211ae6d8867dc57f96c83545
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3d9bee98 f85539b1

libs/WindowManager/Jetpack/src/androidx/window/common/CommonFoldingFeature.java

+2 −2
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ public final class CommonFoldingFeature { 
            throw new IllegalArgumentException(

                    "Display feature rectangle cannot have zero width and height simultaneously.");

        }

        this.mRect = rect;

        this.mRect = new Rect(rect);

    }



    /** Returns the type of the feature. */
@@ -217,7 +217,7 @@ public final class CommonFoldingFeature { 
    /** Returns the bounds of the feature. */

    @NonNull

    public Rect getRect() {

        return mRect;

        return new Rect(mRect);

    }



    @Override

libs/WindowManager/Jetpack/src/androidx/window/common/DeviceStateManagerFoldingFeatureProducer.java

+3 −0
Original line number Diff line number Diff line
@@ -166,6 +166,9 @@ public final class DeviceStateManagerFoldingFeatureProducer 
    }



    private void notifyFoldingFeatureChange(String displayFeaturesString) {

        if (!isCurrentStateValid()) {

            return;

        }

        if (TextUtils.isEmpty(displayFeaturesString)) {

            notifyDataChanged(new ArrayList<>());

        } else {

libs/WindowManager/Jetpack/src/androidx/window/extensions/layout/WindowLayoutComponentImpl.java

+5 −0
Original line number Diff line number Diff line
@@ -79,6 +79,11 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent { 
     */

    public void addWindowLayoutInfoListener(@NonNull Activity activity,

            @NonNull Consumer<WindowLayoutInfo> consumer) {

        mFoldingFeatureProducer.getData((features) -> {

            // Get the WindowLayoutInfo from the activity and pass the value to the layoutConsumer.

            WindowLayoutInfo newWindowLayout = getWindowLayoutInfo(activity, features);

            consumer.accept(newWindowLayout);

        });

        mWindowLayoutChangeListeners.put(activity, consumer);

    }