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

Commit 188088de authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12241618 from 1d34c94a to 24Q4-release 

Change-Id: I7f5d59c5d0b6074b2df95f0b2adc01873cb401df
parents 8301320a 1d34c94a

iconloaderlib/src/com/android/launcher3/icons/RoundDrawableWrapper.java

+11 −2
Original line number Diff line number Diff line
@@ -31,18 +31,27 @@ public class RoundDrawableWrapper extends DrawableWrapper { 
    private final RectF mTempRect = new RectF();

    private final Path mClipPath = new Path();

    private final float mRoundedCornersRadius;

    private float mScaledCornerRadius;



    public RoundDrawableWrapper(Drawable dr, float radius) {

        super(dr);

        mRoundedCornersRadius = radius;

        mScaledCornerRadius = mRoundedCornersRadius;

    }



    /**

     * Sets the scaling to be applied to the corner radius when it draws next time.

     */

    public void setCornerRadiusScale(float scale) {

        mScaledCornerRadius = Math.round(mRoundedCornersRadius * scale);

    }



    @Override

    protected void onBoundsChange(Rect bounds) {

        mTempRect.set(getBounds());

        mClipPath.reset();

        mClipPath.addRoundRect(mTempRect, mRoundedCornersRadius,

                mRoundedCornersRadius, Path.Direction.CCW);

        mClipPath.addRoundRect(mTempRect, mScaledCornerRadius, mScaledCornerRadius,

                Path.Direction.CCW);

        super.onBoundsChange(bounds);

    }

motiontoollib/build.gradle

+4 −29
Original line number Diff line number Diff line 
plugins {

    id 'com.android.library'

    id 'org.jetbrains.kotlin.android'

    id 'com.google.protobuf'

}



final String PROTOS_DIR = "${ANDROID_TOP}/frameworks/libs/systemui/motiontoollib/src/com/android/app/motiontool/proto"



android {

    namespace = "com.android.app.motiontool"

    testNamespace = "com.android.app.motiontool.tests"
@@ -17,7 +14,6 @@ android { 
        main {

            java.srcDirs = ['src']

            manifest.srcFile 'AndroidManifest.xml'

            proto.srcDirs = ["${PROTOS_DIR}"]

        }

        androidTest {

            java.srcDirs = ["tests"]
@@ -32,32 +28,11 @@ android { 


dependencies {

    implementation "androidx.core:core:1.9.0"

    implementation "com.google.protobuf:protobuf-lite:${protobuf_lite_version}"

    implementation(project(":frameworks:libs:systemui:motiontoollib:motion_tool_proto"))

    implementation(project(":frameworks:libs:systemui:viewcapturelib:view_capture_proto"))



    api project(":ViewCaptureLib")

    androidTestImplementation project(':SharedTestLib')

    androidTestImplementation 'androidx.test.ext:junit:1.1.3'

    androidTestImplementation "androidx.test:rules:1.4.0"

}
 
 No newline at end of file
 


protobuf {

    // Configure the protoc executable

    protoc {

        artifact = "com.google.protobuf:protoc:${protobuf_version}${PROTO_ARCH_SUFFIX}"

    }

    plugins {

        javalite {

            // The codegen for lite comes as a separate artifact

            artifact = "com.google.protobuf:protoc-gen-javalite:${protobuf_lite_version}${PROTO_ARCH_SUFFIX}"

        }

    }

    generateProtoTasks {

        all().each { task ->

            task.builtins {

                remove java

            }

            task.plugins {

                javalite { }

            }

        }

    }

}

viewcapturelib/build.gradle

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

    id 'com.android.library'

    id 'org.jetbrains.kotlin.android'

    id 'com.google.protobuf'

}



final String PROTOS_DIR = "${ANDROID_TOP}/frameworks/libs/systemui/viewcapturelib/src/com/android/app/viewcapture/proto"



android {

    namespace = "com.android.app.viewcapture"

    testNamespace = "com.android.app.viewcapture.test"
@@ -17,7 +14,6 @@ android { 
        main {

            java.srcDirs = ['src']

            manifest.srcFile 'AndroidManifest.xml'

            proto.srcDirs = ["${PROTOS_DIR}"]

        }

        androidTest {

            java.srcDirs = ["tests"]
@@ -32,31 +28,8 @@ android { 


dependencies {

    implementation "androidx.core:core:1.9.0"

    implementation "com.google.protobuf:protobuf-lite:${protobuf_lite_version}"

    implementation project(":frameworks:libs:systemui:viewcapturelib:view_capture_proto")

    androidTestImplementation project(':SharedTestLib')

    androidTestImplementation 'androidx.test.ext:junit:1.1.3'

    androidTestImplementation "androidx.test:rules:1.4.0"

}
 


protobuf {

    // Configure the protoc executable

    protoc {

        artifact = "com.google.protobuf:protoc:${protobuf_version}${PROTO_ARCH_SUFFIX}"

    }

    plugins {

        javalite {

            // The codegen for lite comes as a separate artifact

            artifact = "com.google.protobuf:protoc-gen-javalite:${protobuf_lite_version}${PROTO_ARCH_SUFFIX}"

        }

    }

    generateProtoTasks {

        all().each { task ->

            task.builtins {

                remove java

            }

            task.plugins {

                javalite { }

            }

        }

    }

}
 
 No newline at end of file