commit 80b1dfe46a85e3ecdbeca5575c205086e5ab07e0
author Amith Yamasani <yamasani@google.com> Wed Apr 10 00:29:12 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 10 00:29:12 2013 +0000
tree b838245c41f1a542bb016ad966be58acde5396fc
parent 460f24786a84106ec38e9209b2a943747deaf12c
parent 583757908bccf8283cd27e5c5981f5b248e1037f

Merge "Select text in user name dialog" into jb-mr2-dev

res/xml/app_restrictions.xml

diff --git a/res/xml/app_restrictions.xml b/res/xml/app_restrictions.xml
index df02907..c99d5e7 100644
--- a/res/xml/app_restrictions.xml
+++ b/res/xml/app_restrictions.xml
@@ -18,7 +18,7 @@
         android:title="@string/application_restrictions"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
-    <EditTextPreference
+    <com.android.settings.SelectableEditTextPreference
             android:key="user_info"
             android:order="0"
             android:widgetLayout="@layout/preference_rename_widget" />

src/com/android/settings/users/AppRestrictionsFragment.java

diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
index e4606d7..90ebdae 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -47,6 +47,7 @@
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceGroup;
 import android.preference.SwitchPreference;
+import android.text.InputType;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -57,6 +58,7 @@
 import android.widget.Switch;
 
 import com.android.settings.R;
+import com.android.settings.SelectableEditTextPreference;
 import com.android.settings.SettingsPreferenceFragment;
 
 import java.util.ArrayList;
@@ -82,7 +84,7 @@
     private UserManager mUserManager;
     private UserHandle mUser;
 
-    private EditTextPreference mUserPreference;
+    private SelectableEditTextPreference mUserPreference;
     private PreferenceGroup mAppList;
 
     private static final int MAX_APP_RESTRICTIONS = 100;
@@ -188,8 +190,12 @@
         mUserManager = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
         addPreferencesFromResource(R.xml.app_restrictions);
         mAppList = getPreferenceScreen();
-        mUserPreference = (EditTextPreference) findPreference(KEY_USER_INFO);
+        mUserPreference = (SelectableEditTextPreference) findPreference(KEY_USER_INFO);
         mUserPreference.setOnPreferenceChangeListener(this);
+        mUserPreference.getEditText().setInputType(
+                InputType.TYPE_TEXT_VARIATION_NORMAL | InputType.TYPE_TEXT_FLAG_CAP_WORDS);
+        mUserPreference.setInitialSelectionMode(
+                SelectableEditTextPreference.SELECTION_SELECT_ALL);
         setHasOptionsMenu(true);
     }