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

Commit 8cbe6e9c authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #5050039: Launcher is sometimes rendering..."

parents 423f0ed4 91c9ac05

core/res/res/anim/screen_rotate_minus_90_enter.xml

+0 −5
Original line number Diff line number Diff line
@@ -19,11 +19,6 @@ 


<set xmlns:android="http://schemas.android.com/apk/res/android"

        android:shareInterpolator="false">

    <scale android:fromXScale="100%p" android:toXScale="100%"

            android:fromYScale="100%p" android:toYScale="100%"

            android:pivotX="50%" android:pivotY="50%"

            android:interpolator="@interpolator/decelerate_quint"

            android:duration="@android:integer/config_mediumAnimTime" />

    <rotate android:fromDegrees="-90" android:toDegrees="0"

            android:pivotX="50%" android:pivotY="50%"

            android:interpolator="@interpolator/decelerate_quint"

core/res/res/anim/screen_rotate_plus_90_enter.xml

+0 −5
Original line number Diff line number Diff line
@@ -19,11 +19,6 @@ 


<set xmlns:android="http://schemas.android.com/apk/res/android"

        android:shareInterpolator="false">

    <scale android:fromXScale="100%p" android:toXScale="100%"

            android:fromYScale="100%p" android:toYScale="100%"

            android:pivotX="50%" android:pivotY="50%"

            android:interpolator="@interpolator/decelerate_quint"

            android:duration="@android:integer/config_mediumAnimTime" />

    <rotate android:fromDegrees="90" android:toDegrees="0"

            android:pivotX="50%" android:pivotY="50%"

            android:interpolator="@interpolator/decelerate_quint"

services/java/com/android/server/wm/BlackFrame.java

+3 −1
Original line number Diff line number Diff line
@@ -32,10 +32,12 @@ public class BlackFrame { 
        final int top;

        final Surface surface;



        BlackSurface(SurfaceSession session, int layer, int l, int t, int w, int h)

        BlackSurface(SurfaceSession session, int layer, int l, int t, int r, int b)

                throws Surface.OutOfResourcesException {

            left = l;

            top = t;

            int w = r-l;

            int h = b-t;

            surface = new Surface(session, 0, "BlackSurface",

                    -1, w, h, PixelFormat.OPAQUE, Surface.FX_SURFACE_DIM);

            if (WindowManagerService.SHOW_TRANSACTIONS ||