PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327008

Change-Id: If105c32959e2b7f4641581c1b99b30a859abfab4
This commit is contained in:
TreeHugger Robot
2021-04-28 09:35:08 +00:00
committed by Automerger Merge Worker
parent 433dbcc6f7 9d3442bd47
commit 77f7afac7a
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/core/SettingsBaseActivity.java
View File

@@ -47,6 +47,7 @@ import com.android.settings.dashboard.CategoryManager;
import com.android.settingslib.drawer.Tile; import com.android.settingslib.drawer.Tile;
import com.google.android.material.appbar.CollapsingToolbarLayout; 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.setupcompat.util.WizardManagerHelper;
import com.google.android.setupdesign.util.ThemeHelper; import com.google.android.setupdesign.util.ThemeHelper;
@@ -80,6 +81,7 @@ public class SettingsBaseActivity extends FragmentActivity {
} }
final long startTime = System.currentTimeMillis(); final long startTime = System.currentTimeMillis();
getLifecycle().addObserver(new HideNonSystemOverlayMixin(this)); getLifecycle().addObserver(new HideNonSystemOverlayMixin(this));
TextAppearanceConfig.setShouldLoadFontSynchronously(true);
final TypedArray theme = getTheme().obtainStyledAttributes(android.R.styleable.Theme); final TypedArray theme = getTheme().obtainStyledAttributes(android.R.styleable.Theme);
if (!theme.getBoolean(android.R.styleable.Theme_windowNoTitle, false)) { if (!theme.getBoolean(android.R.styleable.Theme_windowNoTitle, false)) {