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

Commit 04a1557c authored by Dan Sandler's avatar Dan Sandler Committed by Android (Google) Code Review
Browse files

Merge "Fix inset hinting when adding window" into lmp-mr1-dev

parents 2885c6ba 37d7a68d

core/java/android/service/wallpaper/WallpaperService.java

+2 −1
Original line number Diff line number Diff line
@@ -675,7 +675,8 @@ public abstract class WallpaperService extends Service { 
                                com.android.internal.R.style.Animation_Wallpaper;

                        mInputChannel = new InputChannel();

                        if (mSession.addToDisplay(mWindow, mWindow.mSeq, mLayout, View.VISIBLE,

                            Display.DEFAULT_DISPLAY, mContentInsets, mInputChannel) < 0) {

                            Display.DEFAULT_DISPLAY, mContentInsets, mStableInsets,

                                mInputChannel) < 0) {

                            Log.w(TAG, "Failed to add window while updating wallpaper surface.");

                            return;

                        }

core/java/android/view/IWindowSession.aidl

+5 −4
Original line number Diff line number Diff line
@@ -36,15 +36,16 @@ import android.view.Surface; 
 */

interface IWindowSession {

    int add(IWindow window, int seq, in WindowManager.LayoutParams attrs,

            in int viewVisibility, out Rect outContentInsets,

            in int viewVisibility, out Rect outContentInsets, out Rect outStableInsets,

            out InputChannel outInputChannel);

    int addToDisplay(IWindow window, int seq, in WindowManager.LayoutParams attrs,

            in int viewVisibility, in int layerStackId, out Rect outContentInsets,

            out InputChannel outInputChannel);

            out Rect outStableInsets, out InputChannel outInputChannel);

    int addWithoutInputChannel(IWindow window, int seq, in WindowManager.LayoutParams attrs,

            in int viewVisibility, out Rect outContentInsets);

            in int viewVisibility, out Rect outContentInsets, out Rect outStableInsets);

    int addToDisplayWithoutInputChannel(IWindow window, int seq, in WindowManager.LayoutParams attrs,

            in int viewVisibility, in int layerStackId, out Rect outContentInsets);

            in int viewVisibility, in int layerStackId, out Rect outContentInsets,

            out Rect outStableInsets);

    void remove(IWindow window);



    /**

core/java/android/view/SurfaceView.java

+2 −1
Original line number Diff line number Diff line
@@ -496,7 +496,8 @@ public class SurfaceView extends View { 
                    mLayout.type = mWindowType;

                    mLayout.gravity = Gravity.START|Gravity.TOP;

                    mSession.addToDisplayWithoutInputChannel(mWindow, mWindow.mSeq, mLayout,

                            mVisible ? VISIBLE : GONE, display.getDisplayId(), mContentInsets);

                            mVisible ? VISIBLE : GONE, display.getDisplayId(), mContentInsets,

                            mStableInsets);

                }



                boolean realSizeChanged;

core/java/android/view/ViewRootImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ public final class ViewRootImpl implements ViewParent, 
                    collectViewAttributes();

                    res = mWindowSession.addToDisplay(mWindow, mSeq, mWindowAttributes,

                            getHostVisibility(), mDisplay.getDisplayId(),

                            mAttachInfo.mContentInsets, mInputChannel);

                            mAttachInfo.mContentInsets, mAttachInfo.mStableInsets, mInputChannel);

                } catch (RemoteException e) {

                    mAdded = false;

                    mView = null;

core/java/android/view/WindowManagerPolicy.java

+7 −4
Original line number Diff line number Diff line
@@ -867,10 +867,13 @@ public interface WindowManagerPolicy { 
     * be correct.

     *

     * @param attrs The LayoutParams of the window.

     * @param contentInset The areas covered by system windows, expressed as positive insets

     * @param outContentInsets The areas covered by system windows, expressed as positive insets.

     * @param outStableInsets The areas covered by stable system windows irrespective of their

     *                        current visibility. Expressed as positive insets.

     *

     */

    public void getContentInsetHintLw(WindowManager.LayoutParams attrs, Rect contentInset);

    public void getInsetHintLw(WindowManager.LayoutParams attrs, Rect outContentInsets,

            Rect outStableInsets);



    /**

     * Called when layout of the windows is finished.  After this function has