Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3b2bdc1 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Update the visibility state of views in UserPreference properly." into nyc-dev

parents 7efa4cc6 0451dc2e

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

+5 −3
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ public class UserPreference extends RestrictedPreference { 
                if (mDeleteClickListener != null

                        && !RestrictedLockUtils.hasBaseUserRestriction(getContext(),

                                UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId())) {

                    deleteView.setVisibility(View.VISIBLE);

                    deleteDividerView.setVisibility(View.VISIBLE);

                    deleteView.setOnClickListener(mDeleteClickListener);

                    deleteView.setTag(this);

                } else {
@@ -114,11 +116,11 @@ public class UserPreference extends RestrictedPreference { 
            ImageView manageView = (ImageView) view.findViewById(R.id.manage_user);

            if (manageView != null) {

                if (mSettingsClickListener != null) {

                    manageView.setVisibility(View.VISIBLE);

                    manageDividerView.setVisibility(mDeleteClickListener == null

                            ? View.VISIBLE : View.GONE);

                    manageView.setOnClickListener(mSettingsClickListener);

                    manageView.setTag(this);

                    if (mDeleteClickListener != null) {

                        manageDividerView.setVisibility(View.GONE);

                    }

                } else {

                    manageView.setVisibility(View.GONE);

                    manageDividerView.setVisibility(View.GONE);