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

Commit b0013614 authored by Edgar Wang's avatar Edgar Wang
Browse files

Fix null pointer expection when get CollapsingToolbrDelegate

Bug: 219413863
Test: robotest
Change-Id: I4b3b020cec7864da052eb6eeb36cdd9990a09858
parent 5593d1dd
Loading
Loading
Loading
Loading
+11 −5
Original line number Diff line number Diff line
@@ -63,8 +63,7 @@ public class CollapsingToolbarBaseActivity extends FragmentActivity {
            return;
        }

        mToolbardelegate = new CollapsingToolbarDelegate(new DelegateCallback());
        View view = mToolbardelegate.onCreateView(getLayoutInflater(), null);
        View view = getToolbarDelegate().onCreateView(getLayoutInflater(), null);
        super.setContentView(view);
    }

@@ -107,7 +106,7 @@ public class CollapsingToolbarBaseActivity extends FragmentActivity {

    @Override
    public void setTitle(CharSequence title) {
        mToolbardelegate.setTitle(title);
        getToolbarDelegate().setTitle(title);
    }

    @Override
@@ -128,7 +127,7 @@ public class CollapsingToolbarBaseActivity extends FragmentActivity {
     */
    @Nullable
    public CollapsingToolbarLayout getCollapsingToolbarLayout() {
        return mToolbardelegate.getCollapsingToolbarLayout();
        return getToolbarDelegate().getCollapsingToolbarLayout();
    }

    /**
@@ -136,6 +135,13 @@ public class CollapsingToolbarBaseActivity extends FragmentActivity {
     */
    @Nullable
    public AppBarLayout getAppBarLayout() {
        return mToolbardelegate.getAppBarLayout();
        return getToolbarDelegate().getAppBarLayout();
    }

    private CollapsingToolbarDelegate getToolbarDelegate() {
        if (mToolbardelegate == null) {
            mToolbardelegate = new CollapsingToolbarDelegate(new DelegateCallback());
        }
        return mToolbardelegate;
    }
}