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

Update the visibility state of views in UserPreference properly.

Browse Source 
Bug: 28629095
Change-Id: Id98affb36f19c4e78c5c9c6092638760efca76c0
This commit is contained in:
Sudheer Shanka
2016-05-06 13:23:45 -07:00
parent 8fa3d44596
commit 0451dc2e60
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/users/UserPreference.java
View File

@@ -104,6 +104,8 @@ public class UserPreference extends RestrictedPreference {
if (mDeleteClickListener != null if (mDeleteClickListener != null
&& !RestrictedLockUtils.hasBaseUserRestriction(getContext(), && !RestrictedLockUtils.hasBaseUserRestriction(getContext(),
UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId())) { UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId())) {
deleteView.setVisibility(View.VISIBLE);
deleteDividerView.setVisibility(View.VISIBLE);
deleteView.setOnClickListener(mDeleteClickListener); deleteView.setOnClickListener(mDeleteClickListener);
deleteView.setTag(this); deleteView.setTag(this);
} else { } else {
@@ -114,11 +116,11 @@ public class UserPreference extends RestrictedPreference {
ImageView manageView = (ImageView) view.findViewById(R.id.manage_user); ImageView manageView = (ImageView) view.findViewById(R.id.manage_user);
if (manageView != null) { if (manageView != null) {
if (mSettingsClickListener != null) { if (mSettingsClickListener != null) {
manageView.setVisibility(View.VISIBLE);
manageDividerView.setVisibility(mDeleteClickListener == null
? View.VISIBLE : View.GONE);
manageView.setOnClickListener(mSettingsClickListener); manageView.setOnClickListener(mSettingsClickListener);
manageView.setTag(this); manageView.setTag(this);
if (mDeleteClickListener != null) {
manageDividerView.setVisibility(View.GONE);
}
} else { } else {
manageView.setVisibility(View.GONE); manageView.setVisibility(View.GONE);
manageDividerView.setVisibility(View.GONE); manageDividerView.setVisibility(View.GONE);