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

Commit 835c7469 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Fix CollapsingToolbarBaseFragment crash on R." into sc-dev am: ab3f5195 am: 8e19405d" into sc-v2-dev-plus-aosp
parents ff47a5ab 488c8902

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) {