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

Commit e6d13e26 authored by Vladimir Komsiyski's avatar Vladimir Komsiyski
Browse files

VirtualDisplay brightness API council feedback changes 

 - Public instead of system API
 - Use a dedicated listener instead of reusing VirtualDisplayCallback
 - Drop "requested"

Change-Id: Ifc8969e7c79694e96a84513a51777e89cb2a1d5c
Fix: 377656048
Test: presubmit
Flag: android.companion.virtualdevice.flags.device_aware_display_power
parent 115142b2

core/api/current.txt

+7 −0
Original line number Diff line number Diff line
@@ -20767,6 +20767,7 @@ package android.hardware.display { 








  public final class VirtualDisplayConfig implements android.os.Parcelable {









    method public int describeContents();









    method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") @FloatRange(from=0.0f, to=1.0f) public float getDefaultBrightness();









    method public int getDensityDpi();









    method @NonNull public java.util.Set<java.lang.String> getDisplayCategories();









    method public int getFlags();








@@ -20779,10 +20780,16 @@ package android.hardware.display {







    field @NonNull public static final android.os.Parcelable.Creator<android.hardware.display.VirtualDisplayConfig> CREATOR;









  }

















  @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") public static interface VirtualDisplayConfig.BrightnessListener {









    method public void onBrightnessChanged(@FloatRange(from=0.0f, to=1.0f) float);









  }

















  public static final class VirtualDisplayConfig.Builder {









    ctor public VirtualDisplayConfig.Builder(@NonNull String, @IntRange(from=1) int, @IntRange(from=1) int, @IntRange(from=1) int);









    method @NonNull public android.hardware.display.VirtualDisplayConfig.Builder addDisplayCategory(@NonNull String);









    method @NonNull public android.hardware.display.VirtualDisplayConfig build();









    method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setBrightnessListener(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.display.VirtualDisplayConfig.BrightnessListener);









    method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setDefaultBrightness(@FloatRange(from=0.0f, to=1.0f) float);









    method @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setDisplayCategories(@NonNull java.util.Set<java.lang.String>);









    method @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setFlags(int);









    method @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setRequestedRefreshRate(@FloatRange(from=0.0f) float);

























core/api/system-current.txt



+0
−6






























Original line number
Diff line number
Diff line







@@ -5455,19 +5455,13 @@ package android.hardware.display {







    field public static final int VIRTUAL_DISPLAY_FLAG_TRUSTED = 1024; // 0x400









  }

















  public abstract static class VirtualDisplay.Callback {









    method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") public void onRequestedBrightnessChanged(@FloatRange(from=0.0f, to=1.0f) float);









  }

















  public final class VirtualDisplayConfig implements android.os.Parcelable {









    method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") @FloatRange(from=0.0f, to=1.0f) public float getDefaultBrightness();









    method @FlaggedApi("android.companion.virtualdevice.flags.virtual_display_insets") @Nullable public android.view.DisplayCutout getDisplayCutout();









    method @FlaggedApi("android.companion.virtual.flags.vdm_custom_home") public boolean isHomeSupported();









    method @FlaggedApi("com.android.window.flags.vdm_force_app_universal_resizable_api") public boolean isIgnoreActivitySizeRestrictions();









  }

















  public static final class VirtualDisplayConfig.Builder {









    method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setDefaultBrightness(@FloatRange(from=0.0f, to=1.0f) float);









    method @FlaggedApi("android.companion.virtualdevice.flags.virtual_display_insets") @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setDisplayCutout(@Nullable android.view.DisplayCutout);









    method @FlaggedApi("android.companion.virtual.flags.vdm_custom_home") @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setHomeSupported(boolean);









    method @FlaggedApi("com.android.window.flags.vdm_force_app_universal_resizable_api") @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setIgnoreActivitySizeRestrictions(boolean);

























core/java/android/hardware/display/DisplayManagerGlobal.java



+0
−7






























Original line number
Diff line number
Diff line







@@ -1507,13 +1507,6 @@ public final class DisplayManagerGlobal {







                mExecutor.execute(mCallback::onStopped);









            }









        }



















        @Override // Binder call









        public void onRequestedBrightnessChanged(float brightness) {









            if (mCallback != null) {









                mExecutor.execute(() -> mCallback.onRequestedBrightnessChanged(brightness));









            }









        }









    }



















    /**
































core/java/android/hardware/display/IBrightnessListener.aidl
0 → 100644



+33
−0






























Original line number
Diff line number
Diff line









/*









 * Copyright (C) 2024 The Android Open Source Project









 *









 * Licensed under the Apache License, Version 2.0 (the "License");









 * you may not use this file except in compliance with the License.









 * You may obtain a copy of the License at









 *









 *      http://www.apache.org/licenses/LICENSE-2.0









 *









 * Unless required by applicable law or agreed to in writing, software









 * distributed under the License is distributed on an "AS IS" BASIS,









 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.









 * See the License for the specific language governing permissions and









 * limitations under the License.









 */



















package android.hardware.display;



















/**









 * Interface for notifying the display owner about brightness changes.









 *









 * @hide









 */









oneway interface IBrightnessListener {









    /**









     * Called when the display's brightness has changed.









     *









     * @param brightness the new brightness of the display. Value of {@code 0.0} indicates the









     *   minimum supported brightness and value of {@code 1.0} indicates the maximum supported









     *   brightness.









     */









    void onBrightnessChanged(float brightness);









}
























core/java/android/hardware/display/IVirtualDisplayCallback.aidl



+0
−5






























Original line number
Diff line number
Diff line







@@ -38,9 +38,4 @@ oneway interface IVirtualDisplayCallback {







     * of the application to release() the virtual display.









     */









    void onStopped();



















    /**









     * Called when the virtual display's requested brightness has changed.









     */









    void onRequestedBrightnessChanged(float brightness);









}