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

Commit 813fb84e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Jordan Demeulenaere
Browse files

[conflict] Merge "Rename SystemUIComposeCore to PlatformComposeCore (1/2)"... 

[conflict] Merge "Rename SystemUIComposeCore to PlatformComposeCore (1/2)" into tm-qpr-dev am: 62a83980

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20803453



Change-Id: I6bc476444ded867610b318bc04c0012d3ba77f09
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6176ef97 62a83980

packages/SystemUI/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ systemui_compose_java_defaults { 
            // except for SystemUI-core.

            // Copied from compose/features/Android.bp.

            static_libs: [

                "SystemUIComposeCore",

                "PlatformComposeCore",



                "androidx.compose.runtime_runtime",

                "androidx.compose.material3_material3",

packages/SystemUI/compose/core/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ package { 
}



android_library {

    name: "SystemUIComposeCore",

    name: "PlatformComposeCore",

    manifest: "AndroidManifest.xml",



    srcs: [

packages/SystemUI/compose/core/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
-->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.systemui.compose.core">

    package="com.android.compose.core">





</manifest>

packages/SystemUI/compose/core/TEST_MAPPING

+1 −1
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "SystemUIComposeCoreTests",

      "name": "PlatformComposeCoreTests",

      "options": [

        {

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

packages/SystemUI/compose/core/src/com/android/systemui/compose/SystemUiButtons.kt→packages/SystemUI/compose/core/src/com/android/compose/PlatformButtons.kt

+5 −5
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 *

 */



package com.android.systemui.compose

package com.android.compose



import androidx.compose.foundation.BorderStroke

import androidx.compose.foundation.layout.PaddingValues
@@ -27,10 +27,10 @@ import androidx.compose.material3.ButtonDefaults 
import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import androidx.compose.ui.unit.dp

import com.android.systemui.compose.theme.LocalAndroidColorScheme

import com.android.compose.theme.LocalAndroidColorScheme



@Composable

fun SysUiButton(

fun PlatformButton(

    onClick: () -> Unit,

    modifier: Modifier = Modifier,

    enabled: Boolean = true,
@@ -48,7 +48,7 @@ fun SysUiButton( 
}



@Composable

fun SysUiOutlinedButton(

fun PlatformOutlinedButton(

    onClick: () -> Unit,

    modifier: Modifier = Modifier,

    enabled: Boolean = true,
@@ -67,7 +67,7 @@ fun SysUiOutlinedButton( 
}



@Composable

fun SysUiTextButton(

fun PlatformTextButton(

    onClick: () -> Unit,

    modifier: Modifier = Modifier,

    enabled: Boolean = true,