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

Commit e6be16bd authored by Hai Zhang's avatar Hai Zhang Committed by Automerger Merge Worker
Browse files

Merge "Fix CollapsingToolbarBaseFragment crash on R." into sc-dev am: ab3f5195 

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

Change-Id: I4c106e1e5a8cc2d7285781bf3a8cc2307ae70c43
parents a6748cc7 ab3f5195

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

+4 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settingslib.collapsingtoolbar;



import android.os.Build;

import android.os.Bundle;

import android.view.LayoutInflater;

import android.view.View;
@@ -55,7 +56,9 @@ public abstract class CollapsingToolbarBaseFragment extends Fragment { 
            @Nullable Bundle savedInstanceState) {

        final View view = inflater.inflate(R.layout.collapsing_toolbar_base_layout, container,

                false);

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {

            mCoordinatorLayout = view.findViewById(R.id.content_parent);

        }

        mCollapsingToolbarLayout = view.findViewById(R.id.collapsing_toolbar);

        mAppBarLayout = view.findViewById(R.id.app_bar);

        if (mCollapsingToolbarLayout != null) {