Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44ba4ff0 authored by Christine Franks's avatar Christine Franks
Browse files

Make night display auto mode system API 

Bug: 111215474
Test: atest FrameworksServicesTests:ColorDisplayServiceTest
Change-Id: I436300b40ffc24dccc58b0420e9e30aa800af05d
parent 83cc5410

api/system-current.txt

+7 −0
Original line number Original line Diff line number Diff line
@@ -1804,9 +1804,16 @@ package android.hardware.display { 
  }

  }

















  public final class ColorDisplayManager {







  public final class ColorDisplayManager {














    method @RequiresPermission(android.Manifest.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS) public int getNightDisplayAutoMode();











    method @RequiresPermission(android.Manifest.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS) public int getTransformCapabilities();







    method @RequiresPermission(android.Manifest.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS) public int getTransformCapabilities();











    method @RequiresPermission(android.Manifest.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS) public boolean setAppSaturationLevel(@NonNull String, @IntRange(from=0, to=100) int);







    method @RequiresPermission(android.Manifest.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS) public boolean setAppSaturationLevel(@NonNull String, @IntRange(from=0, to=100) int);














    method @RequiresPermission(android.Manifest.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS) public boolean setNightDisplayAutoMode(int);














    method @RequiresPermission(android.Manifest.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS) public boolean setNightDisplayCustomEndTime(@NonNull java.time.LocalTime);














    method @RequiresPermission(android.Manifest.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS) public boolean setNightDisplayCustomStartTime(@NonNull java.time.LocalTime);











    method @RequiresPermission(android.Manifest.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS) public boolean setSaturationLevel(@IntRange(from=0, to=100) int);







    method @RequiresPermission(android.Manifest.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS) public boolean setSaturationLevel(@IntRange(from=0, to=100) int);














    field public static final int AUTO_MODE_CUSTOM_TIME = 1; // 0x1














    field public static final int AUTO_MODE_DISABLED = 0; // 0x0














    field public static final int AUTO_MODE_TWILIGHT = 2; // 0x2











    field public static final int CAPABILITY_HARDWARE_ACCELERATION_GLOBAL = 2; // 0x2







    field public static final int CAPABILITY_HARDWARE_ACCELERATION_GLOBAL = 2; // 0x2











    field public static final int CAPABILITY_HARDWARE_ACCELERATION_PER_APP = 4; // 0x4







    field public static final int CAPABILITY_HARDWARE_ACCELERATION_PER_APP = 4; // 0x4











    field public static final int CAPABILITY_NONE = 0; // 0x0







    field public static final int CAPABILITY_NONE = 0; // 0x0

































core/java/android/hardware/display/ColorDisplayManager.java



+11
−0




























Original line number
Original line
Diff line number
Diff line








@@ -100,6 +100,7 @@ public final class ColorDisplayManager {









     *







     *











     * @hide







     * @hide











     */







     */














    @SystemApi











    public static final int AUTO_MODE_DISABLED = 0;







    public static final int AUTO_MODE_DISABLED = 0;











    /**







    /**











     * Auto mode value to automatically activate Night display at a specific start and end time.







     * Auto mode value to automatically activate Night display at a specific start and end time.









@@ -110,6 +111,7 @@ public final class ColorDisplayManager {









     *







     *











     * @hide







     * @hide











     */







     */














    @SystemApi











    public static final int AUTO_MODE_CUSTOM_TIME = 1;







    public static final int AUTO_MODE_CUSTOM_TIME = 1;











    /**







    /**











     * Auto mode value to automatically activate Night display from sunset to sunrise.







     * Auto mode value to automatically activate Night display from sunset to sunrise.









@@ -118,6 +120,7 @@ public final class ColorDisplayManager {









     *







     *











     * @hide







     * @hide











     */







     */














    @SystemApi











    public static final int AUTO_MODE_TWILIGHT = 2;







    public static final int AUTO_MODE_TWILIGHT = 2;































    private final ColorDisplayManagerInternal mManager;







    private final ColorDisplayManagerInternal mManager;










@@ -175,6 +178,8 @@ public final class ColorDisplayManager {









     *







     *











     * @hide







     * @hide











     */







     */














    @SystemApi














    @RequiresPermission(Manifest.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS)











    public @AutoMode int getNightDisplayAutoMode() {







    public @AutoMode int getNightDisplayAutoMode() {











        return mManager.getNightDisplayAutoMode();







        return mManager.getNightDisplayAutoMode();











    }







    }









@@ -199,6 +204,8 @@ public final class ColorDisplayManager {









     *







     *











     * @hide







     * @hide











     */







     */














    @SystemApi














    @RequiresPermission(Manifest.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS)











    public boolean setNightDisplayAutoMode(@AutoMode int autoMode) {







    public boolean setNightDisplayAutoMode(@AutoMode int autoMode) {











        if (autoMode != AUTO_MODE_DISABLED







        if (autoMode != AUTO_MODE_DISABLED











                && autoMode != AUTO_MODE_CUSTOM_TIME







                && autoMode != AUTO_MODE_CUSTOM_TIME










@@ -233,6 +240,8 @@ public final class ColorDisplayManager {









     *







     *











     * @hide







     * @hide











     */







     */














    @SystemApi














    @RequiresPermission(Manifest.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS)











    public boolean setNightDisplayCustomStartTime(@NonNull LocalTime startTime) {







    public boolean setNightDisplayCustomStartTime(@NonNull LocalTime startTime) {











        if (startTime == null) {







        if (startTime == null) {











            throw new IllegalArgumentException("startTime cannot be null");







            throw new IllegalArgumentException("startTime cannot be null");










@@ -263,6 +272,8 @@ public final class ColorDisplayManager {









     *







     *











     * @hide







     * @hide











     */







     */














    @SystemApi














    @RequiresPermission(Manifest.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS)











    public boolean setNightDisplayCustomEndTime(@NonNull LocalTime endTime) {







    public boolean setNightDisplayCustomEndTime(@NonNull LocalTime endTime) {











        if (endTime == null) {







        if (endTime == null) {











            throw new IllegalArgumentException("endTime cannot be null");







            throw new IllegalArgumentException("endTime cannot be null");