Merge "Fix jank in app pinning page" into sc-dev

This commit is contained in:
TreeHugger Robot
2021-03-19 09:27:46 +00:00
committed by Android (Google) Code Review

View File

@@ -215,7 +215,7 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment
private void updateDisplay() { private void updateDisplay() {
if (isLockToAppEnabled(getActivity())) { if (isLockToAppEnabled(getActivity())) {
mUseScreenLock.setVisible(true); mUseScreenLock.setEnabled(true);
mUseScreenLock.setOnPreferenceChangeListener(new OnPreferenceChangeListener() { mUseScreenLock.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
@@ -226,7 +226,7 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment
mUseScreenLock.setTitle(getCurrentSecurityTitle()); mUseScreenLock.setTitle(getCurrentSecurityTitle());
} else { } else {
mFooterPreference.setSummary(getAppPinningContent()); mFooterPreference.setSummary(getAppPinningContent());
mUseScreenLock.setVisible(false); mUseScreenLock.setEnabled(false);
} }
} }