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

Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 am: 222da24344 am: a21603a224 am: 6732e446a7

Browse Source 
Change-Id: I47bf21ce8c231bcd7996e96d9d72e5809d42befd
This commit is contained in:
TreeHugger Robot
2020-04-29 06:20:50 +00:00
committed by Automerger Merge Worker
parent 188e554ab2 6732e446a7
commit 4004667fff
9 changed files with 8 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
View File

@@ -38,6 +38,7 @@ import android.text.Spanned;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.ImeAwareEditText;
import android.widget.Toast;
import androidx.annotation.VisibleForTesting;
@@ -57,7 +58,6 @@ import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.password.ChooseLockGeneric;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.utils.AnnotationSpan;
import com.android.settings.widget.ImeAwareEditText;
import com.android.settingslib.HelpUtils;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;