Merge changes from topic "lifecycle-udc-mainline" into udc-mainline-prod
* changes: Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..." Revert "Revert "Fix Expandable.kt to work with new Compose prebu..." Revert^2 "Lifecycle has to use kotlin syntax"
No related branches found
No related tags found
Showing
- packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/BrowseActivity.kt 9 additions, 5 deletions...c/com/android/settingslib/spa/framework/BrowseActivity.kt
- packages/SystemUI/compose/core/src/com/android/compose/animation/Expandable.kt 8 additions, 9 deletions...pose/core/src/com/android/compose/animation/Expandable.kt
- packages/SystemUI/src/com/android/systemui/controls/management/ControlsEditingActivity.kt 1 addition, 1 deletion...d/systemui/controls/management/ControlsEditingActivity.kt
- packages/SystemUI/src/com/android/systemui/controls/management/ControlsFavoritingActivity.kt 1 addition, 1 deletion...ystemui/controls/management/ControlsFavoritingActivity.kt
- packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt 1 addition, 1 deletion...i/controls/management/ControlsProviderSelectorActivity.kt
- packages/SystemUI/src/com/android/systemui/controls/ui/ControlsActivity.kt 1 addition, 1 deletion.../src/com/android/systemui/controls/ui/ControlsActivity.kt
- packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayLifecycleOwner.kt 4 additions, 3 deletions...com/android/systemui/dreams/DreamOverlayLifecycleOwner.kt
- packages/SystemUI/src/com/android/systemui/lifecycle/RepeatWhenAttached.kt 4 additions, 3 deletions.../src/com/android/systemui/lifecycle/RepeatWhenAttached.kt
Loading
Please register or sign in to comment