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

Commit e274c854 authored by Sayak Dutta's avatar Sayak Dutta Committed by Automerger Merge Worker
Browse files

Merge "Modify call to Header function of Glif Layout to disable autosize" into... 

Merge "Modify call to Header function of Glif Layout to disable autosize" into tm-qpr-dev am: 03ed8c04 am: 3765a09a

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



Change-Id: Ic88e98b23b7724e99eb322b446e901d27bcb97fc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1493fa2f 3765a09a

src/com/android/settings/deviceinfo/StorageWizardBase.java

+4 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import com.android.settings.SetupWizardUtils; 
import com.google.android.setupcompat.template.FooterBarMixin;

import com.google.android.setupcompat.template.FooterButton;

import com.google.android.setupdesign.GlifLayout;

import com.google.android.setupdesign.template.HeaderMixin;

import com.google.android.setupdesign.util.ThemeHelper;

import com.google.android.setupdesign.util.ThemeResolver;
@@ -167,7 +168,9 @@ public abstract class StorageWizardBase extends FragmentActivity { 


    protected void setHeaderText(int resId, CharSequence... args) {

        final CharSequence headerText = TextUtils.expandTemplate(getText(resId), args);

        getGlifLayout().setHeaderText(headerText);

        final GlifLayout layout = getGlifLayout();

        layout.setHeaderText(headerText);

        layout.getMixin(HeaderMixin.class).setAutoTextSizeEnabled(false);

        setTitle(headerText);

    }