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

Commit 6d2aff74 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add null checker to AppBarLayout" into sc-dev am: e6168d76 

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

Change-Id: Ib6e9648c55bfc784ae67634f64a1fe399c54b1dd
parents 66ffbd35 e6168d76

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

+3 −1
Original line number Diff line number Diff line
@@ -58,7 +58,9 @@ public class CollapsingToolbarBaseActivity extends FragmentActivity implements 
        super.setContentView(R.layout.collapsing_toolbar_base_layout);

        mCollapsingToolbarLayout = findViewById(R.id.collapsing_toolbar);

        mAppBarLayout = findViewById(R.id.app_bar);

        if (mAppBarLayout != null) {

            mAppBarLayout.addOnOffsetChangedListener(this);

        }

        if (savedInstanceState != null) {

            mIsToolbarCollapsed = savedInstanceState.getBoolean(KEY_IS_TOOLBAR_COLLAPSED);

        }