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

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

Browse Source 
am: e869494be1

* commit 'e869494be1183e08ccc2d99e3ce79a226147de6b':
  Update the visibility state of views in UserPreference properly.

Change-Id: I4dd252b002a96c9ae7b91e3ee5aba0c9ad7b57b7
This commit is contained in:
Sudheer Shanka
2016-05-10 20:29:02 +00:00
committed by android-build-merger
parent 9b1a3d9960 e869494be1
commit a4b264132a
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);