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

OwnerInfos code cleaning

Browse Source 
Change-Id: I5f4e5dcee4af672fa11f552544bfcf4506a21258
This commit is contained in:
Fabrice Di Meglio
2014-07-23 11:25:53 -07:00
parent d73045db7a
commit 0592a21fd8
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/OwnerInfoSettings.java
View File

@@ -60,18 +60,11 @@ public class OwnerInfoSettings extends Fragment {
mView = inflater.inflate(R.layout.ownerinfo, container, false); mView = inflater.inflate(R.layout.ownerinfo, container, false);
mUserId = UserHandle.myUserId(); mUserId = UserHandle.myUserId();
mLockPatternUtils = new LockPatternUtils(getActivity()); mLockPatternUtils = new LockPatternUtils(getActivity());
initView(mView); initView();
return mView; return mView;
} }
private void initView(View view) { private void initView() {
final ContentResolver res = getActivity().getContentResolver();
String info = mLockPatternUtils.getOwnerInfo(mUserId);
boolean enabled = mLockPatternUtils.isOwnerInfoEnabled();
mCheckbox = (CheckBox) mView.findViewById(R.id.show_owner_info_on_lockscreen_checkbox);
mOwnerInfo = (EditText) mView.findViewById(R.id.owner_info_edit_text);
mOwnerInfo.setText(info);
mOwnerInfo.setEnabled(enabled);
mNickname = (EditText) mView.findViewById(R.id.owner_info_nickname); mNickname = (EditText) mView.findViewById(R.id.owner_info_nickname);
if (!mShowNickname) { if (!mShowNickname) {
mNickname.setVisibility(View.GONE); mNickname.setVisibility(View.GONE);
@@ -79,6 +72,10 @@ public class OwnerInfoSettings extends Fragment {
mNickname.setText(UserManager.get(getActivity()).getUserName()); mNickname.setText(UserManager.get(getActivity()).getUserName());
mNickname.setSelected(true); mNickname.setSelected(true);
} }
final boolean enabled = mLockPatternUtils.isOwnerInfoEnabled();
mCheckbox = (CheckBox) mView.findViewById(R.id.show_owner_info_on_lockscreen_checkbox);
mCheckbox.setChecked(enabled); mCheckbox.setChecked(enabled);
if (UserHandle.myUserId() != UserHandle.USER_OWNER) { if (UserHandle.myUserId() != UserHandle.USER_OWNER) {
if (UserManager.get(getActivity()).isLinkedUser()) { if (UserManager.get(getActivity()).isLinkedUser()) {
@@ -93,6 +90,14 @@ public class OwnerInfoSettings extends Fragment {
mOwnerInfo.setEnabled(isChecked); // disable text field if not enabled mOwnerInfo.setEnabled(isChecked); // disable text field if not enabled
} }
}); });
String info = mLockPatternUtils.getOwnerInfo(mUserId);
mOwnerInfo = (EditText) mView.findViewById(R.id.owner_info_edit_text);
mOwnerInfo.setEnabled(enabled);
if (!TextUtils.isEmpty(info)) {
mOwnerInfo.setText(info);
}
} }
@Override @Override
@@ -102,7 +107,6 @@ public class OwnerInfoSettings extends Fragment {
} }
void saveChanges() { void saveChanges() {
ContentResolver res = getActivity().getContentResolver();
String info = mOwnerInfo.getText().toString(); String info = mOwnerInfo.getText().toString();
mLockPatternUtils.setOwnerInfo(info, mUserId); mLockPatternUtils.setOwnerInfo(info, mUserId);
if (mShowNickname) { if (mShowNickname) {
@@ -114,5 +118,4 @@ public class OwnerInfoSettings extends Fragment {
} }
} }
} }
} }