Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ie15bd6e966272b03da3a45f0a2d0b4dbb4421609
This commit is contained in:
Hai Zhang
2021-07-08 03:48:39 +00:00
committed by Automerger Merge Worker
parent afe209c14a ab3f51955b
commit 8e19405db2
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@
package com.android.settingslib.collapsingtoolbar; package com.android.settingslib.collapsingtoolbar;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@@ -55,7 +56,9 @@ public abstract class CollapsingToolbarBaseFragment extends Fragment {
@Nullable Bundle savedInstanceState) { @Nullable Bundle savedInstanceState) {
final View view = inflater.inflate(R.layout.collapsing_toolbar_base_layout, container, final View view = inflater.inflate(R.layout.collapsing_toolbar_base_layout, container,
false); false);
mCoordinatorLayout = view.findViewById(R.id.content_parent); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
mCoordinatorLayout = view.findViewById(R.id.content_parent);
}
mCollapsingToolbarLayout = view.findViewById(R.id.collapsing_toolbar); mCollapsingToolbarLayout = view.findViewById(R.id.collapsing_toolbar);
mAppBarLayout = view.findViewById(R.id.app_bar); mAppBarLayout = view.findViewById(R.id.app_bar);
if (mCollapsingToolbarLayout != null) { if (mCollapsingToolbarLayout != null) {