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

Commit 02ca34d1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make underlying SurfaceView respect visibility of InlineContentView."... 

Merge "Make underlying SurfaceView respect visibility of InlineContentView." into rvc-dev am: f2ba813a

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

Change-Id: Iab4c9183500d011e0ff2fdaeb176e895930b11f9
parents e84e3c55 f2ba813a

core/java/android/widget/inline/InlineContentView.java

+14 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ import android.view.SurfaceControlViewHost; 
import android.view.SurfaceHolder;

import android.view.SurfaceHolder;

import android.view.SurfaceView;

import android.view.SurfaceView;

import android.view.ViewGroup;

import android.view.ViewGroup;

import android.view.ViewTreeObserver.OnPreDrawListener;





import java.util.function.Consumer;

import java.util.function.Consumer;
@@ -130,6 +131,16 @@ public class InlineContentView extends ViewGroup { 
    @Nullable

    @Nullable

    private SurfacePackageUpdater mSurfacePackageUpdater;

    private SurfacePackageUpdater mSurfacePackageUpdater;





    @NonNull

    private final OnPreDrawListener mDrawListener = new OnPreDrawListener() {

        @Override

        public boolean onPreDraw() {

            int visibility = InlineContentView.this.isShown() ? VISIBLE : GONE;

            mSurfaceView.setVisibility(visibility);

            return true;

        }

    };



    /**

    /**

     * @inheritDoc

     * @inheritDoc

     * @hide

     * @hide
@@ -202,6 +213,8 @@ public class InlineContentView extends ViewGroup { 
                        }

                        }

                    });

                    });

        }

        }

        mSurfaceView.setVisibility(VISIBLE);

        getViewTreeObserver().addOnPreDrawListener(mDrawListener);

    }

    }





    @Override

    @Override
@@ -211,6 +224,7 @@ public class InlineContentView extends ViewGroup { 
        if (mSurfacePackageUpdater != null) {

        if (mSurfacePackageUpdater != null) {

            mSurfacePackageUpdater.onSurfacePackageReleased();

            mSurfacePackageUpdater.onSurfacePackageReleased();

        }

        }

        getViewTreeObserver().removeOnPreDrawListener(mDrawListener);

    }

    }





    @Override

    @Override