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

Commit 25c96b8d authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11902131 from 8f327448 to 24Q3-release 

Change-Id: Ic7cc8ff26ba4a09771cf1fe272a6e7016a80771b
parents 6ced98ad 8f327448

animationlib/Android.bp

+7 −8
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ package { 
    default_applicable_licenses: ["Android-Apache-2.0"],

}





android_library {

    name: "animationlib",

    manifest: "AndroidManifest.xml",
@@ -30,10 +29,10 @@ android_library { 
    ],

    srcs: [

        "src/**/*.java",

        "src/**/*.kt"

        "src/**/*.kt",

    ],

    resource_dirs: [

        "res"

        "res",

    ],

    kotlincflags: ["-Xjvm-default=all"],

}
@@ -49,7 +48,7 @@ android_library { 
        "androidx.test.ext.junit",

        "androidx.test.rules",

        "testables",

    ]

    ],

}



android_app {
@@ -57,7 +56,7 @@ android_app { 
    platform_apis: true,

    static_libs: [

        "animationlib-tests-base",

    ]

    ],

}



android_robolectric_test {
@@ -65,11 +64,12 @@ android_robolectric_test { 
    name: "animationlib_robo_tests",

    srcs: [

        "tests/src/**/*.kt",

        "tests/robolectric/src/**/*.kt"

        "tests/robolectric/src/**/*.kt",

    ],

    java_resource_dirs: ["tests/robolectric/config"],

    instrumentation_for: "TestAnimationLibApp",

    upstream: true,

    strict_mode: false,

}



android_test {
@@ -81,9 +81,8 @@ android_test { 
    ],

    srcs: [

        "tests/src/**/*.java",

        "tests/src/**/*.kt"

        "tests/src/**/*.kt",

    ],

    kotlincflags: ["-Xjvm-default=all"],

    test_suites: ["general-tests"],

}

iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java

+6 −2
Original line number Diff line number Diff line
@@ -589,8 +589,12 @@ public abstract class BaseIconCache { 
                    BaseIconFactory li = getIconFactory();

                    // Load the full res icon for the application, but if useLowResIcon is set, then

                    // only keep the low resolution icon instead of the larger full-sized icon

                    BitmapInfo iconInfo = li.createBadgedIconBitmap(

                            appInfo.loadIcon(mPackageManager),

                    Drawable appIcon = appInfo.loadIcon(mPackageManager);

                    if (mPackageManager.isDefaultApplicationIcon(appIcon)) {

                        // TODO(b/343233224): Log in more persistent location such as FileLog.

                        Log.d(TAG, String.format("Default icon returned for %s", packageName));

                    }

                    BitmapInfo iconInfo = li.createBadgedIconBitmap(appIcon,

                            new IconOptions().setUser(user).setInstantApp(isInstantApp(appInfo)));

                    li.close();

tracinglib/demo/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ android_app { 
    name: "CoroutineTracingDemoApp",

    platform_apis: true,

    certificate: "platform",

    min_sdk_version: "34",

    target_sdk_version: "34",

    use_resource_processor: true,

    srcs: ["src/**/*.kt"],

    manifest: "app-manifest.xml",

tracinglib/demo/app-manifest.xml

+2 −5
Original line number Diff line number Diff line
@@ -17,12 +17,10 @@ 
        package="com.android.app.tracing.demo">

    <application

        android:name=".MainApplication"

        android:allowBackup="false"

        android:label="@string/app_name"

        android:supportsRtl="true"

        android:theme="@style/DefaultTheme">

        android:label="@string/app_name">

        <activity

            android:name=".MainActivity"

            android:theme="@style/ActivityTheme"

            android:exported="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -30,5 +28,4 @@ 
            </intent-filter>

        </activity>

    </application>



</manifest>

tracinglib/demo/res/layout/activity_main.xml

+8 −2
Original line number Diff line number Diff line
@@ -15,15 +15,21 @@ 
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    android:id="@+id/main_activity_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    tools:context=".MainActivity">



    <TextView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:text="@string/app_name"

        android:layout_gravity="center"

        android:textAppearance="@style/Title"/>



    <LinearLayout

        android:id="@+id/button_container"

        android:layout_width="match_parent"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="vertical" />