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

Commit 14ab3159 authored by Milton Wu's avatar Milton Wu Committed by Automerger Merge Worker
Browse files

Merge "Redraw ScreenDecorations only if rotation changed" into tm-dev am: 890c7579 am: e245f5cd 

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



Change-Id: I20934bfd023dca117b92be09e751be0a49d1a110
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0949fcbd e245f5cd

packages/SystemUI/src/com/android/systemui/ScreenDecorations.java

+3 −3
Original line number Diff line number Diff line
@@ -971,11 +971,11 @@ public class ScreenDecorations extends CoreStartable implements Tunable , Dumpab 
                    cutoutView.updateRotation(mRotation);

                }

            }

        }



            // update all provider views inside overlay

            updateOverlayProviderViews();

        }

    }



    private boolean hasRoundedCorners() {

        return mRoundedCornerFactory.getHasProviders();

packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java

+4 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import android.util.RotationUtils; 
import android.util.Size;

import android.view.Display;

import android.view.DisplayCutout;

import android.view.Surface;

import android.view.View;

import android.view.ViewGroup;

import android.view.WindowManager;
@@ -974,6 +975,7 @@ public class ScreenDecorationsTest extends SysuiTestCase { 
                getTestsDrawable(com.android.systemui.tests.R.drawable.rounded4px)

                /* roundedBottomDrawable */,

                0 /* roundedPadding */, false /* fillCutout */, true /* privacyDot */);

        doReturn(Surface.ROTATION_0).when(mDisplay).getRotation();



        mScreenDecorations.start();
@@ -987,6 +989,8 @@ public class ScreenDecorationsTest extends SysuiTestCase { 
                getTestsDrawable(com.android.systemui.tests.R.drawable.rounded5px)

                /* roundedBottomDrawable */,

                0 /* roundedPadding */, false /* fillCutout */, true /* privacyDot */);

        doReturn(Surface.ROTATION_270).when(mDisplay).getRotation();



        mScreenDecorations.onConfigurationChanged(null);



        assertEquals(new Size(4, 4), resDelegate.getTopRoundedSize());