Merge "Limit device name length" into jb-mr2-dev

This commit is contained in:
Irfan Sheriff
2013-04-12 16:55:13 +00:00
committed by Android (Google) Code Review

View File

@@ -45,6 +45,7 @@ import android.preference.PreferenceActivity;
import android.preference.PreferenceCategory; import android.preference.PreferenceCategory;
import android.preference.PreferenceGroup; import android.preference.PreferenceGroup;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.text.InputFilter;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.Gravity; import android.view.Gravity;
@@ -430,6 +431,7 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
return dialog; return dialog;
} else if (id == DIALOG_RENAME) { } else if (id == DIALOG_RENAME) {
mDeviceNameText = new EditText(getActivity()); mDeviceNameText = new EditText(getActivity());
mDeviceNameText.setFilters(new InputFilter[] {new InputFilter.LengthFilter(30)});
if (mSavedDeviceName != null) { if (mSavedDeviceName != null) {
mDeviceNameText.setText(mSavedDeviceName); mDeviceNameText.setText(mSavedDeviceName);
mDeviceNameText.setSelection(mSavedDeviceName.length()); mDeviceNameText.setSelection(mSavedDeviceName.length());