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

Commit 0dbe2107 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Introduce the SystemUIComposeFeatures library (1/2) 

This CL introduces the SystemUIComposeFeatures library, which will
contain all feature-specific Compose code.

Bug: 231131244
Test: atest SystemUIComposeFeaturesTests
Change-Id: Ic133df0dd58eeb9f392d4618c320d2c3bc426d68
parent 8c9dea27

packages/SystemUI/compose/core/TEST_MAPPING

+11 −0
Original line number Diff line number Diff line
@@ -10,6 +10,17 @@ 
          "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

      ]

    },

    {

      "name": "SystemUIComposeFeaturesTests",

      "options": [

        {

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

        },

        {

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

        }

      ]

    }

  ]

}
 
 No newline at end of file

packages/SystemUI/compose/features/Android.bp

0 → 100644
+40 −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: "SystemUIComposeFeatures",

    manifest: "AndroidManifest.xml",



    srcs: [

        "src/**/*.kt",

    ],



    static_libs: [

        "SystemUIComposeCore",



        "androidx.compose.runtime_runtime",

        "androidx.compose.material3_material3",

    ],



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

}

packages/SystemUI/compose/features/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.features">





</manifest>

packages/SystemUI/compose/features/TEST_MAPPING

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

  "presubmit": [

    {

      "name": "SystemUIComposeFeaturesTests",

      "options": [

        {

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

        },

        {

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

        }

      ]

    }

  ]

}
 
 No newline at end of file

packages/SystemUI/compose/features/src/com/android/systemui/ExampleFeature.kt

0 → 100644
+55 −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



import androidx.compose.foundation.clickable

import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.shape.RoundedCornerShape

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.Surface

import androidx.compose.material3.Text

import androidx.compose.runtime.Composable

import androidx.compose.runtime.getValue

import androidx.compose.runtime.mutableStateOf

import androidx.compose.runtime.remember

import androidx.compose.runtime.setValue

import androidx.compose.ui.Modifier

import androidx.compose.ui.unit.dp



/**

 * This is an example Compose feature, which shows a text and a count that is incremented when

 * clicked.

 */

@Composable

fun ExampleFeature(text: String, modifier: Modifier = Modifier) {

    Surface(

        modifier,

        color = MaterialTheme.colorScheme.primaryContainer,

        shape = RoundedCornerShape(28.dp),

    ) {

        var count by remember { mutableStateOf(0) }

        Column(

            Modifier

                .clickable { count++ }

                .padding(16.dp),

        ) {

            Text(text)

            Text("I was clicked $count times.")

        }

    }

}
 
 No newline at end of file