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

Commit cea34829 authored by Matthew Ng's avatar Matthew Ng Committed by android-build-merger
Browse files

Merge "Merge "DividerView choreographer set earlier to avoid null exception"... 

Merge "Merge "DividerView choreographer set earlier to avoid null exception" into oc-dev am: 9c4b6d3b" into oc-dev-plus-aosp
am: aa7e6a0d

Change-Id: If55011d13b78b80fc0eafbaa484f180a6eff0524
parents c1531eab aa7e6a0d

packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java

+6 −6
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
    private boolean mHomeStackResizable;

    private boolean mAdjustedForIme;

    private DividerState mState;

    private SurfaceFlingerVsyncChoreographer mSfChoreographer;

    private final SurfaceFlingerVsyncChoreographer mSfChoreographer;



    private final Handler mHandler = new Handler() {

        @Override
@@ -250,20 +250,22 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
    };



    public DividerView(Context context) {

        super(context);

        this(context, null);

    }



    public DividerView(Context context, @Nullable AttributeSet attrs) {

        super(context, attrs);

        this(context, attrs, 0);

    }



    public DividerView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {

        super(context, attrs, defStyleAttr);

        this(context, attrs, defStyleAttr, 0);

    }



    public DividerView(Context context, @Nullable AttributeSet attrs, int defStyleAttr,

            int defStyleRes) {

        super(context, attrs, defStyleAttr, defStyleRes);

        mSfChoreographer = new SurfaceFlingerVsyncChoreographer(mHandler, context.getDisplay(),

                Choreographer.getInstance());

    }



    @Override
@@ -313,8 +315,6 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
    protected void onAttachedToWindow() {

        super.onAttachedToWindow();

        EventBus.getDefault().register(this);

        mSfChoreographer = new SurfaceFlingerVsyncChoreographer(mHandler, getDisplay(),

                Choreographer.getInstance());

    }



    @Override