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

Merge "Show the app pinning description after user enables it" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-13 08:41:18 +00:00
committed by Android (Google) Code Review
parent dfb3f561ea 232cfc4e76
commit 0cc66ea23c
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/security/ScreenPinningSettings.java
View File

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