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 am: e869494be1

Browse Source 
am: a4b264132a

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

Change-Id: I38757b48bf8efef27a34e4c0b338bf6ae5abbcf0
This commit is contained in:
Sudheer Shanka
2016-05-10 20:31:34 +00:00
committed by android-build-merger
parent 105f6d919a a4b264132a
commit fec0c1b1c7
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
&& !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);