Fixed
Status Update
Comments
ap...@google.com <ap...@google.com> #2
Project: platform/frameworks/support
Branch: androidx-master-dev
commit cf02d84d5d2cd585320569acdf321a47d3b49bca
Author: Matvei Malkov <malkov@google.com>
Date: Wed May 20 20:03:26 2020
Make Indication creating via ambient lazily invoked
This CL makes temporary change to make IndicationAmbient lazily invoked so Riplpe can pick up properly theming from the parent
Bug: 157150564
Test: should pass
Change-Id: I1445b247727fe571b7cc574fed2813a4914a46d4
M ui/ui-foundation/api/0.1.0-dev12.txt
M ui/ui-foundation/api/current.txt
M ui/ui-foundation/api/public_plus_experimental_0.1.0-dev12.txt
M ui/ui-foundation/api/public_plus_experimental_current.txt
M ui/ui-foundation/api/restricted_0.1.0-dev12.txt
M ui/ui-foundation/api/restricted_current.txt
M ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/IndicationSamples.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/Clickable.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/Indication.kt
M ui/ui-material/src/main/java/androidx/ui/material/MaterialTheme.kt
https://android-review.googlesource.com/1315369
Branch: androidx-master-dev
commit cf02d84d5d2cd585320569acdf321a47d3b49bca
Author: Matvei Malkov <malkov@google.com>
Date: Wed May 20 20:03:26 2020
Make Indication creating via ambient lazily invoked
This CL makes temporary change to make IndicationAmbient lazily invoked so Riplpe can pick up properly theming from the parent
Bug: 157150564
Test: should pass
Change-Id: I1445b247727fe571b7cc574fed2813a4914a46d4
M ui/ui-foundation/api/0.1.0-dev12.txt
M ui/ui-foundation/api/current.txt
M ui/ui-foundation/api/public_plus_experimental_0.1.0-dev12.txt
M ui/ui-foundation/api/public_plus_experimental_current.txt
M ui/ui-foundation/api/restricted_0.1.0-dev12.txt
M ui/ui-foundation/api/restricted_current.txt
M ui/ui-foundation/samples/src/main/java/androidx/ui/foundation/samples/IndicationSamples.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/Clickable.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/Indication.kt
M ui/ui-material/src/main/java/androidx/ui/material/MaterialTheme.kt
ma...@google.com <ma...@google.com> #3
Louis, as discussed, please take a look when you have time
lp...@google.com <lp...@google.com>
ap...@google.com <ap...@google.com> #4
Project: platform/frameworks/support
Branch: androidx-main
commit 132f9fad979d8fee43af2d17df2937131b871849
Author: Louis Pullen-Freilich <lpf@google.com>
Date: Mon Feb 01 19:42:04 2021
Changes Indication#createInstance to be @Composable
Changes LocalIndication to just contain the type Indication instead of a lambda returning Indication
Indication can now just be treated as a factory for IndicationInstance and there do not need to be multiple Indication instances across the hierarchy. createInstance() can query theme CompositionLocals directly for any theme information that depends on where the Modifier.indication() is invoked in the hierarchy.
Also changes Surface to provide ambients outside the LayoutNode with modifiers - this means that ripples applied directly to the Surface will now consume the content color provided by the Surface, instead of the nearest parent provider outside the Surface.
Bug: b/157150564
Test: MaterialRippleThemeTest
Test: SurfaceTest
Relnote: "Changed Indication#createInstance to be @Composable, and changed LocalIndication to contain an Indication, not () -> Indication."
Change-Id: I5eeea2424e4deda6116f0b48b690b628f8d545eb
M compose/foundation/foundation/api/current.txt
M compose/foundation/foundation/api/public_plus_experimental_current.txt
M compose/foundation/foundation/api/restricted_current.txt
M compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/IndicationSamples.kt
M compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/InteractionStateSample.kt
M compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/IndicationTest.kt
M compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/Clickable.kt
M compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/Indication.kt
M compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/selection/Selectable.kt
M compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/selection/Toggleable.kt
M compose/material/material-ripple/src/commonMain/kotlin/androidx/compose/material/ripple/Ripple.kt
M compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/MaterialRippleThemeTest.kt
M compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/SurfaceTest.kt
M compose/material/material/src/commonMain/kotlin/androidx/compose/material/MaterialTheme.kt
M compose/material/material/src/commonMain/kotlin/androidx/compose/material/Surface.kt
https://android-review.googlesource.com/1567760
Branch: androidx-main
commit 132f9fad979d8fee43af2d17df2937131b871849
Author: Louis Pullen-Freilich <lpf@google.com>
Date: Mon Feb 01 19:42:04 2021
Changes Indication#createInstance to be @Composable
Changes LocalIndication to just contain the type Indication instead of a lambda returning Indication
Indication can now just be treated as a factory for IndicationInstance and there do not need to be multiple Indication instances across the hierarchy. createInstance() can query theme CompositionLocals directly for any theme information that depends on where the Modifier.indication() is invoked in the hierarchy.
Also changes Surface to provide ambients outside the LayoutNode with modifiers - this means that ripples applied directly to the Surface will now consume the content color provided by the Surface, instead of the nearest parent provider outside the Surface.
Bug:
Test: MaterialRippleThemeTest
Test: SurfaceTest
Relnote: "Changed Indication#createInstance to be @Composable, and changed LocalIndication to contain an Indication, not () -> Indication."
Change-Id: I5eeea2424e4deda6116f0b48b690b628f8d545eb
M compose/foundation/foundation/api/current.txt
M compose/foundation/foundation/api/public_plus_experimental_current.txt
M compose/foundation/foundation/api/restricted_current.txt
M compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/IndicationSamples.kt
M compose/foundation/foundation/samples/src/main/java/androidx/compose/foundation/samples/InteractionStateSample.kt
M compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/IndicationTest.kt
M compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/Clickable.kt
M compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/Indication.kt
M compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/selection/Selectable.kt
M compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/selection/Toggleable.kt
M compose/material/material-ripple/src/commonMain/kotlin/androidx/compose/material/ripple/Ripple.kt
M compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/MaterialRippleThemeTest.kt
M compose/material/material/src/androidAndroidTest/kotlin/androidx/compose/material/SurfaceTest.kt
M compose/material/material/src/commonMain/kotlin/androidx/compose/material/MaterialTheme.kt
M compose/material/material/src/commonMain/kotlin/androidx/compose/material/Surface.kt
Description
No description yet.