Uncomment androidx.annotation annotations in graphics common code [290950582]

Fixed

Bug

Status Update

No update yet.

Description

au...@google.com

created issue #1

Jul 12, 2023 06:05PM

Uncomment androidx.annotation annotations in graphics common code so developers get working lint checks:

ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Color.kt:fun Color(/*@ColorInt*/ color: Int): Color {
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Color.kt:    /*@IntRange(from = 0, to = 0xFF)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Color.kt:    /*@IntRange(from = 0, to = 0xFF)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Color.kt:    /*@IntRange(from = 0, to = 0xFF)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Color.kt:    /*@IntRange(from = 0, to = 0xFF)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Color.kt:fun lerp(start: Color, stop: Color, /*@FloatRange(from = 0.0, to = 1.0)*/ fraction: Float): Color {
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Color.kt:/*@Size(value = 4)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Outline.kt:    /*@FloatRange(from = 0.0, to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Outline.kt:    /*@FloatRange(from = 0.0, to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/PixelMap.kt:        /*@IntRange(from = 0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/PixelMap.kt:        /*@IntRange(from = 0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorModel.kt:    /*@IntRange(from = 1, to = 4)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpace.kt:        /*@IntRange(from = 1, to = 4)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpace.kt:    abstract fun getMinValue(/*@IntRange(from = 0, to = 3)*/ component: Int): Float
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpace.kt:    abstract fun getMaxValue(/*@IntRange(from = 0, to = 3)*/ component: Int): Float
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpace.kt:    /*@Size(3)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpace.kt:    /*@Size(min = 3)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpace.kt:    abstract fun toXyz(/*@Size(min = 3)*/ v: FloatArray): FloatArray
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpace.kt:    /*@Size(min = 3)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpace.kt:    /*@Size(min = 3)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpace.kt:    abstract fun fromXyz(/*@Size(min = 3)*/ v: FloatArray): FloatArray
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpaces.kt:        /*@Size(9)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Connector.kt:    /*@Size(3)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Connector.kt:    /*@Size(min = 3)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Connector.kt:    open fun transform(/*@Size(min = 3)*/ v: FloatArray): FloatArray {
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:    /*@Size(6)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:    /*@Size(9)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:    /*@Size(9)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:        /*@Size(min = 1)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:        /*@Size(9)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:        /*@Size(min = 1)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:        /*@Size(min = 6, max = 9)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:        /*@Size(min = 1)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:        /*@Size(9)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:        /*@Size(min = 1)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:        /*@Size(min = 6, max = 9)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:        /*@Size(min = 1)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:        /*@Size(9)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:        /*@Size(min = 1)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:        /*@Size(min = 6, max = 9)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:    /*@Size(min = 6)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/WhitePoint.kt:    /*@Size(3)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0,
 to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0,
 to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0,
 to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0,
 to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0,
 to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0,
 to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0,
 to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0, to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0, to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0, to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0, to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0, to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0, to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0, to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0, to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0, to = 1.0)*/

Comments

le...@google.com <le...@google.com> Jul 21, 2023 09:57PM

Assigned to nj...@google.com.

ap...@google.com <ap...@google.com> #2Aug 11, 2023 12:14AM

Marked as fixed.

Project: platform/frameworks/support
Branch: androidx-master-dev

commit c60f33e229e31ab328ef6b59dab63b264954831c
Author: Alexandre Elias <aelias@google.com>
Date: Fri Jul 10 16:23:09 2020

Semantics no-op cleanups

Partly in response to lmr's broad code review, I did a pass of
superficial API/implementation cleanup. The main changes are:

- I changed each Boolean SemanticsProperty where false is equivalent to
not being present to take "Unit" instead. This is conceptually
clearer: it avoids questions like "can I cancel out a semantics from a
merged child by setting it to false?" Because "property = Unit" looks
weird, I also changed the style of these to "property()".

- I moved the Semantics id generator closer to where it's used, in
SemanticsModifierCore. I made it internal and an AtomicInt.
(Note that integer ids are heavily used in the Android
AccessibilityNodeInfo APIs so I can't simply remove them entirely.)

- I deleted dead code. Some examples include SemanticsHintOverrides,
a public API not connected to anything, and SemanticsPropertyKey
merge() open method which is never called. (In both cases I have
a different plan in mind for accessibility.)

Fixes: 145951226
Fixes: 145955412
Test: existing tests
Relnote: "Single-value semantics properties now use a calling style.
For example, 'semantics { hidden = true }' is now written as:
'semantics { hidden() }'."

Change-Id: Ic1afd12ea22c926babc9662f1804d80b33aa0cfc

M ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/LayoutNodeModifierBenchmark.kt
M ui/ui-core/api/0.1.0-dev15.txt
M ui/ui-core/api/current.txt
M ui/ui-core/api/public_plus_experimental_0.1.0-dev15.txt
M ui/ui-core/api/public_plus_experimental_current.txt
M ui/ui-core/api/restricted_0.1.0-dev15.txt
M ui/ui-core/api/restricted_current.txt
M ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/graphics/vector/VectorTest.kt
M ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/semantics/SemanticsTests.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidActuals.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeView.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeViewAccessibilityDelegateCompat.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidPopup.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/Expect.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsConfiguration.kt
D ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsHintOverrides.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsModifier.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsNode.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsOwner.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsWrapper.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/semantics/SemanticsProperties.kt
M ui/ui-foundation/api/0.1.0-dev15.txt
M ui/ui-foundation/api/current.txt
M ui/ui-foundation/api/public_plus_experimental_0.1.0-dev15.txt
M ui/ui-foundation/api/public_plus_experimental_current.txt
M ui/ui-foundation/api/restricted_0.1.0-dev15.txt
M ui/ui-foundation/api/restricted_current.txt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/Clickable.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/Dialog.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/Scroller.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/selection/Selectable.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/selection/Toggleable.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/semantics/FoundationSemanticsProperties.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/ButtonTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/CardTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/CheckboxScreenshotTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/RadioButtonScreenshotTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/ScaffoldTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/SnackbarTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/SurfaceTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/ripple/RippleIndicationTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/textfield/TextFieldScreenshotTest.kt
M ui/ui-material/src/main/java/androidx/ui/material/AppBar.kt
M ui/ui-material/src/main/java/androidx/ui/material/TextFieldImpl.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/AssertsTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/CallSemanticsActionTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/ErrorMessagesTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/FindersTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/PrintToStringTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/ScrollToTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/TextActionsTest.kt
M ui/ui-test/src/main/java/androidx/ui/test/Actions.kt
M ui/ui-test/src/main/java/androidx/ui/test/Filters.kt
M ui/ui-text/api/0.1.0-dev15.txt
M ui/ui-text/api/current.txt
M ui/ui-text/api/public_plus_experimental_0.1.0-dev15.txt
M ui/ui-text/api/public_plus_experimental_current.txt
M ui/ui-text/api/restricted_0.1.0-dev15.txt
M ui/ui-text/api/restricted_current.txt
M ui/ui-text/src/commonMain/kotlin/androidx/ui/text/CoreTextField.kt
M ui/ui-text/src/commonMain/kotlin/androidx/ui/text/TextSemanticsProperties.kt

https://android-review.googlesource.com/1360099

nj...@google.com <nj...@google.com> #3Aug 31, 2023 03:30AM

Status: Assigned (reopened)

Unfortunately we needed to revert this change as it currently includes a ToT dependency on the androidx.annotation module which breaks G3 drops. Once androidx.annotation version 1.7 goes live on September 6th we can re-land this CL.

ap...@google.com <ap...@google.com> #4Sep 8, 2023 10:19PM

Marked as fixed.

Project: platform/frameworks/support
Branch: androidx-main

commit 9ea54e83edfffd9403fc661ea4e65332522c5c1f
Author: Nader Jawad <njawad@google.com>
Date: Fri Sep 08 10:36:05 2023

Reland "Uncomment androidx.annotation annotations in graphics code""

This reverts commit c6880a2af26f1a0c2a6b601e99a60a5a3dcbe7b5.

Relanding this CL since the official 1.7 release of the annotations
module has been published. Updating the dependency to refer
to this pinned version rather than ToT.

Relnote: "Added androidx annotations to various graphics
APIs to specify ColorInt, FloatRange, IntRange, Size and more"

Fixes: 290950582
Test: re-ran compose tests
Change-Id: Id65c82355bc1859fb2b3683e69606a38779654a5

M compose/ui/ui-graphics/api/current.txt
M compose/ui/ui-graphics/api/restricted_current.txt
M compose/ui/ui-graphics/build.gradle
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Color.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Outline.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/PixelMap.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorModel.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpace.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpaces.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Connector.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/WhitePoint.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/CanvasDrawScope.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt
M gradle/libs.versions.toml
M wear/compose/integration-tests/navigation/build.gradle

https://android-review.googlesource.com/2746055

na...@google.com <na...@google.com> #5Sep 20, 2023 07:16PM

The following release(s) address this bug.It is possible this bug has only been partially addressed:

androidx.compose.ui:ui-graphics:1.6.0-alpha06
androidx.compose.ui:ui-graphics-android:1.6.0-alpha06

Issue 290950582