Merge "Fix wrong position of cursor in IccLockSettings" am: 3a3044eeef am: 92e77cbd43

am: ecf2bdb46f

Change-Id: I643bffc3f0eaf326b79dd7cebce2fff287396e1e
This commit is contained in:
tiansiming
2017-10-19 19:24:53 +00:00
committed by android-build-merger

View File

@@ -30,10 +30,12 @@ import android.support.v7.preference.Preference;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.EditText;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TabHost; import android.widget.TabHost;
import android.widget.TabHost.OnTabChangeListener; import android.widget.TabHost.OnTabChangeListener;
@@ -333,6 +335,11 @@ public class IccLockSettings extends SettingsPreferenceFragment
setDialogValues(); setDialogValues();
mPinDialog.showPinDialog(); mPinDialog.showPinDialog();
final EditText editText = mPinDialog.getEditText();
if (!TextUtils.isEmpty(mPin) && editText != null) {
editText.setSelection(mPin.length());
}
} }
private void setDialogValues() { private void setDialogValues() {