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

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

Merge changes from topics "sysui-compose-core", "sysui-compose-features", "sysui-compose-gallery" 

* changes:
  Introduce the SystemUIComposeGallery app (1/2)
  Introduce the SystemUIComposeFeatures library (1/2)
  Introduce the SystemUIComposeCore library (1/2)
parents db43f136 2024b338

packages/SystemUI/compose/core/Android.bp

0 → 100644
+38 −0
Original line number Diff line number Diff line 
// Copyright (C) 2022 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: "SystemUIComposeCore",

    manifest: "AndroidManifest.xml",



    srcs: [

        "src/**/*.kt",

    ],



    static_libs: [

        "androidx.compose.runtime_runtime",

        "androidx.compose.material3_material3",

    ],



    kotlincflags: ["-Xjvm-default=all"],

}

packages/SystemUI/compose/core/AndroidManifest.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2022 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.systemui.compose.core">





</manifest>

packages/SystemUI/compose/core/TEST_MAPPING

0 → 100644
+37 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "SystemUIComposeCoreTests",

      "options": [

        {

          "exclude-annotation": "org.junit.Ignore"

        },

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

      ]

    },

    {

      "name": "SystemUIComposeFeaturesTests",

      "options": [

        {

          "exclude-annotation": "org.junit.Ignore"

        },

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

      ]

    },

    {

      "name": "SystemUIComposeGalleryTests",

      "options": [

        {

          "exclude-annotation": "org.junit.Ignore"

        },

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

      ]

    }

  ]

}
 
 No newline at end of file

packages/SystemUI/compose/core/src/com/android/systemui/compose/theme/SystemUITheme.kt

0 → 100644
+48 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 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 com.android.systemui.compose.theme



import androidx.compose.foundation.isSystemInDarkTheme

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.Typography

import androidx.compose.material3.dynamicDarkColorScheme

import androidx.compose.material3.dynamicLightColorScheme

import androidx.compose.runtime.Composable

import androidx.compose.ui.platform.LocalContext



/**

 * The Material 3 theme that should wrap all SystemUI Composables.

 */

@Composable

fun SystemUITheme(

    isDarkTheme: Boolean = isSystemInDarkTheme(),

    content: @Composable () -> Unit,

) {

    val context = LocalContext.current



    // TODO(b/230605885): Define our typography and color scheme.

    val colorScheme = if (isDarkTheme) {

        dynamicDarkColorScheme(context)

    } else {

        dynamicLightColorScheme(context)

    }

    val typography = Typography()



    MaterialTheme(colorScheme, typography) {

        content()

    }

}
 
 No newline at end of file

packages/SystemUI/compose/core/tests/Android.bp

0 → 100644
+48 −0
Original line number Diff line number Diff line 
// Copyright (C) 2022 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"],

}



// TODO(b/230606318): Make those host tests instead of device tests.

android_test {

    name: "SystemUIComposeCoreTests",

    manifest: "AndroidManifest.xml",

    test_suites: ["device-tests"],

    sdk_version: "current",

    certificate: "platform",



    srcs: [

        "src/**/*.kt",

    ],



    static_libs: [

        "SystemUIComposeCore",



        "androidx.test.runner",

        "androidx.test.ext.junit",



        "androidx.compose.runtime_runtime",

        "androidx.compose.ui_ui-test-junit4",

        "androidx.compose.ui_ui-test-manifest",

    ],



    kotlincflags: ["-Xjvm-default=enable"],

}