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

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

Merge "QSFragment: fix NPE in setOverScrollAmount" into tm-dev

parents 88671a05 aef1de8f

packages/SystemUI/src/com/android/systemui/qs/QSFragment.java

+4 −1
Original line number Diff line number Diff line
@@ -519,7 +519,10 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca 
    @Override

    public void setOverScrollAmount(int overScrollAmount) {

        mOverScrolling = overScrollAmount != 0;

        getView().setTranslationY(overScrollAmount);

        View view = getView();

        if (view != null) {

            view.setTranslationY(overScrollAmount);

        }

    }



    @Override

packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java

+18 −0
Original line number Diff line number Diff line
@@ -315,6 +315,24 @@ public class QSFragmentTest extends SysuiBaseFragmentTest { 
        verify(mQuickQSPanelController).setCollapseExpandAction(action);

    }



    @Test

    public void setOverScrollAmount_setsTranslationOnView() {

        QSFragment fragment = resumeAndGetFragment();



        fragment.setOverScrollAmount(123);



        assertThat(mQsFragmentView.getTranslationY()).isEqualTo(123);

    }



    @Test

    public void setOverScrollAmount_beforeViewCreated_translationIsNotSet() {

        QSFragment fragment = getFragment();



        fragment.setOverScrollAmount(123);



        assertThat(mQsFragmentView.getTranslationY()).isEqualTo(0);

    }



    @Override

    protected Fragment instantiate(Context context, String className, Bundle arguments) {

        MockitoAnnotations.initMocks(this);