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

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13922072

Change-Id: I414903cb09f7878da40ca4a5a24e7607cc46f710
This commit is contained in:
TreeHugger Robot
2021-03-19 09:58:18 +00:00
committed by Automerger Merge Worker
parent d0980fa4ad ebcb3308ee
commit f2058dba16
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/security/ScreenPinningSettings.java
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);
} }
} }