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

Commit 9d3442bd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents ddafb202 4d6bbc8a

src/com/android/settings/core/SettingsBaseActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import com.android.settings.dashboard.CategoryManager; 
import com.android.settingslib.drawer.Tile;



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

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

import com.google.android.setupcompat.util.WizardManagerHelper;

import com.google.android.setupdesign.util.ThemeHelper;
@@ -80,6 +81,7 @@ public class SettingsBaseActivity extends FragmentActivity { 
        }

        final long startTime = System.currentTimeMillis();

        getLifecycle().addObserver(new HideNonSystemOverlayMixin(this));

        TextAppearanceConfig.setShouldLoadFontSynchronously(true);



        final TypedArray theme = getTheme().obtainStyledAttributes(android.R.styleable.Theme);

        if (!theme.getBoolean(android.R.styleable.Theme_windowNoTitle, false)) {