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

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

Browse Source
This commit is contained in:
Amith Yamasani
2013-04-10 00:29:12 +00:00
committed by Android (Google) Code Review
parent 460f24786a 583757908b
commit 80b1dfe46a
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/app_restrictions.xml
View File

@@ -18,7 +18,7 @@
android:title="@string/application_restrictions" android:title="@string/application_restrictions"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"> xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
<EditTextPreference <com.android.settings.SelectableEditTextPreference
android:key="user_info" android:key="user_info"
android:order="0" android:order="0"
android:widgetLayout="@layout/preference_rename_widget" /> android:widgetLayout="@layout/preference_rename_widget" />

10
src/com/android/settings/users/AppRestrictionsFragment.java
View File

@@ -47,6 +47,7 @@ import android.preference.Preference.OnPreferenceChangeListener;
import android.preference.Preference.OnPreferenceClickListener; import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceGroup; import android.preference.PreferenceGroup;
import android.preference.SwitchPreference; import android.preference.SwitchPreference;
import android.text.InputType;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
@@ -57,6 +58,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.Switch; import android.widget.Switch;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SelectableEditTextPreference;
import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SettingsPreferenceFragment;
import java.util.ArrayList; import java.util.ArrayList;
@@ -82,7 +84,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
private UserManager mUserManager; private UserManager mUserManager;
private UserHandle mUser; private UserHandle mUser;
private EditTextPreference mUserPreference; private SelectableEditTextPreference mUserPreference;
private PreferenceGroup mAppList; private PreferenceGroup mAppList;
private static final int MAX_APP_RESTRICTIONS = 100; private static final int MAX_APP_RESTRICTIONS = 100;
@@ -188,8 +190,12 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
mUserManager = (UserManager) getActivity().getSystemService(Context.USER_SERVICE); mUserManager = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
addPreferencesFromResource(R.xml.app_restrictions); addPreferencesFromResource(R.xml.app_restrictions);
mAppList = getPreferenceScreen(); mAppList = getPreferenceScreen();
mUserPreference = (EditTextPreference) findPreference(KEY_USER_INFO); mUserPreference = (SelectableEditTextPreference) findPreference(KEY_USER_INFO);
mUserPreference.setOnPreferenceChangeListener(this); 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); setHasOptionsMenu(true);
} }