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

Merge "Settings: Correctly align cursor in Settings"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-09-27 22:47:40 +00:00
committed by Android (Google) Code Review
parent cc01bdc158 63a0560a6c
commit af83bfa58f
6 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/Utils.java
View File

@@ -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());
}
}

1
src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
View File

@@ -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) {

1
src/com/android/settings/bluetooth/DeviceProfilesSettings.java
View File

@@ -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();

2
src/com/android/settings/display/DensityPreference.java
View File

@@ -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);
}
}

6
src/com/android/settings/sim/SimPreferenceDialog.java
View File

@@ -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);

13
tests/robotests/src/com/android/settings/UtilsTest.java
View File

@@ -25,6 +25,8 @@ import android.os.storage.VolumeInfo;
import android.text.SpannableStringBuilder;
import android.text.format.DateUtils;
import android.text.style.TtsSpan;
import android.widget.EditText;
import android.widget.TextView;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.DevicePolicyManagerWrapper;
@@ -325,4 +327,15 @@ public class UtilsTest {
assertThat(Utils.isProfileOrDeviceOwner(mUserManager, mDevicePolicyManager,
PACKAGE_NAME)).isTrue();
}
@Test
public void testSetEditTextCursorPosition_shouldGetExpectedEditTextLenght() {
final EditText editText = new EditText(mContext);
final CharSequence text = "test";
editText.setText(text, TextView.BufferType.EDITABLE);
final int length = editText.getText().length();
Utils.setEditTextCursorPosition(editText);
assertThat(editText.getSelectionEnd()).isEqualTo(length);
}
}