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

Commit 5429444b authored by Ady Abraham's avatar Ady Abraham Committed by Android (Google) Code Review
Browse files

Merge changes from topic "hwc_float_color" 

* changes:
  composer: Color.aidl should use floats
  composer: remove FloatColor
parents 1d002dff 1bee7abe

graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/Color.aidl

+4 −4
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ 
package android.hardware.graphics.composer3;

@VintfStability

parcelable Color {

  byte r;

  byte g;

  byte b;

  byte a;

  float r;

  float g;

  float b;

  float a;

}

graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/FloatColor.aidl

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
/**

 * Copyright (c) 2021, 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.

 */

///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.graphics.composer3;

@VintfStability

parcelable FloatColor {

  float r;

  float g;

  float b;

  float a;

}

graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/LayerCommand.aidl

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ parcelable LayerCommand { 
  @nullable android.hardware.graphics.common.Rect[] damage;

  @nullable android.hardware.graphics.composer3.ParcelableBlendMode blendMode;

  @nullable android.hardware.graphics.composer3.Color color;

  @nullable android.hardware.graphics.composer3.FloatColor floatColor;

  @nullable android.hardware.graphics.composer3.ParcelableComposition composition;

  @nullable android.hardware.graphics.composer3.ParcelableDataspace dataspace;

  @nullable android.hardware.graphics.common.Rect displayFrame;

graphics/composer/aidl/android/hardware/graphics/composer3/Color.aidl

+7 −4
Original line number Diff line number Diff line
@@ -16,10 +16,13 @@ 


package android.hardware.graphics.composer3;



/**

 * Color representation as a floating point number in the range [0.0 - 1.0]

 */

@VintfStability

parcelable Color {

    byte r;

    byte g;

    byte b;

    byte a;

    float r;

    float g;

    float b;

    float a;

}

graphics/composer/aidl/android/hardware/graphics/composer3/FloatColor.aidl

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/**

 * Copyright (c) 2021, 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.graphics.composer3;



/**

 * Color representation as a floating point number in the range [0.0 - 1.0]

 */



@VintfStability

parcelable FloatColor {

    float r;

    float g;

    float b;

    float a;

}