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

Commit 8021732c authored by Xin Li's avatar Xin Li
Browse files

Merge Coral/Flame into AOSP master 

Bug: 141248619
Change-Id: Ie1ee4a434b0a2de411018750afbd7546ada67fa2
Merged-In: I6f659f61e70630236cabf7a00af39ae2c2c7264c
parents db68a158 6d14b396

SecondaryDisplayLauncher/res/values-zh-rTW/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,5 +21,5 @@ 
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="couldnt_launch" msgid="7873588052226763866">"無法啟動活動"</string>

    <string name="add_app_shortcut" msgid="2756755330707509435">"新增應用程式捷徑"</string>

    <string name="set_wallpaper" msgid="6475195450505435904">"設定桌布"</string>

    <string name="set_wallpaper" msgid="6475195450505435904">"套用桌布"</string>

</resources>

go/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java

+3 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MOD 
import android.animation.AnimatorSet;

import android.animation.ValueAnimator;

import android.app.ActivityOptions;

import android.content.Context;

import android.os.Handler;

import android.util.Log;
@@ -151,7 +152,7 @@ final class AppToOverviewAnimationProvider<T extends BaseDraggingActivity> imple 
    }



    @Override

    public ActivityOptions toActivityOptions(Handler handler, long duration) {

    public ActivityOptions toActivityOptions(Handler handler, long duration, Context context) {

        LauncherAnimationRunner runner = new LauncherAnimationRunner(handler,

                false /* startAtFrontOfQueue */) {
@@ -165,7 +166,7 @@ final class AppToOverviewAnimationProvider<T extends BaseDraggingActivity> imple 
                    );

                    return;

                }

                result.setAnimation(createWindowAnimation(targetCompats));

                result.setAnimation(createWindowAnimation(targetCompats), context);

            }

        };

        return ActivityOptionsCompat.makeRemoteAnimation(

go/quickstep/src/com/android/quickstep/TouchInteractionService.java

+9 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ import android.view.MotionEvent; 


import com.android.launcher3.Utilities;

import com.android.launcher3.compat.UserManagerCompat;

import com.android.launcher3.util.LooperExecutor;

import com.android.launcher3.util.UiThreadHelper;

import com.android.systemui.shared.recents.IOverviewProxy;

import com.android.systemui.shared.recents.ISystemUiProxy;
@@ -137,6 +139,9 @@ public class TouchInteractionService extends Service { 
        return sConnected;

    }



    public static final LooperExecutor BACKGROUND_EXECUTOR =

            new LooperExecutor(UiThreadHelper.getBackgroundLooper());



    private RecentsModel mRecentsModel;

    private OverviewComponentObserver mOverviewComponentObserver;

    private OverviewCommandHelper mOverviewCommandHelper;
@@ -180,4 +185,8 @@ public class TouchInteractionService extends Service { 
        }

        return mMyBinder;

    }



    public static boolean isInitialized() {

        return true;

    }

}

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

+8 −4
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.graphics.drawable.Drawable; 
import android.os.Build;

import android.os.Process;

import android.os.UserHandle;

import androidx.annotation.NonNull;



/**

 * This class will be moved to androidx library. There shouldn't be any dependency outside
@@ -154,7 +155,7 @@ public class BaseIconFactory implements AutoCloseable { 
     * @param scale                     returns the scale result from normalization

     * @return a bitmap suitable for disaplaying as an icon at various system UIs.

     */

    public BitmapInfo createBadgedIconBitmap(Drawable icon, UserHandle user,

    public BitmapInfo createBadgedIconBitmap(@NonNull Drawable icon, UserHandle user,

            boolean shrinkNonAdaptiveIcons, boolean isInstantApp, float[] scale) {

        if (scale == null) {

            scale = new float[1];
@@ -204,8 +205,11 @@ public class BaseIconFactory implements AutoCloseable { 
        mDisableColorExtractor = true;

    }



    private Drawable normalizeAndWrapToAdaptiveIcon(Drawable icon, boolean shrinkNonAdaptiveIcons,

            RectF outIconBounds, float[] outScale) {

    private Drawable normalizeAndWrapToAdaptiveIcon(@NonNull Drawable icon,

            boolean shrinkNonAdaptiveIcons, RectF outIconBounds, float[] outScale) {

        if (icon == null) {

            return null;

        }

        float scale = 1f;



        if (shrinkNonAdaptiveIcons && ATLEAST_OREO) {
@@ -261,7 +265,7 @@ public class BaseIconFactory implements AutoCloseable { 
     * @param icon drawable that should be flattened to a bitmap

     * @param scale the scale to apply before drawing {@param icon} on the canvas

     */

    public Bitmap createIconBitmap(Drawable icon, float scale, int size) {

    public Bitmap createIconBitmap(@NonNull Drawable icon, float scale, int size) {

        Bitmap bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);

        if (icon == null) {

            return bitmap;

quickstep/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
    package="com.android.launcher3" >



    <uses-permission android:name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS" />

    <uses-permission android:name="android.permission.VIBRATE" />



    <application

        android:backupAgent="com.android.launcher3.LauncherBackupAgent"