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

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

Merge "Settings: Correctly align cursor in Settings"

parents cc01bdc1 63a0560a

src/com/android/settings/Utils.java

+4 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ import android.view.ViewGroup; 
import android.view.animation.Animation;

import android.view.animation.Animation.AnimationListener;

import android.view.animation.AnimationUtils;

import android.widget.EditText;

import android.widget.ListView;

import android.widget.TabWidget;
@@ -1362,4 +1363,7 @@ public final class Utils extends com.android.settingslib.Utils { 
                && volume.isMountedReadable();

    }



    public static void setEditTextCursorPosition(EditText editText) {

        editText.setSelection(editText.getText().length());

    }

}

src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ abstract class BluetoothNameDialogFragment extends InstrumentedDialogFragment 
            mDeviceNameView.setSelection(deviceName.length());

        }

        mDeviceNameView.addTextChangedListener(this);

        com.android.settings.Utils.setEditTextCursorPosition(mDeviceNameView);

        mDeviceNameView.setOnEditorActionListener(new TextView.OnEditorActionListener() {

            @Override

            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {

src/com/android/settings/bluetooth/DeviceProfilesSettings.java

+1 −0
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ public final class DeviceProfilesSettings extends InstrumentedDialogFragment imp 
        final EditText deviceNameField = (EditText) mRootView.findViewById(R.id.name);

        if (deviceNameField != null) {

            deviceNameField.setText(mCachedDevice.getName());

            com.android.settings.Utils.setEditTextCursorPosition(deviceNameField);

        }



        refreshProfiles();

src/com/android/settings/display/DensityPreference.java

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.widget.EditText; 


import com.android.settings.R;

import com.android.settingslib.CustomEditTextPreference;

import com.android.settings.Utils;

import com.android.settingslib.display.DisplayDensityUtils;



import java.text.NumberFormat;
@@ -63,6 +64,7 @@ public class DensityPreference extends CustomEditTextPreference { 
        if (editText != null) {

            editText.setInputType(InputType.TYPE_CLASS_NUMBER);

            editText.setText(getCurrentSwDp() + "");

            Utils.setEditTextCursorPosition(editText);

        }

    }

src/com/android/settings/sim/SimPreferenceDialog.java

+4 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.widget.Spinner; 
import android.widget.TextView;



import com.android.settings.R;

import com.android.settings.Utils;



public class SimPreferenceDialog extends Activity {
@@ -98,13 +99,14 @@ public class SimPreferenceDialog extends Activity { 


        EditText nameText = (EditText)mDialogLayout.findViewById(R.id.sim_name);

        nameText.setText(savedInstanceState.getString(SIM_NAME));

        Utils.setEditTextCursorPosition(nameText);

    }



    private void createEditDialog(Bundle bundle) {

        final Resources res = mContext.getResources();

        EditText nameText = (EditText)mDialogLayout.findViewById(R.id.sim_name);

        nameText.setText(mSubInfoRecord.getDisplayName());



        Utils.setEditTextCursorPosition(nameText);

        final Spinner tintSpinner = (Spinner) mDialogLayout.findViewById(R.id.spinner);

        SelectColorAdapter adapter = new SelectColorAdapter(mContext,

                R.layout.settings_color_picker_item, mColorStrings);
@@ -154,7 +156,7 @@ public class SimPreferenceDialog extends Activity { 
            @Override

            public void onClick(DialogInterface dialog, int whichButton) {

                final EditText nameText = (EditText)mDialogLayout.findViewById(R.id.sim_name);



                Utils.setEditTextCursorPosition(nameText);

                String displayName = nameText.getText().toString();

                int subId = mSubInfoRecord.getSubscriptionId();

                mSubInfoRecord.setDisplayName(displayName);