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

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

@@ -13,6 +13,9 @@
*/
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.Context;
import android.database.ContentObserver;
@@ -63,12 +66,12 @@ public class BrightnessLevelPreferenceController extends AbstractPreferenceContr
}
private ContentObserver mBrightnessObserver =
new ContentObserver(new Handler(Looper.getMainLooper())) {
@Override
public void onChange(boolean selfChange) {
updatedSummary(mPreference);
}
};
new ContentObserver(new Handler(Looper.getMainLooper())) {
@Override
public void onChange(boolean selfChange) {
updatedSummary(mPreference);
}
};
public BrightnessLevelPreferenceController(Context context, Lifecycle lifecycle) {
super(context);
@@ -103,6 +106,7 @@ public class BrightnessLevelPreferenceController extends AbstractPreferenceContr
public void updateState(Preference preference) {
updatedSummary(preference);
}
@Override
public void onStart() {
mContentResolver.registerContentObserver(BRIGHTNESS_URI, false, mBrightnessObserver);
@@ -122,15 +126,18 @@ public class BrightnessLevelPreferenceController extends AbstractPreferenceContr
}
private double getCurrentBrightness() {
final int value;
if (isInVrMode()) {
final double value = System.getInt(mContentResolver, System.SCREEN_BRIGHTNESS_FOR_VR,
mMaxBrightness);
return getPercentage(value, mMinVrBrightness, mMaxVrBrightness);
value = convertLinearToGamma(System.getInt(mContentResolver,
System.SCREEN_BRIGHTNESS_FOR_VR, mMaxBrightness),
mMinVrBrightness, mMaxVrBrightness);
} else {
final double value = Settings.System.getInt(mContentResolver, System.SCREEN_BRIGHTNESS,
mMinBrightness);
return getPercentage(value, mMinBrightness, mMaxBrightness);
value = convertLinearToGamma(Settings.System.getInt(mContentResolver,
System.SCREEN_BRIGHTNESS, mMinBrightness),
mMinBrightness, mMaxBrightness);
}
return getPercentage(value, 0, GAMMA_SPACE_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);
verify(mPreference).setSummary("85%");
verify(mPreference).setSummary("97%");
}
@Test
@@ -135,7 +135,7 @@ public class BrightnessLevelPreferenceControllerTest {
mController.updateState(mPreference);
verify(mPreference).setSummary("31%");
verify(mPreference).setSummary("78%");
}
@Test
@@ -148,7 +148,7 @@ public class BrightnessLevelPreferenceControllerTest {
mController.updateState(mPreference);
verify(mPreference).setSummary("45%");
verify(mPreference).setSummary("85%");
}
@Test