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

Commit 9215f705 authored by Edgar Wang's avatar Edgar Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix null pointer expection when get CollapsingToolbrDelegate" into tm-dev am: 5381e75c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17289683

Change-Id: I6d5cb6a4cd28e0e3ac6accb587e742ad7a75fa98
parents d6b65967 5381e75c

packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java

+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;

    }

}