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

Commit cbc75a15 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-23.0' into a16

parents e6bc6e44 214b5136

app/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ android_app { 
    resource_dirs: ["src/main/res"],

    manifest: "src/main/AndroidManifest.xml",



    sdk_version: "35",

    sdk_version: "36",

    product_specific: true,



    use_embedded_native_libs: true,
@@ -66,7 +66,10 @@ android_app { 
        "androidx.recyclerview_recyclerview",

        "androidx.room_room-ktx",

        "androidx.room_room-runtime",

        "androidx.room_room-runtime",

        "androidx.savedstate_savedstate",

        "androidx.sqlite_sqlite",

        "androidx.sqlite_sqlite-framework",

        "androidx.viewpager2_viewpager2",

        "Twelve_com.github.bogerchan_Nier-Visualizer",

        "com.google.android.material_material",

app/build.gradle.kts

+4 −4
Original line number Diff line number Diff line
@@ -8,21 +8,21 @@ import org.lineageos.generatebp.models.Module 


plugins {

    alias(libs.plugins.android.application)

    alias(libs.plugins.kapt)

    alias(libs.plugins.kotlin.android)

    alias(libs.plugins.kotlin.serialization)

    alias(libs.plugins.kotlin.kapt)

    alias(libs.plugins.kotlin.parcelize)

    alias(libs.plugins.kotlin.serialization)

    alias(libs.plugins.lineageos.generatebp)

}



android {

    namespace = "org.lineageos.twelve"

    compileSdk = 35

    compileSdk = 36



    defaultConfig {

        applicationId = "org.lineageos.twelve"

        minSdk = 30

        targetSdk = 35

        targetSdk = 36

        versionCode = 1

        versionName = "1.0"

    }

app/libs/Android.bp

+47 −47
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
android_library_import {

    name: "Twelve_androidx.media3_media3-common",

    aars: ["androidx/media3/media3-common/1.8.0/media3-common-1.8.0.aar"],

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",
@@ -24,15 +24,15 @@ android_library_import { 
android_library_import {

    name: "Twelve_androidx.media3_media3-common-ktx",

    aars: ["androidx/media3/media3-common-ktx/1.8.0/media3-common-ktx-1.8.0.aar"],

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    static_libs: [

        "Twelve_androidx.media3_media3-common",

        "androidx.core_core",

        "Twelve_androidx.media3_media3-common",

        "kotlin-stdlib",

        "kotlinx-coroutines-android",

        "kotlinx-coroutines-core",
@@ -42,199 +42,199 @@ android_library_import { 
android_library_import {

    name: "Twelve_androidx.media3_media3-container",

    aars: ["androidx/media3/media3-container/1.8.0/media3-container-1.8.0.aar"],

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    static_libs: [

        "Twelve_androidx.media3_media3-common",

        "androidx.annotation_annotation",

        "Twelve_androidx.media3_media3-common",

    ],

}



android_library_import {

    name: "Twelve_androidx.media3_media3-database",

    aars: ["androidx/media3/media3-database/1.8.0/media3-database-1.8.0.aar"],

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    static_libs: [

        "Twelve_androidx.media3_media3-common",

        "androidx.annotation_annotation",

        "Twelve_androidx.media3_media3-common",

    ],

}



android_library_import {

    name: "Twelve_androidx.media3_media3-datasource",

    aars: ["androidx/media3/media3-datasource/1.8.0/media3-datasource-1.8.0.aar"],

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    static_libs: [

        "Twelve_androidx.media3_media3-common",

        "Twelve_androidx.media3_media3-database",

        "androidx.annotation_annotation",

        "androidx.exifinterface_exifinterface",

        "Twelve_androidx.media3_media3-common",

        "Twelve_androidx.media3_media3-database",

    ],

}



android_library_import {

    name: "Twelve_androidx.media3_media3-decoder",

    aars: ["androidx/media3/media3-decoder/1.8.0/media3-decoder-1.8.0.aar"],

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    static_libs: [

        "Twelve_androidx.media3_media3-common",

        "androidx.annotation_annotation",

        "Twelve_androidx.media3_media3-common",

    ],

}



android_library_import {

    name: "Twelve_androidx.media3_media3-exoplayer",

    aars: ["androidx/media3/media3-exoplayer/1.8.0/media3-exoplayer-1.8.0.aar"],

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    static_libs: [

        "androidx.annotation_annotation",

        "androidx.collection_collection",

        "androidx.core_core",

        "androidx.exifinterface_exifinterface",

        "Twelve_androidx.media3_media3-common",

        "Twelve_androidx.media3_media3-container",

        "Twelve_androidx.media3_media3-database",

        "Twelve_androidx.media3_media3-datasource",

        "Twelve_androidx.media3_media3-decoder",

        "Twelve_androidx.media3_media3-extractor",

        "androidx.annotation_annotation",

        "androidx.collection_collection",

        "androidx.core_core",

        "androidx.exifinterface_exifinterface",

    ],

}



android_library_import {

    name: "Twelve_androidx.media3_media3-exoplayer-hls",

    aars: ["androidx/media3/media3-exoplayer-hls/1.8.0/media3-exoplayer-hls-1.8.0.aar"],

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    static_libs: [

        "Twelve_androidx.media3_media3-exoplayer",

        "androidx.annotation_annotation",

        "Twelve_androidx.media3_media3-exoplayer",

    ],

}



android_library_import {

    name: "Twelve_androidx.media3_media3-exoplayer-midi",

    aars: ["androidx/media3/media3-exoplayer-midi/1.8.0/media3-exoplayer-midi-1.8.0.aar"],

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    static_libs: [

        "androidx.annotation_annotation",

        "Twelve_androidx.media3_media3-common",

        "Twelve_androidx.media3_media3-decoder",

        "Twelve_androidx.media3_media3-exoplayer",

        "Twelve_androidx.media3_media3-extractor",

        "Twelve_com.github.philburk_jsyn",

        "androidx.annotation_annotation",

    ],

}



android_library_import {

    name: "Twelve_androidx.media3_media3-exoplayer-rtsp",

    aars: ["androidx/media3/media3-exoplayer-rtsp/1.8.0/media3-exoplayer-rtsp-1.8.0.aar"],

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    static_libs: [

        "Twelve_androidx.media3_media3-exoplayer",

        "androidx.annotation_annotation",

        "Twelve_androidx.media3_media3-exoplayer",

    ],

}



android_library_import {

    name: "Twelve_androidx.media3_media3-exoplayer-smoothstreaming",

    aars: ["androidx/media3/media3-exoplayer-smoothstreaming/1.8.0/media3-exoplayer-smoothstreaming-1.8.0.aar"],

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    static_libs: [

        "Twelve_androidx.media3_media3-exoplayer",

        "androidx.annotation_annotation",

        "Twelve_androidx.media3_media3-exoplayer",

    ],

}



android_library_import {

    name: "Twelve_androidx.media3_media3-extractor",

    aars: ["androidx/media3/media3-extractor/1.8.0/media3-extractor-1.8.0.aar"],

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    static_libs: [

        "androidx.annotation_annotation",

        "Twelve_androidx.media3_media3-common",

        "Twelve_androidx.media3_media3-container",

        "Twelve_androidx.media3_media3-decoder",

        "androidx.annotation_annotation",

    ],

}



android_library_import {

    name: "Twelve_androidx.media3_media3-session",

    aars: ["androidx/media3/media3-session/1.8.0/media3-session-1.8.0.aar"],

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    static_libs: [

        "Twelve_androidx.media3_media3-common",

        "Twelve_androidx.media3_media3-datasource",

        "androidx.collection_collection",

        "androidx.core_core",

        "androidx.media_media",

        "Twelve_androidx.media3_media3-common",

        "Twelve_androidx.media3_media3-datasource",

    ],

}



android_library_import {

    name: "Twelve_androidx.media3_media3-ui",

    aars: ["androidx/media3/media3-ui/1.8.0/media3-ui-1.8.0.aar"],

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    static_libs: [

        "Twelve_androidx.media3_media3-common",

        "androidx.annotation_annotation",

        "Twelve_androidx.media3_media3-common",

        "androidx.recyclerview_recyclerview",

    ],

}
@@ -242,7 +242,7 @@ android_library_import { 
android_library_import {

    name: "Twelve_com.github.bogerchan_Nier-Visualizer",

    aars: ["com/github/bogerchan/Nier-Visualizer/v0.1.3/Nier-Visualizer-v0.1.3.aar"],

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",
@@ -256,7 +256,7 @@ android_library_import { 
java_import {

    name: "Twelve_com.github.philburk_jsyn",

    jars: ["com/github/philburk/jsyn/3f6b44b853bccc0d2e3027104d575fcc5ccb6d4e/jsyn-3f6b44b853bccc0d2e3027104d575fcc5ccb6d4e.jar"],

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",
@@ -269,7 +269,7 @@ java_import { 
java_import {

    name: "Twelve_com.squareup.okhttp3_okhttp",

    jars: ["com/squareup/okhttp3/okhttp/4.12.0/okhttp-4.12.0.jar"],

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",
@@ -283,7 +283,7 @@ java_import { 


java_library_static {

    name: "Twelve_com.squareup.okio_okio",

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",
@@ -297,7 +297,7 @@ java_library_static { 
java_import {

    name: "Twelve_com.squareup.okio_okio-jvm",

    jars: ["com/squareup/okio/okio-jvm/3.9.1/okio-jvm-3.9.1.jar"],

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",
@@ -310,7 +310,7 @@ java_import { 


java_library_static {

    name: "Twelve_io.coil-kt.coil3_coil",

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",
@@ -324,7 +324,7 @@ java_library_static { 
android_library_import {

    name: "Twelve_io.coil-kt.coil3_coil-android",

    aars: ["io/coil-kt/coil3/coil-android/3.0.4/coil-release.aar"],

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",
@@ -338,7 +338,7 @@ android_library_import { 


java_library_static {

    name: "Twelve_io.coil-kt.coil3_coil-core",

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",
@@ -352,20 +352,20 @@ java_library_static { 
android_library_import {

    name: "Twelve_io.coil-kt.coil3_coil-core-android",

    aars: ["io/coil-kt/coil3/coil-core-android/3.0.4/coil-core-release.aar"],

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    static_libs: [

        "Twelve_com.squareup.okio_okio",

        "androidx.annotation_annotation",

        "androidx.appcompat_appcompat-resources",

        "androidx.core_core-ktx",

        "androidx.exifinterface_exifinterface",

        "androidx.lifecycle_lifecycle-runtime",

        "androidx.profileinstaller_profileinstaller",

        "Twelve_com.squareup.okio_okio",

        "kotlin-stdlib",

        "kotlinx-coroutines-android",

        "kotlinx-coroutines-core",
@@ -374,7 +374,7 @@ android_library_import { 


java_library_static {

    name: "Twelve_io.coil-kt.coil3_coil-network-core",

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",
@@ -388,22 +388,22 @@ java_library_static { 
android_library_import {

    name: "Twelve_io.coil-kt.coil3_coil-network-core-android",

    aars: ["io/coil-kt/coil3/coil-network-core-android/3.0.4/coil-network-core-release.aar"],

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    static_libs: [

        "Twelve_io.coil-kt.coil3_coil-core",

        "androidx.core_core-ktx",

        "Twelve_io.coil-kt.coil3_coil-core",

        "kotlin-stdlib",

    ],

}



java_library_static {

    name: "Twelve_io.coil-kt.coil3_coil-network-okhttp",

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",
@@ -417,7 +417,7 @@ java_library_static { 
java_import {

    name: "Twelve_io.coil-kt.coil3_coil-network-okhttp-jvm",

    jars: ["io/coil-kt/coil3/coil-network-okhttp-jvm/3.0.4/coil-network-okhttp-jvm-3.0.4.jar"],

    sdk_version: "35",

    sdk_version: "36",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

app/src/main/res/values-az/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
    <string name="main_fragment_section_activity">Fəaliyyət</string>

    <string name="main_fragment_section_search">Axtar</string>

    <string name="main_fragment_section_library">Kitabxana</string>

    <string name="play_random_songs">Təsadüfi mahnıları oxut</string>

    <string name="search_hint">Axtar…</string>

    <string name="library_fragment_menu_albums">Albomlar</string>

    <string name="library_fragment_menu_artists">Sənətçilər</string>

app/src/main/res/values-ca/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
    <string name="main_fragment_section_activity">Activitat</string>

    <string name="main_fragment_section_search">Cerca</string>

    <string name="main_fragment_section_library">Biblioteca</string>

    <string name="play_random_songs">Reprodueix cançons aleatòries</string>

    <string name="search_hint">Cerca…</string>

    <string name="library_fragment_menu_albums">Àlbums</string>

    <string name="library_fragment_menu_artists">Artistes</string>