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

Commit 1c6bfd69 authored by Filip Gruszczynski's avatar Filip Gruszczynski Committed by Android Git Automerger
Browse files

am 70ef3af8: am 2493d947: am 9001f14b: Merge "Don\'t use windowOutsetBottom... 

am 70ef3af8: am 2493d947: am 9001f14b: Merge "Don\'t use windowOutsetBottom for insets, depend on display padding only." into lmp-mr1-modular-dev

* commit '70ef3af8':
  Don't use windowOutsetBottom for insets, depend on display padding only.
parents dfb1c2f2 70ef3af8

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

+2 −15
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ public abstract class WallpaperService extends Service { 
                WindowManager.LayoutParams.PRIVATE_FLAG_WANTS_OFFSET_NOTIFICATIONS;

        int mCurWindowFlags = mWindowFlags;

        int mCurWindowPrivateFlags = mWindowPrivateFlags;

        int mOutsetBottomPx;

        final Rect mVisibleInsets = new Rect();

        final Rect mWinFrame = new Rect();

        final Rect mOverscanInsets = new Rect();
@@ -624,18 +623,9 @@ public abstract class WallpaperService extends Service { 
                    mLayout.token = mWindowToken;



                    if (!mCreated) {

                        // Retrieve watch round and outset info

                        final WindowManager windowService = (WindowManager)getSystemService(

                                Context.WINDOW_SERVICE);

                        // Retrieve watch round info

                        TypedArray windowStyle = obtainStyledAttributes(

                                com.android.internal.R.styleable.Window);

                        final Display display = windowService.getDefaultDisplay();

                        final boolean shouldUseBottomOutset =

                                display.getDisplayId() == Display.DEFAULT_DISPLAY;

                        if (shouldUseBottomOutset) {

                            mOutsetBottomPx = ScreenShapeHelper.getWindowOutsetBottomPx(

                                    getResources().getDisplayMetrics(), windowStyle);

                        }

                        mWindowIsRound = ScreenShapeHelper.getWindowIsRound(getResources());

                        windowStyle.recycle();
@@ -770,10 +760,7 @@ public abstract class WallpaperService extends Service { 
                            mDispatchedStableInsets.set(mStableInsets);

                            mFinalSystemInsets.set(mDispatchedOverscanInsets);

                            mFinalStableInsets.set(mDispatchedStableInsets);

                            if (mOutsetBottomPx != 0) {

                                mFinalSystemInsets.bottom =

                                        mIWallpaperEngine.mDisplayPadding.bottom + mOutsetBottomPx;

                            }

                            mFinalSystemInsets.bottom = mIWallpaperEngine.mDisplayPadding.bottom;

                            WindowInsets insets = new WindowInsets(mFinalSystemInsets,

                                    null, mFinalStableInsets, mWindowIsRound);

                            onApplyWindowInsets(insets);