Merge "Fix bug: UserPreference's gear icon got accidentally hidden" (4a355851) · Commits · e / os / android_packages_apps_Settings

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

+21 −5

Original line number	Diff line number	Diff line
		@@ -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) {

tests/robotests/src/com/android/settings/users/UserPreferenceTest.java

0 → 100644

+77 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settings.users;

		import static com.google.common.truth.Truth.assertThat;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.when;

		import android.content.Context;
		import android.os.UserHandle;
		import android.view.View;

		import com.android.settings.SettingsRobolectricTestRunner;
		import com.android.settings.TestConfig;
		import com.android.settingslib.RestrictedPreferenceHelper;

		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;
		import org.robolectric.RuntimeEnvironment;
		import org.robolectric.annotation.Config;
		import org.robolectric.util.ReflectionHelpers;

		@RunWith(SettingsRobolectricTestRunner.class)
		@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
		public class UserPreferenceTest {

		@Mock
		private RestrictedPreferenceHelper mRestrictedPreferenceHelper;
		private Context mContext;
		private UserPreference mUserPreference;

		@Before
		public void setUp() {
		MockitoAnnotations.initMocks(this);
		mContext = RuntimeEnvironment.application;
		mUserPreference = new UserPreference(mContext, null /* attrs */, UserHandle.USER_CURRENT,
		null /* settingsListener /, null / deleteListener */);
		ReflectionHelpers.setField(mUserPreference, "mHelper", mRestrictedPreferenceHelper);
		}

		@Test
		public void testShouldHideSecondTarget_noListener_shouldHide() {
		assertThat(mUserPreference.shouldHideSecondTarget()).isTrue();
		}

		@Test
		public void testShouldHideSecondTarget_disabledByAdmin_shouldHide() {
		when(mRestrictedPreferenceHelper.isDisabledByAdmin()).thenReturn(true);

		assertThat(mUserPreference.shouldHideSecondTarget()).isTrue();
		}

		@Test
		public void testShouldHideSecondTarget_hasSettingListener_shouldNotHide() {
		ReflectionHelpers.setField(mUserPreference, "mSettingsClickListener",
		mock(View.OnClickListener.class));

		assertThat(mUserPreference.shouldHideSecondTarget()).isFalse();
		}
		}