diff options
| -rw-r--r-- | devicesettings/src/org/lineageos/settings/device/setupwizard/SetupWizardBaseActivity.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/devicesettings/src/org/lineageos/settings/device/setupwizard/SetupWizardBaseActivity.java b/devicesettings/src/org/lineageos/settings/device/setupwizard/SetupWizardBaseActivity.java index caca0e3..d8f4cc5 100644 --- a/devicesettings/src/org/lineageos/settings/device/setupwizard/SetupWizardBaseActivity.java +++ b/devicesettings/src/org/lineageos/settings/device/setupwizard/SetupWizardBaseActivity.java @@ -17,6 +17,7 @@ package org.lineageos.settings.device.setupwizard; import android.app.Activity; +import android.content.Context; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.text.TextUtils; @@ -25,6 +26,7 @@ import android.widget.Button; import com.android.settingslib.Utils; +import com.google.android.setupcompat.template.FooterButtonStyleUtils; import com.google.android.setupdesign.GlifLayout; import org.lineageos.settings.device.R; @@ -56,20 +58,25 @@ public class SetupWizardBaseActivity extends Activity implements View.OnClickLis if (getLayoutResId() != -1) { setContentView(getLayoutResId()); } + + final GlifLayout layout = getGlifLayout(); + final Context context = layout.getContext(); + if (getTitleResId() != -1) { final CharSequence headerText = TextUtils.expandTemplate(getText(getTitleResId())); - getGlifLayout().setHeaderText(headerText); + layout.setHeaderText(headerText); } if (getIconResId() != -1) { - final GlifLayout layout = getGlifLayout(); final Drawable icon = getDrawable(getIconResId()).mutate(); - icon.setTintList(Utils.getColorAccent(layout.getContext())); + icon.setTintList(Utils.getColorAccent(context)); layout.setIcon(icon); } Button buttonNext = findViewById(R.id.btn_next); buttonNext.setOnClickListener(this); + FooterButtonStyleUtils.applySecondaryButtonPartnerResource(context, buttonNext, true); + setupPage(); } |