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

Merge "Tweak the layout for Pattern/PIN/Password enrollment" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-19 03:15:28 +00:00
committed by Android (Google) Code Review
parent 4335268c81 9edcc5b5e3
commit 4a67b1c099
7 changed files with 54 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/notification/RedactionInterstitial.java
View File

@@ -26,7 +26,6 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle;
import android.os.UserManager;
import android.provider.Settings;
@@ -50,6 +49,7 @@ import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupcompat.template.FooterButton;
import com.google.android.setupcompat.util.WizardManagerHelper;
import com.google.android.setupdesign.GlifLayout;
import com.google.android.setupdesign.util.ThemeHelper;
public class RedactionInterstitial extends SettingsActivity {
@@ -60,12 +60,6 @@ public class RedactionInterstitial extends SettingsActivity {
return modIntent;
}
@Override
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
super.onApplyThemeResource(theme, new_resid, first);
}
@Override
protected boolean isValidFragment(String fragmentName) {
return RedactionInterstitialFragment.class.getName().equals(fragmentName);
@@ -73,6 +67,8 @@ public class RedactionInterstitial extends SettingsActivity {
@Override
protected void onCreate(Bundle savedInstance) {
setTheme(SetupWizardUtils.getTheme(this, getIntent()));
ThemeHelper.trySetDynamicColor(this);
super.onCreate(savedInstance);
findViewById(R.id.content_parent).setFitsSystemWindows(false);
}