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

Fix bug: UserPreference's gear icon got accidentally hidden

Browse Source 
Change-Id: I9715c3aff20ca8b7a324bd2f8629755690ddc119
Fix: 36545470
Test: make RunSettingsRoboTests
This commit is contained in:
Fan Zhang
2017-03-23 14:38:53 -07:00
parent b3f13f9f32
commit abbe272e6f
2 changed files with 98 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,6 @@ import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.UserHandle;
import android.os.UserManager;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import android.util.AttributeSet;
import android.view.View;
@@ -86,6 +85,20 @@ public class UserPreference extends RestrictedPreference {
}
}
@Override
protected boolean shouldHideSecondTarget() {
if (isDisabledByAdmin()) {
// Disabled by admin, show no secondary target.
return true;
}
if (canDeleteUser()) {
// Need to show delete user target so don't hide.
return false;
}
// Hide if don't have advanced setting listener.
return mSettingsClickListener == null;
}
@Override
public void onBindViewHolder(PreferenceViewHolder view) {
super.onBindViewHolder(view);
@@ -96,14 +109,11 @@ public class UserPreference extends RestrictedPreference {
userDeleteWidget.setVisibility(disabledByAdmin ? View.GONE : View.VISIBLE);
}
if (!disabledByAdmin) {
UserManager um = (UserManager) getContext().getSystemService(Context.USER_SERVICE);
View deleteDividerView = view.findViewById(R.id.divider_delete);
View manageDividerView = view.findViewById(R.id.divider_manage);
View deleteView = view.findViewById(R.id.trash_user);
if (deleteView != null) {
if (mDeleteClickListener != null
&& !RestrictedLockUtils.hasBaseUserRestriction(getContext(),
UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId())) {
if (canDeleteUser()) {
deleteView.setVisibility(View.VISIBLE);
deleteDividerView.setVisibility(View.VISIBLE);
deleteView.setOnClickListener(mDeleteClickListener);
@@ -129,6 +139,12 @@ public class UserPreference extends RestrictedPreference {
}
}
private boolean canDeleteUser() {
return mDeleteClickListener != null
&& !RestrictedLockUtils.hasBaseUserRestriction(getContext(),
UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId());
}
private int getSerialNumber() {
if (mUserId == UserHandle.myUserId()) return Integer.MIN_VALUE;
if (mSerialNumber < 0) {