sdk: livedisplay: add a method to determine whether night mode is enabled

LiveDisplayManager.getMode() returns MODE_AUTO when night mode is enabled
automatically, so there's no way to determine if night is on when livedisplay
changes automatically

Change-Id: Ia47fc127232c2bb3b6634b55712060a919f8c9c1
Signed-off-by: Joey <joey@lineageos.org>
This commit is contained in:
Joey
2018-01-19 20:58:23 +01:00
parent 157a7c1cde
commit 6b4410555a
5 changed files with 24 additions and 1 deletions

View File

@@ -279,6 +279,7 @@ package lineageos.hardware {
method public boolean setMode(int);
method public boolean setNightColorTemperature(int);
method public boolean setPictureAdjustment(lineageos.hardware.HSIC);
method public boolean isNightModeEnabled();
field public static final int ADJUSTMENT_CONTRAST = 3; // 0x3
field public static final int ADJUSTMENT_HUE = 0; // 0x0
field public static final int ADJUSTMENT_INTENSITY = 2; // 0x2

View File

@@ -143,7 +143,7 @@ public abstract class LiveDisplayFeature {
return mState.mTwilight;
}
protected final boolean isNight() {
public final boolean isNight() {
return mState.mTwilight != null && mState.mTwilight.isNight();
}

View File

@@ -370,6 +370,12 @@ public class LiveDisplayService extends LineageSystemService {
mFeatures.get(i).dump(pw);
}
}
@Override
public boolean isNight() {
final TwilightState twilight = mTwilightTracker.getCurrentState();
return twilight != null && twilight.isNight();
}
};
// Listener for screen on/off events

View File

@@ -52,4 +52,5 @@ interface ILiveDisplayService {
HSIC getPictureAdjustment();
HSIC getDefaultPictureAdjustment();
boolean setPictureAdjustment(in HSIC adj);
boolean isNight();
}

View File

@@ -482,4 +482,19 @@ public class LiveDisplayManager {
}
return null;
}
/**
* Determine whether night mode is enabled (be it automatic or manual)
*/
public boolean isNightModeEnabled() {
// This method might be called before config has been set up
// so a NPE would have been thrown, just report night mode is disabled instead
try {
return getMode() == MODE_NIGHT || sService.isNight();
} catch (NullPointerException e) {
Log.w(TAG, "Can\'t check whether night mode is enabled because the service isn\'t ready");
} catch (RemoteException ignored) {
}
return false;
}
}