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

Commit 30f37734 authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Create SpaPrivileged Lib"

parents 723ce143 76606cf8

packages/SettingsLib/Spa/build.gradle

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 


buildscript {

    ext {

        minSdk_version = 31

        compose_version = '1.2.0-alpha04'

        compose_material3_version = '1.0.0-alpha06'

        spa_min_sdk = 31

        jetpack_compose_version = '1.2.0-alpha04'

        jetpack_compose_material3_version = '1.0.0-alpha06'

    }

}

plugins {

packages/SettingsLib/Spa/codelab/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    <application

        android:label="@string/app_name"

        android:supportsRtl="true"

        android:theme="@style/Theme.SettingsLib.Compose.DayNight">

        android:theme="@style/Theme.SpaLib.DayNight">

        <activity

            android:name="com.android.settingslib.spa.codelab.MainActivity"

            android:exported="true">

packages/SettingsLib/Spa/codelab/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ android { 


    defaultConfig {

        applicationId "com.android.settingslib.spa.codelab"

        minSdk minSdk_version

        minSdk spa_min_sdk

        targetSdk 33

        versionCode 1

        versionName "1.0"
@@ -52,7 +52,7 @@ android { 
        compose true

    }

    composeOptions {

        kotlinCompilerExtensionVersion compose_version

        kotlinCompilerExtensionVersion jetpack_compose_version

    }

    packagingOptions {

        resources {

packages/SettingsLib/Spa/spa/build.gradle

+7 −7
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ android { 
    compileSdk 33



    defaultConfig {

        minSdk minSdk_version

        minSdk spa_min_sdk

        targetSdk 33

    }
@@ -49,7 +49,7 @@ android { 
        compose true

    }

    composeOptions {

        kotlinCompilerExtensionVersion compose_version

        kotlinCompilerExtensionVersion jetpack_compose_version

    }

    packagingOptions {

        resources {
@@ -59,11 +59,11 @@ android { 
}



dependencies {

    api "androidx.compose.material3:material3:$compose_material3_version"

    api "androidx.compose.material:material-icons-extended:$compose_version"

    api "androidx.compose.runtime:runtime-livedata:$compose_version"

    api "androidx.compose.ui:ui-tooling-preview:$compose_version"

    api "androidx.compose.material3:material3:$jetpack_compose_material3_version"

    api "androidx.compose.material:material-icons-extended:$jetpack_compose_version"

    api "androidx.compose.runtime:runtime-livedata:$jetpack_compose_version"

    api "androidx.compose.ui:ui-tooling-preview:$jetpack_compose_version"

    api 'androidx.navigation:navigation-compose:2.5.0'

    api 'com.google.android.material:material:1.6.1'

    debugApi "androidx.compose.ui:ui-tooling:$compose_version"

    debugApi "androidx.compose.ui:ui-tooling:$jetpack_compose_version"

}

packages/SettingsLib/Spa/spa/res/values-night/themes.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@ 
-->

<resources>



    <style name="Theme.SettingsLib.Compose.DayNight" />

    <style name="Theme.SpaLib.DayNight" />

</resources>