Merge "Fix forgot password layout text alignment and change theme to show correct text colour in night mode Test: manual test Fixes: b/206761685"

This commit is contained in:
Oli Thompson
2022-11-09 14:55:41 +00:00
committed by Android (Google) Code Review
3 changed files with 8 additions and 2 deletions

View File

@@ -33,6 +33,8 @@ import com.android.settings.R;
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.util.ContentStyler;
import com.google.android.setupdesign.util.ThemeHelper;
/**
* An activity that asks the user to contact their admin to get assistance with forgotten password.
@@ -65,6 +67,11 @@ public class ForgotPasswordActivity extends Activity {
.build()
);
if (ThemeHelper.shouldApplyMaterialYouStyle(this)) {
ContentStyler.applyBodyPartnerCustomizationStyle(
layout.findViewById(R.id.forgot_password_text));
}
layout.setHeaderText(devicePolicyManager.getResources().getString(
FORGOT_PASSWORD_TITLE, () -> getString(R.string.forgot_password_title)));