Merge "Fixed issue with pattern not appearing disabled." into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
ae230aa12c
@@ -75,6 +75,7 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
|
|||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstance) {
|
protected void onCreate(Bundle savedInstance) {
|
||||||
setTheme(SetupWizardUtils.getTheme(this, getIntent()));
|
setTheme(SetupWizardUtils.getTheme(this, getIntent()));
|
||||||
|
setTheme(R.style.SettingsPreferenceTheme_SetupWizard);
|
||||||
ThemeHelper.trySetDynamicColor(this);
|
ThemeHelper.trySetDynamicColor(this);
|
||||||
super.onCreate(savedInstance);
|
super.onCreate(savedInstance);
|
||||||
|
|
||||||
@@ -266,7 +267,6 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
|
|||||||
@Override
|
@Override
|
||||||
public void onViewCreated(@NotNull View view, Bundle savedInstanceState) {
|
public void onViewCreated(@NotNull View view, Bundle savedInstanceState) {
|
||||||
super.onViewCreated(view, savedInstanceState);
|
super.onViewCreated(view, savedInstanceState);
|
||||||
|
|
||||||
GlifPreferenceLayout layout = (GlifPreferenceLayout) view;
|
GlifPreferenceLayout layout = (GlifPreferenceLayout) view;
|
||||||
int titleResource = R.string.lock_settings_picker_new_lock_title;
|
int titleResource = R.string.lock_settings_picker_new_lock_title;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user