Don't use animations for security settings (30ab1995) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SecuritySettings.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ import android.content.DialogInterface;
		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.SubscriptionManager;
		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.ArrayList;
		import java.util.List;

		import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;

		import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;

		/**
		@@ -212,6 +208,14 @@ public class SecuritySettings extends SettingsPreferenceFragment
		return resid;
		}

		@Override
		public void setPreferenceScreen(PreferenceScreen preferenceScreen) {
		if (!preferenceScreen.isAttached()) {
		preferenceScreen.setShouldUseGeneratedIds(false);
		}
		super.setPreferenceScreen(preferenceScreen);
		}

		/**
		* Important!
		*