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

Merge "Can disable checkbox without tint on text" into pi-dev

Browse Source
This commit is contained in:
Beverly Tai
2018-04-19 16:57:05 +00:00
committed by Android (Google) Code Review
parent 7f50a0c837 49f7f8137f
commit 48831c837f
6 changed files with 84 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java
View File

@@ -42,6 +42,7 @@ import android.support.v7.preference.PreferenceScreen;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settings.widget.DisabledCheckBoxPreference;
import org.junit.Before;
import org.junit.Test;
@@ -58,7 +59,7 @@ public class ZenModeVisEffectPreferenceControllerTest {
@Mock
private ZenModeBackend mBackend;
@Mock
private CheckBoxPreference mockPref;
private DisabledCheckBoxPreference mockPref;
private Context mContext;
private FakeFeatureFactory mFeatureFactory;
@Mock
@@ -114,7 +115,7 @@ public class ZenModeVisEffectPreferenceControllerTest {
mController.updateState(mockPref);
verify(mockPref).setChecked(false);
verify(mockPref).setEnabled(true);
verify(mockPref).enableCheckbox(true);
}
@Test
@@ -123,7 +124,7 @@ public class ZenModeVisEffectPreferenceControllerTest {
mController.updateState(mockPref);
verify(mockPref).setChecked(true);
verify(mockPref).setEnabled(true);
verify(mockPref).enableCheckbox(true);
}
@Test
@@ -138,7 +139,7 @@ public class ZenModeVisEffectPreferenceControllerTest {
mController.updateState(mockPref);
verify(mockPref).setChecked(true);
verify(mockPref).setEnabled(false);
verify(mockPref).enableCheckbox(false);
verify(mBackend, times(1)).saveVisualEffectsPolicy(SUPPRESSED_EFFECT_PEEK, true);
}
@@ -154,7 +155,7 @@ public class ZenModeVisEffectPreferenceControllerTest {
mController.updateState(mockPref);
verify(mockPref).setChecked(false);
verify(mockPref).setEnabled(true);
verify(mockPref).enableCheckbox(true);
verify(mBackend, never()).saveVisualEffectsPolicy(SUPPRESSED_EFFECT_PEEK, true);
}

17
tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java
View File

@@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import android.content.Context;
@@ -70,14 +71,28 @@ public class DisabledCheckBoxPreferenceTest {
}
@Test
public void checkboxOnClick_doesNothing() {
public void checkboxOnClick_checkboxDisabled() {
Preference.OnPreferenceClickListener onClick =
mock(Preference.OnPreferenceClickListener.class);
mPref.setOnPreferenceClickListener(onClick);
inflatePreference();
mPref.enableCheckbox(false);
mPref.performClick(mRootView);
verify(onClick, never()).onPreferenceClick(any());
}
@Test
public void checkboxOnClick_checkboxEnabled() {
Preference.OnPreferenceClickListener onClick =
mock(Preference.OnPreferenceClickListener.class);
mPref.setOnPreferenceClickListener(onClick);
inflatePreference();
mPref.enableCheckbox(true);
mPref.performClick(mRootView);
verify(onClick, times(1)).onPreferenceClick(any());
}
}