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 am: 0cc66ea23c am: 1bf90b2243 am: 21e0b3e42d am: 8e5ec8bf34

Browse Source 
Change-Id: Ie5f0e3e9a9a22905df41b61f41d33f720041d10f
This commit is contained in:
TreeHugger Robot
2020-05-13 09:33:31 +00:00
committed by Automerger Merge Worker
parent 78b9b95deb 8e5ec8bf34
commit 261c23d1b1
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() {
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);
}