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

Commit 9f5ae215 authored by Mill Chen's avatar Mill Chen Committed by Automerger Merge Worker
Browse files

Merge "Make collapsing toolbar load font synchronously" into sc-dev am: e6d4fbb1 

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

Change-Id: I2642c29d9a0fe5519aaf7b2503458177a9123df0
parents 48863151 e6d4fbb1

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

+3 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.widget.Toolbar; 
import androidx.annotation.Nullable;



import com.google.android.material.appbar.CollapsingToolbarLayout;

import com.google.android.material.resources.TextAppearanceConfig;



/**

 * A base Activity that has a collapsing toolbar layout is used for the activities intending to
@@ -39,7 +40,8 @@ public class CollapsingToolbarBaseActivity extends SettingsTransitionActivity { 
    @Override

    protected void onCreate(@Nullable Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        // Force loading font synchronously for collapsing toolbar layout

        TextAppearanceConfig.setShouldLoadFontSynchronously(true);

        super.setContentView(R.layout.collapsing_toolbar_base_layout);

        mCollapsingToolbarLayout = findViewById(R.id.collapsing_toolbar);