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

Use CDS display white balance getter and setter

Browse Source 
Bug: 123930917
Test: make ROBOTEST_FILTER="(DisplayWhite*)" RunSettingsRoboTests -j48
Change-Id: Iafc6ff9a61b69baf03efddd52687093c55d35178
(cherry picked from commit ebacc33852)
This commit is contained in:
Christine Franks
2019-03-29 10:14:55 -07:00
parent b8808e35a6
commit 84e67e1f72
2 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/display/DisplayWhiteBalancePreferenceController.java
View File

@@ -41,15 +41,12 @@ public class DisplayWhiteBalancePreferenceController extends TogglePreferenceCon
@Override
public boolean isChecked() {
return Secure.getIntForUser(mContext.getContentResolver(),
Secure.DISPLAY_WHITE_BALANCE_ENABLED, 0, UserHandle.USER_CURRENT) == 1;
return getColorDisplayManager().isDisplayWhiteBalanceEnabled();
}
@Override
public boolean setChecked(boolean isChecked) {
Secure.putIntForUser(mContext.getContentResolver(), Secure.DISPLAY_WHITE_BALANCE_ENABLED,
isChecked ? 1 : 0, UserHandle.USER_CURRENT);
return true;
return getColorDisplayManager().setDisplayWhiteBalanceEnabled(isChecked);
}
@VisibleForTesting

27
tests/robotests/src/com/android/settings/display/DisplayWhiteBalancePreferenceControllerTest.java
View File

@@ -5,10 +5,7 @@ import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.hardware.display.ColorDisplayManager;
import android.provider.Settings;
import android.provider.Settings.Secure;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import org.junit.After;
import org.junit.Before;
@@ -26,7 +23,6 @@ import org.robolectric.annotation.Config;
})
public class DisplayWhiteBalancePreferenceControllerTest {
private Context mContext;
private DisplayWhiteBalancePreferenceController mController;
@Mock
@@ -40,8 +36,7 @@ public class DisplayWhiteBalancePreferenceControllerTest {
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = spy(new DisplayWhiteBalancePreferenceController(mContext,
mController = spy(new DisplayWhiteBalancePreferenceController(RuntimeEnvironment.application,
"display_white_balance"));
doReturn(mColorDisplayManager).when(mController).getColorDisplayManager();
}
@@ -77,30 +72,26 @@ public class DisplayWhiteBalancePreferenceControllerTest {
}
@Test
public void setChecked_true() {
mController.setChecked(true);
assertThat(Settings.Secure
.getInt(mContext.getContentResolver(), Secure.DISPLAY_WHITE_BALANCE_ENABLED, 0) == 1)
.isTrue();
public void setChecked_true_setSuccessfully() {
when(mColorDisplayManager.setDisplayWhiteBalanceEnabled(true)).thenReturn(true);
assertThat(mController.setChecked(true)).isTrue();
}
@Test
public void setChecked_false() {
mController.setChecked(false);
assertThat(Settings.Secure
.getInt(mContext.getContentResolver(), Secure.DISPLAY_WHITE_BALANCE_ENABLED, 0) == 1)
.isFalse();
public void setChecked_false_setSuccessfully() {
when(mColorDisplayManager.setDisplayWhiteBalanceEnabled(false)).thenReturn(true);
assertThat(mController.setChecked(false)).isTrue();
}
@Test
public void isChecked_true() {
Settings.Secure.putInt(mContext.getContentResolver(), Secure.DISPLAY_WHITE_BALANCE_ENABLED, 1);
when(mColorDisplayManager.isDisplayWhiteBalanceEnabled()).thenReturn(true);
assertThat(mController.isChecked()).isTrue();
}
@Test
public void isChecked_false() {
Settings.Secure.putInt(mContext.getContentResolver(), Secure.DISPLAY_WHITE_BALANCE_ENABLED, 0);
when(mColorDisplayManager.isDisplayWhiteBalanceEnabled()).thenReturn(false);
assertThat(mController.isChecked()).isFalse();
}
}