am 2cc2b0f2: am a2e64ac8: Merge "Limit device name length" into jb-mr2-dev

* commit '2cc2b0f2cbae003eaca44e12333f754748ddb0c1':
  Limit device name length
This commit is contained in:
Irfan Sheriff
2013-04-12 10:38:25 -07:00
committed by Android Git Automerger

View File

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