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

Commit 1da439d8 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12399304 from c6d86290 to 25Q1-release

Change-Id: I039a7c1dc7adbe7544dbaa11554ec8e8e17e8d23
parents c82e569d c6d86290
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -15,6 +15,13 @@ flag {
    bug: "273205603"
}

flag {
    name: "return_animation_framework_long_lived"
    namespace: "systemui"
    description: "Turn on long-lived Return registrations in the Animation library"
    bug: "273205603"
}

flag {
    name: "shade_allow_back_gesture"
    namespace: "systemui"
+5 −0
Original line number Diff line number Diff line
@@ -22,12 +22,14 @@ android_library {
    min_sdk_version: "26",
    static_libs: [
        "androidx.core_core",
        "com_android_launcher3_flags_lib",
    ],
    resource_dirs: [
        "res",
    ],
    srcs: [
        "src/**/*.java",
        "src/**/*.kt",
    ],
}

@@ -37,13 +39,16 @@ android_library {
    min_sdk_version: "26",
    static_libs: [
        "androidx.core_core",
        "com_android_launcher3_flags_lib",
    ],
    resource_dirs: [
        "res",
    ],
    srcs: [
        "src/**/*.java",
        "src/**/*.kt",
        "src_full_lib/**/*.java",
        "src_full_lib/**/*.kt",
    ],
    apex_available: [
        "//apex_available:platform",

iconloaderlib/build.gradle

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line
plugins {
    id 'com.android.library'
}

android {
    namespace = "com.android.launcher3.icons"
    sourceSets {
        main {
            java.srcDirs = ['src', 'src_full_lib']
            manifest.srcFile 'AndroidManifest.xml'
            res.srcDirs = ['res']
        }
    }
    lint {
        abortOnError false
    }

    tasks.withType(JavaCompile) {
        options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
    }
}

dependencies {
    implementation "androidx.core:core"
}
+20 −0
Original line number Diff line number Diff line
plugins {
    id(libs.plugins.android.library.get().pluginId)
    id(libs.plugins.kotlin.android.get().pluginId)
}

android {
    namespace = "com.android.launcher3.icons"
    sourceSets {
        named("main") {
            java.setSrcDirs(listOf("src", "src_full_lib"))
            manifest.srcFile("AndroidManifest.xml")
            res.setSrcDirs(listOf("res"))
        }
    }
}

dependencies {
    implementation("androidx.core:core")
    api(project(":NexusLauncher.Flags"))
}
+20 −8
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ public class BaseIconFactory implements AutoCloseable {
    @NonNull
    private final ColorExtractor mColorExtractor;

    protected final int mFillResIconDpi;
    protected final int mFullResIconDpi;
    protected final int mIconBitmapSize;

    protected boolean mMonoIconEnabled;
@@ -106,11 +106,11 @@ public class BaseIconFactory implements AutoCloseable {

    private static int PLACEHOLDER_BACKGROUND_COLOR = Color.rgb(245, 245, 245);

    protected BaseIconFactory(Context context, int fillResIconDpi, int iconBitmapSize,
    protected BaseIconFactory(Context context, int fullResIconDpi, int iconBitmapSize,
            boolean shapeDetection) {
        mContext = context.getApplicationContext();
        mShapeDetection = shapeDetection;
        mFillResIconDpi = fillResIconDpi;
        mFullResIconDpi = fullResIconDpi;
        mIconBitmapSize = iconBitmapSize;

        mPm = mContext.getPackageManager();
@@ -121,8 +121,8 @@ public class BaseIconFactory implements AutoCloseable {
        clear();
    }

    public BaseIconFactory(Context context, int fillResIconDpi, int iconBitmapSize) {
        this(context, fillResIconDpi, iconBitmapSize, false);
    public BaseIconFactory(Context context, int fullResIconDpi, int iconBitmapSize) {
        this(context, fullResIconDpi, iconBitmapSize, false);
    }

    protected void clear() {
@@ -145,6 +145,10 @@ public class BaseIconFactory implements AutoCloseable {
        return mNormalizer;
    }

    public int getFullResIconDpi() {
        return mFullResIconDpi;
    }

    @SuppressWarnings("deprecation")
    public BitmapInfo createIconBitmap(Intent.ShortcutIconResource iconRes) {
        try {
@@ -152,7 +156,7 @@ public class BaseIconFactory implements AutoCloseable {
            if (resources != null) {
                final int id = resources.getIdentifier(iconRes.resourceName, null, null);
                // do not stamp old legacy shortcuts as the app may have already forgotten about it
                return createBadgedIconBitmap(resources.getDrawableForDensity(id, mFillResIconDpi));
                return createBadgedIconBitmap(resources.getDrawableForDensity(id, mFullResIconDpi));
            }
        } catch (Exception e) {
            // Icon not found.
@@ -374,7 +378,7 @@ public class BaseIconFactory implements AutoCloseable {
    }

    @NonNull
    protected Bitmap createIconBitmap(@Nullable final Drawable icon, final float scale) {
    public Bitmap createIconBitmap(@Nullable final Drawable icon, final float scale) {
        return createIconBitmap(icon, scale, MODE_DEFAULT);
    }

@@ -485,7 +489,7 @@ public class BaseIconFactory implements AutoCloseable {

    @NonNull
    public BitmapInfo makeDefaultIcon() {
        return createBadgedIconBitmap(getFullResDefaultActivityIcon(mFillResIconDpi));
        return createBadgedIconBitmap(getFullResDefaultActivityIcon(mFullResIconDpi));
    }

    @NonNull
@@ -547,6 +551,14 @@ public class BaseIconFactory implements AutoCloseable {
            return this;
        }

        /**
         * If the icon represents an archived app
         */
        public IconOptions setIsArchived(boolean isArchived) {
            mIsArchived = isArchived;
            return this;
        }

        /**
         * Disables auto color extraction and overrides the color to the provided value
         */
Loading