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

Commit a3de0c1e authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Android (Google) Code Review
Browse files

Merge changes from topic "move-stl-library" into main

* changes:
  Move SceneTransitionLayout to a separate library (1/2)
  Add MovableElementScope.animateXAsState
parents cbd1bfb6 6d5bea59
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ systemui_compose_java_defaults {
            static_libs: [
                "CommunalLayoutLib",
                "PlatformComposeCore",
                "PlatformComposeSceneTransitionLayout",

                "androidx.compose.runtime_runtime",
                "androidx.compose.material3_material3",
+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ android_library {
    static_libs: [
        "SystemUI-core",
        "PlatformComposeCore",
        "PlatformComposeSceneTransitionLayout",

        "androidx.compose.runtime_runtime",
        "androidx.compose.animation_animation-graphics",
+39 −0
Original line number Diff line number Diff line
// Copyright (C) 2023 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 {
    // See: http://go/android-license-faq
    // A large-scale-change added 'default_applicable_licenses' to import
    // all of the 'license_kinds' from "frameworks_base_packages_SystemUI_license"
    // to get the below license kinds:
    //   SPDX-license-identifier-Apache-2.0
    default_applicable_licenses: ["frameworks_base_packages_SystemUI_license"],
}

android_library {
    name: "PlatformComposeSceneTransitionLayout",
    manifest: "AndroidManifest.xml",

    srcs: [
        "src/**/*.kt",
    ],

    static_libs: [
        "androidx.compose.runtime_runtime",
        "androidx.compose.material3_material3",
    ],

    kotlincflags: ["-Xjvm-default=all"],
    use_resource_processor: true,
}
+22 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
     Copyright (C) 2023 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.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.android.compose.animation.scene">


</manifest>
+13 −0
Original line number Diff line number Diff line
set noparent

# Bug component: 1184816

jdemeulenaere@google.com
omarmt@google.com

# SysUI Dr No's.
# Don't send reviews here.
dsandler@android.com
cinek@google.com
juliacr@google.com
pixel@google.com
 No newline at end of file
Loading