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

Merge "Update brightness percentage display logic to match sysui." into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-25 15:07:32 +00:00
committed by Android (Google) Code Review
parent 3f5444b9e4 1346b066bd
commit 69d12406f0
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,9 @@
*/ */
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.convertLinearToGamma;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.database.ContentObserver; import android.database.ContentObserver;
@@ -103,6 +106,7 @@ public class BrightnessLevelPreferenceController extends AbstractPreferenceContr
public void updateState(Preference preference) { public void updateState(Preference preference) {
updatedSummary(preference); updatedSummary(preference);
} }
@Override @Override
public void onStart() { public void onStart() {
mContentResolver.registerContentObserver(BRIGHTNESS_URI, false, mBrightnessObserver); mContentResolver.registerContentObserver(BRIGHTNESS_URI, false, mBrightnessObserver);
@@ -122,15 +126,18 @@ public class BrightnessLevelPreferenceController extends AbstractPreferenceContr
} }
private double getCurrentBrightness() { private double getCurrentBrightness() {
final int value;
if (isInVrMode()) { if (isInVrMode()) {
final double value = System.getInt(mContentResolver, System.SCREEN_BRIGHTNESS_FOR_VR, value = convertLinearToGamma(System.getInt(mContentResolver,
mMaxBrightness); System.SCREEN_BRIGHTNESS_FOR_VR, mMaxBrightness),
return getPercentage(value, mMinVrBrightness, mMaxVrBrightness); mMinVrBrightness, mMaxVrBrightness);
} else { } else {
final double value = Settings.System.getInt(mContentResolver, System.SCREEN_BRIGHTNESS, value = convertLinearToGamma(Settings.System.getInt(mContentResolver,
mMinBrightness); System.SCREEN_BRIGHTNESS, mMinBrightness),
return getPercentage(value, mMinBrightness, mMaxBrightness); mMinBrightness, mMaxBrightness);
} }
return getPercentage(value, 0, GAMMA_SPACE_MAX);
} }
private double getPercentage(double value, int min, int max) { private double getPercentage(double value, int min, int max) {

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

@@ -122,7 +122,7 @@ public class BrightnessLevelPreferenceControllerTest {
mController.updateState(mPreference); mController.updateState(mPreference);
verify(mPreference).setSummary("85%"); verify(mPreference).setSummary("97%");
} }
@Test @Test
@@ -135,7 +135,7 @@ public class BrightnessLevelPreferenceControllerTest {
mController.updateState(mPreference); mController.updateState(mPreference);
verify(mPreference).setSummary("31%"); verify(mPreference).setSummary("78%");
} }
@Test @Test
@@ -148,7 +148,7 @@ public class BrightnessLevelPreferenceControllerTest {
mController.updateState(mPreference); mController.updateState(mPreference);
verify(mPreference).setSummary("45%"); verify(mPreference).setSummary("85%");
} }
@Test @Test