Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c221d16 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev

parents e5235360 1895f8b5

res/layout/crypt_keeper_password_field.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
<merge xmlns:android="http://schemas.android.com/apk/res/android">



    <!-- Note that crypt_keeper_pin_field.xml also has ImeAwareEditText with the same ID. -->

    <com.android.settings.widget.ImeAwareEditText android:id="@+id/passwordEntry"

    <ImeAwareEditText android:id="@+id/passwordEntry"

        android:layout_height="wrap_content"

        android:layout_width="0dip"

        android:layout_weight="1"

res/layout/crypt_keeper_pin_field.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
<merge xmlns:android="http://schemas.android.com/apk/res/android">



    <!-- Note that crypt_keeper_password_field.xml also has ImeAwareEditText with the same ID. -->

    <com.android.settings.widget.ImeAwareEditText android:id="@+id/passwordEntry"

    <ImeAwareEditText android:id="@+id/passwordEntry"

        android:layout_height="wrap_content"

        android:layout_width="0dip"

        android:layout_weight="1"

res/layout/fingerprint_rename_dialog.xml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
        android:clipChildren="false"

        android:clipToPadding="false" />



    <com.android.settings.widget.ImeAwareEditText

    <ImeAwareEditText

        android:id="@+id/fingerprint_rename_field"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

src/com/android/settings/CryptKeeper.java

+1 −1
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import android.view.inputmethod.InputMethodInfo; 
import android.view.inputmethod.InputMethodManager;

import android.view.inputmethod.InputMethodSubtype;

import android.widget.Button;

import android.widget.ImeAwareEditText;

import android.widget.ProgressBar;

import android.widget.TextView;
@@ -64,7 +65,6 @@ import com.android.internal.widget.LockPatternUtils; 
import com.android.internal.widget.LockPatternView;

import com.android.internal.widget.LockPatternView.Cell;

import com.android.internal.widget.LockPatternView.DisplayMode;

import com.android.settings.widget.ImeAwareEditText;



import java.util.List;

src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.os.UserManager; 
import android.text.TextUtils;

import android.util.Log;

import android.view.View;

import android.widget.ImeAwareEditText;

import android.widget.Toast;



import androidx.annotation.VisibleForTesting;
@@ -55,7 +56,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;