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

Commit a262a932 authored by Abhishek Aggarwal's avatar Abhishek Aggarwal Committed by Sahil Sonar
Browse files

bl3:make it buildable

parent 9c5ccec5
Loading
Loading
Loading
Loading
+2 −17
Original line number Diff line number Diff line
@@ -3,10 +3,6 @@ apply plugin: 'kotlin-android'

android {
    namespace = "com.android.app.animation"
    testNamespace = "com.android.app.animation.tests"
    defaultConfig {
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }

    sourceSets {
        main {
@@ -19,25 +15,14 @@ android {
            manifest.srcFile 'tests/AndroidManifest.xml'
        }
    }

    lintOptions {
        abortOnError false
    }
    tasks.lint.enabled = false
    tasks.withType(JavaCompile) {
        options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
    }
    kotlinOptions {
        jvmTarget = '1.8'
        freeCompilerArgs = ["-Xjvm-default=all"]
    }
}

addFrameworkJar('framework-14.jar')

dependencies {
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0"
    implementation "androidx.core:core-animation:1.0.0-alpha02"
    implementation "androidx.core:core-ktx:1.9.0"
    androidTestImplementation libs.robolectric
    androidTestImplementation "androidx.test.ext:junit:1.1.3"
    androidTestImplementation "androidx.test:rules:1.4.0"
}
+2 −8
Original line number Diff line number Diff line
@@ -6,18 +6,12 @@ android {
    namespace = "com.android.launcher3.icons"
    sourceSets {
        main {
            java.srcDirs = ['src', 'src_full_lib']
            java.srcDirs = ['src']
            manifest.srcFile 'AndroidManifest.xml'
            res.srcDirs = ['res']
        }
    }
    lint {
        abortOnError false
    }

    tasks.withType(JavaCompile) {
        options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
    }
    addFrameworkJar('framework-14.jar')
}

dependencies {
+2 −2
Original line number Diff line number Diff line
@@ -365,8 +365,8 @@ public class BaseIconFactory implements AutoCloseable {
     * Wraps the provided icon in an adaptive icon drawable
     */
    public AdaptiveIconDrawable wrapToAdaptiveIcon(@NonNull Drawable icon) {
        if (icon instanceof AdaptiveIconDrawable aid) {
            return aid;
        if (icon instanceof AdaptiveIconDrawable) {
            return (AdaptiveIconDrawable) icon;
        } else {
            EmptyWrapper foreground = new EmptyWrapper();
            AdaptiveIconDrawable dr = new AdaptiveIconDrawable(