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

Commit 80a28fe8 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Fix janky in transition doze -> lockscreen" into lmp-mr1-dev 

automerge: 09ba32c0

* commit '09ba32c0':
  Fix janky in transition doze -> lockscreen
parents 3bc103b8 09ba32c0

packages/SystemUI/src/com/android/systemui/statusbar/DismissViewImageButton.java

+5 −0
Original line number Diff line number Diff line
@@ -61,4 +61,9 @@ public class DismissViewImageButton extends ImageButton { 
        outRect.top += translationY;

        outRect.bottom += translationY;

    }



    @Override

    public boolean hasOverlappingRendering() {

        return false;

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+0 −2
Original line number Diff line number Diff line
@@ -3074,8 +3074,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
            }

            else if (Intent.ACTION_SCREEN_ON.equals(action)) {

                mScreenOn = true;

                // work around problem where mDisplay.getRotation() is not stable while screen is off (bug 7086018)

                repositionNavigationBar();

                notifyNavigationBarScreenOn(true);

            }

            else if (ACTION_DEMO.equals(action)) {