Merge "Use shared model for non-system overlay toggle" into sc-dev

This commit is contained in:
Alex Stetson
2021-05-07 14:08:52 +00:00
committed by Android (Google) Code Review
12 changed files with 24 additions and 202 deletions

View File

@@ -44,9 +44,9 @@ import androidx.fragment.app.FragmentActivity;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.core.HideNonSystemOverlayMixin;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.vpn2.VpnUtils;
import com.android.settingslib.core.lifecycle.HideNonSystemOverlayMixin;
/**
* CredentialStorage handles resetting and installing keys into KeyStore.