Don't use animations for security settings
Bug: 27419463
Change-Id: I85a8ff3a7720fcaa33f4883b4fd4e569bcae3be2
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index c6ec4a9..4097d04 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -29,7 +29,6 @@
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
-import android.content.pm.UserInfo;
import android.content.res.Resources;
import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle;
@@ -53,10 +52,8 @@
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.Log;
-
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.TimeoutListPreference;
import com.android.settings.TrustAgentUtils.TrustAgentComponentInfo;
import com.android.settings.fingerprint.FingerprintSettings;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -71,7 +68,6 @@
import java.util.List;
import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
-
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
/**
@@ -212,6 +208,14 @@
return resid;
}
+ @Override
+ public void setPreferenceScreen(PreferenceScreen preferenceScreen) {
+ if (!preferenceScreen.isAttached()) {
+ preferenceScreen.setShouldUseGeneratedIds(false);
+ }
+ super.setPreferenceScreen(preferenceScreen);
+ }
+
/**
* Important!
*