Merge "Show the app pinning description after user enables it" into rvc-dev am: 0cc66ea23c am: 1bf90b2243 am: 21e0b3e42d

Change-Id: I8b059f9b8fb375014e1b538678b193506f05938b
This commit is contained in:
TreeHugger Robot
2020-05-13 09:17:32 +00:00
committed by Automerger Merge Worker

View File

@@ -215,7 +215,6 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment
private void updateDisplay() {
if (isLockToAppEnabled(getActivity())) {
mFooterPreference.setVisible(false);
mUseScreenLock.setVisible(true);
mUseScreenLock.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@Override
@@ -226,7 +225,6 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment
mUseScreenLock.setChecked(isScreenLockUsed());
mUseScreenLock.setTitle(getCurrentSecurityTitle());
} else {
mFooterPreference.setVisible(true);
mFooterPreference.setSummary(getAppPinningContent());
mUseScreenLock.setVisible(false);
}