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

Fix displayed brightness value in settings.

Browse Source 
Change BrightnessLevelPreferenceController to use float values for
brightness instead of the int system.

Change tests to use correct values and floats.

Bug: b/150099686

Test: m -j99 RunSettingsRoboTests
ROBOTEST_FILTER="com.android.settings.display.BrightnessLevelPreferenceControllerTest",  manual

Change-Id: I1a6e06b4f5532b641d766f770be351b8ca827664
This commit is contained in:
Fiona Campbell
2020-03-03 16:48:47 +00:00
parent 856079384a
commit bf6624b603
2 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/android/settings/display/BrightnessLevelPreferenceController.java
View File

@@ -14,7 +14,8 @@
package com.android.settings.display; package com.android.settings.display;
import static com.android.settingslib.display.BrightnessUtils.GAMMA_SPACE_MAX; import static com.android.settingslib.display.BrightnessUtils.GAMMA_SPACE_MAX;
import static com.android.settingslib.display.BrightnessUtils.convertLinearToGamma; import static com.android.settingslib.display.BrightnessUtils.GAMMA_SPACE_MIN;
import static com.android.settingslib.display.BrightnessUtils.convertLinearToGammaFloat;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
@@ -52,16 +53,16 @@ public class BrightnessLevelPreferenceController extends AbstractPreferenceContr
private static final Uri BRIGHTNESS_FOR_VR_URI; private static final Uri BRIGHTNESS_FOR_VR_URI;
private static final Uri BRIGHTNESS_ADJ_URI; private static final Uri BRIGHTNESS_ADJ_URI;
private final int mMinBrightness; private final float mMinBrightness;
private final int mMaxBrightness; private final float mMaxBrightness;
private final int mMinVrBrightness; private final float mMinVrBrightness;
private final int mMaxVrBrightness; private final float mMaxVrBrightness;
private final ContentResolver mContentResolver; private final ContentResolver mContentResolver;
private Preference mPreference; private Preference mPreference;
static { static {
BRIGHTNESS_URI = System.getUriFor(System.SCREEN_BRIGHTNESS); BRIGHTNESS_URI = System.getUriFor(System.SCREEN_BRIGHTNESS_FLOAT);
BRIGHTNESS_FOR_VR_URI = System.getUriFor(System.SCREEN_BRIGHTNESS_FOR_VR); BRIGHTNESS_FOR_VR_URI = System.getUriFor(System.SCREEN_BRIGHTNESS_FOR_VR);
BRIGHTNESS_ADJ_URI = System.getUriFor(System.SCREEN_AUTO_BRIGHTNESS_ADJ); BRIGHTNESS_ADJ_URI = System.getUriFor(System.SCREEN_AUTO_BRIGHTNESS_ADJ);
} }
@@ -80,10 +81,14 @@ public class BrightnessLevelPreferenceController extends AbstractPreferenceContr
lifecycle.addObserver(this); lifecycle.addObserver(this);
} }
PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE); PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
mMinBrightness = powerManager.getMinimumScreenBrightnessSetting(); mMinBrightness = powerManager.getBrightnessConstraint(
mMaxBrightness = powerManager.getMaximumScreenBrightnessSetting(); PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MINIMUM);
mMinVrBrightness = powerManager.getMinimumScreenBrightnessForVrSetting(); mMaxBrightness = powerManager.getBrightnessConstraint(
mMaxVrBrightness = powerManager.getMaximumScreenBrightnessForVrSetting(); PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MAXIMUM);
mMinVrBrightness = powerManager.getBrightnessConstraint(
PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MINIMUM_VR);
mMaxVrBrightness = powerManager.getBrightnessConstraint(
PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MAXIMUM_VR);
mContentResolver = mContext.getContentResolver(); mContentResolver = mContext.getContentResolver();
} }
@@ -129,16 +134,15 @@ public class BrightnessLevelPreferenceController extends AbstractPreferenceContr
private double getCurrentBrightness() { private double getCurrentBrightness() {
final int value; final int value;
if (isInVrMode()) { if (isInVrMode()) {
value = convertLinearToGamma(System.getInt(mContentResolver, value = convertLinearToGammaFloat(System.getFloat(mContentResolver,
System.SCREEN_BRIGHTNESS_FOR_VR, mMaxBrightness), System.SCREEN_BRIGHTNESS_FOR_VR_FLOAT, mMaxBrightness),
mMinVrBrightness, mMaxVrBrightness); mMinVrBrightness, mMaxVrBrightness);
} else { } else {
value = convertLinearToGamma(Settings.System.getInt(mContentResolver, value = convertLinearToGammaFloat(Settings.System.getFloat(mContentResolver,
System.SCREEN_BRIGHTNESS, mMinBrightness), System.SCREEN_BRIGHTNESS_FLOAT, mMinBrightness),
mMinBrightness, mMaxBrightness); mMinBrightness, mMaxBrightness);
} }
return getPercentage(value, 0, GAMMA_SPACE_MAX); return getPercentage(value, GAMMA_SPACE_MIN, GAMMA_SPACE_MAX);
} }
private double getPercentage(double value, int min, int max) { private double getPercentage(double value, int min, int max) {

42
tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
View File

@@ -67,10 +67,14 @@ public class BrightnessLevelPreferenceControllerTest {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application; mContext = RuntimeEnvironment.application;
mContentResolver = mContext.getContentResolver(); mContentResolver = mContext.getContentResolver();
when(mPowerManager.getMinimumScreenBrightnessSetting()).thenReturn(0); when(mPowerManager.getBrightnessConstraint(
when(mPowerManager.getMaximumScreenBrightnessSetting()).thenReturn(100); PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MINIMUM)).thenReturn(0.0f);
when(mPowerManager.getMinimumScreenBrightnessForVrSetting()).thenReturn(0); when(mPowerManager.getBrightnessConstraint(
when(mPowerManager.getMaximumScreenBrightnessForVrSetting()).thenReturn(100); PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MAXIMUM)).thenReturn(1.0f);
when(mPowerManager.getBrightnessConstraint(
PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MINIMUM_VR)).thenReturn(0.0f);
when(mPowerManager.getBrightnessConstraint(
PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MAXIMUM_VR)).thenReturn(1.0f);
ShadowApplication.getInstance().setSystemService(POWER_SERVICE, ShadowApplication.getInstance().setSystemService(POWER_SERVICE,
mPowerManager); mPowerManager);
when(mScreen.findPreference(anyString())).thenReturn(mPreference); when(mScreen.findPreference(anyString())).thenReturn(mPreference);
@@ -98,7 +102,7 @@ public class BrightnessLevelPreferenceControllerTest {
controller.onStart(); controller.onStart();
assertThat(shadowContentResolver.getContentObservers( assertThat(shadowContentResolver.getContentObservers(
System.getUriFor(System.SCREEN_BRIGHTNESS))).isNotEmpty(); System.getUriFor(System.SCREEN_BRIGHTNESS_FLOAT))).isNotEmpty();
assertThat(shadowContentResolver.getContentObservers( assertThat(shadowContentResolver.getContentObservers(
System.getUriFor(System.SCREEN_BRIGHTNESS_FOR_VR))).isNotEmpty(); System.getUriFor(System.SCREEN_BRIGHTNESS_FOR_VR))).isNotEmpty();
assertThat(shadowContentResolver.getContentObservers( assertThat(shadowContentResolver.getContentObservers(
@@ -116,9 +120,9 @@ public class BrightnessLevelPreferenceControllerTest {
controller.onStop(); controller.onStop();
assertThat(shadowContentResolver.getContentObservers( assertThat(shadowContentResolver.getContentObservers(
System.getUriFor(System.SCREEN_BRIGHTNESS))).isEmpty(); System.getUriFor(System.SCREEN_BRIGHTNESS_FLOAT))).isEmpty();
assertThat(shadowContentResolver.getContentObservers( assertThat(shadowContentResolver.getContentObservers(
System.getUriFor(System.SCREEN_BRIGHTNESS_FOR_VR))).isEmpty(); System.getUriFor(System.SCREEN_BRIGHTNESS_FOR_VR_FLOAT))).isEmpty();
assertThat(shadowContentResolver.getContentObservers( assertThat(shadowContentResolver.getContentObservers(
System.getUriFor(System.SCREEN_AUTO_BRIGHTNESS_ADJ))).isEmpty(); System.getUriFor(System.SCREEN_AUTO_BRIGHTNESS_ADJ))).isEmpty();
} }
@@ -126,11 +130,11 @@ public class BrightnessLevelPreferenceControllerTest {
@Test @Test
public void updateState_inVrMode_shouldSetSummaryToVrBrightness() { public void updateState_inVrMode_shouldSetSummaryToVrBrightness() {
doReturn(true).when(mController).isInVrMode(); doReturn(true).when(mController).isInVrMode();
System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS_FOR_VR, 85); System.putFloat(mContentResolver, System.SCREEN_BRIGHTNESS_FOR_VR_FLOAT, 0.6f);
mController.updateState(mPreference); mController.updateState(mPreference);
verify(mPreference).setSummary("97%"); verify(mPreference).setSummary("91%");
} }
@Test @Test
@@ -139,11 +143,11 @@ public class BrightnessLevelPreferenceControllerTest {
System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS_MODE, System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS_MODE,
System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC); System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS, 31); System.putFloat(mContentResolver, System.SCREEN_BRIGHTNESS_FLOAT, 0.1f);
mController.updateState(mPreference); mController.updateState(mPreference);
verify(mPreference).setSummary("78%"); verify(mPreference).setSummary("54%");
} }
@Test @Test
@@ -152,11 +156,11 @@ public class BrightnessLevelPreferenceControllerTest {
System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS_MODE, System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS_MODE,
System.SCREEN_BRIGHTNESS_MODE_MANUAL); System.SCREEN_BRIGHTNESS_MODE_MANUAL);
System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS, 45); System.putFloat(mContentResolver, System.SCREEN_BRIGHTNESS_FLOAT, 0.5f);
mController.updateState(mPreference); mController.updateState(mPreference);
verify(mPreference).setSummary("85%"); verify(mPreference).setSummary("87%");
} }
@Test @Test
@@ -164,11 +168,11 @@ public class BrightnessLevelPreferenceControllerTest {
// VR mode // VR mode
doReturn(true).when(mController).isInVrMode(); doReturn(true).when(mController).isInVrMode();
System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS_FOR_VR, 105); System.putFloat(mContentResolver, System.SCREEN_BRIGHTNESS_FOR_VR_FLOAT, 1.05f);
mController.updateState(mPreference); mController.updateState(mPreference);
verify(mPreference).setSummary("100%"); verify(mPreference).setSummary("100%");
System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS_FOR_VR, -20); System.putFloat(mContentResolver, System.SCREEN_BRIGHTNESS_FOR_VR_FLOAT, -20f);
mController.updateState(mPreference); mController.updateState(mPreference);
verify(mPreference).setSummary("0%"); verify(mPreference).setSummary("0%");
@@ -178,11 +182,11 @@ public class BrightnessLevelPreferenceControllerTest {
System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC); System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
reset(mPreference); reset(mPreference);
System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS, 115); System.putFloat(mContentResolver, System.SCREEN_BRIGHTNESS_FLOAT, 1.15f);
mController.updateState(mPreference); mController.updateState(mPreference);
verify(mPreference).setSummary("100%"); verify(mPreference).setSummary("100%");
System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS, -10); System.putFloat(mContentResolver, System.SCREEN_BRIGHTNESS_FLOAT, -10f);
mController.updateState(mPreference); mController.updateState(mPreference);
verify(mPreference).setSummary("0%"); verify(mPreference).setSummary("0%");
@@ -191,11 +195,11 @@ public class BrightnessLevelPreferenceControllerTest {
System.SCREEN_BRIGHTNESS_MODE_MANUAL); System.SCREEN_BRIGHTNESS_MODE_MANUAL);
reset(mPreference); reset(mPreference);
System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS, 115); System.putFloat(mContentResolver, System.SCREEN_BRIGHTNESS_FLOAT, 1.15f);
mController.updateState(mPreference); mController.updateState(mPreference);
verify(mPreference).setSummary("100%"); verify(mPreference).setSummary("100%");
System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS, -10); System.putFloat(mContentResolver, System.SCREEN_BRIGHTNESS_FLOAT, -10f);
mController.updateState(mPreference); mController.updateState(mPreference);
verify(mPreference).setSummary("0%"); verify(mPreference).setSummary("0%");
} }