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

Commit 3e6d1299 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I86847de5,Idd6c5871,Ibd0310a8 into qt-r1-bubbles-dev 

* changes:
  DO NOT MERGE: Support alpha value in SurfaceView.
  DO NOT MERGE: Clean up SurfaceView.
  DO NOT MERGE: Clean up SurfaceView
parents 675de19f 927fe872

core/java/android/app/ActivityView.java

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ public class ActivityView extends ViewGroup { 


        mActivityTaskManager = ActivityTaskManager.getService();

        mSurfaceView = new SurfaceView(context);

        mSurfaceView.setUseAlpha();

        mSurfaceView.setAlpha(0f);

        mSurfaceCallback = new SurfaceCallback();

        mSurfaceView.getHolder().addCallback(mSurfaceCallback);

core/java/android/view/SurfaceView.java

+212 −69

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/view/ViewTreeObserver.java

+1 −1
Original line number Diff line number Diff line
@@ -1074,7 +1074,7 @@ public final class ViewTreeObserver { 
     * be called manually if you are forcing the drawing on a View or a hierarchy of Views

     * that are not attached to a Window or in the GONE state.

     *

     * @return True if the current draw should be canceled and resceduled, false otherwise.

     * @return True if the current draw should be canceled and rescheduled, false otherwise.

     */

    @SuppressWarnings("unchecked")

    public final boolean dispatchOnPreDraw() {