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

Commit 78cac516 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove ADAPTIVE_ICON_WINDOW_ANIM feature flag."

parents ec951f7f 78d0d4f8

quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java

+1 −2
Original line number Diff line number Diff line
@@ -386,8 +386,7 @@ public abstract class BaseQuickstepLauncher extends Launcher 


    @Override

    public boolean supportsAdaptiveIconAnimation(View clickedView) {

        return mAppTransitionManager.hasControlRemoteAppTransitionPermission()

                && FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM.get();

        return mAppTransitionManager.hasControlRemoteAppTransitionPermission();

    }



    @Override

src/com/android/launcher3/Launcher.java

+2 −9
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import static com.android.launcher3.LauncherState.NO_SCALE; 
import static com.android.launcher3.LauncherState.SPRING_LOADED;

import static com.android.launcher3.Utilities.postAsyncCallback;

import static com.android.launcher3.accessibility.LauncherAccessibilityDelegate.getSupportedActions;

import static com.android.launcher3.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM;

import static com.android.launcher3.dragndrop.DragLayer.ALPHA_INDEX_LAUNCHER_LOAD;

import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;

import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
@@ -2733,14 +2732,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche 
                    -> containers.add(((CellLayout) page).getShortcutsAndWidgets()));



            // Order: Preferred item by itself or in folder, then by matching package/user

            if (ADAPTIVE_ICON_WINDOW_ANIM.get()) {

            return getFirstMatch(containers, preferredItem, forFolderMatch(preferredItem),

                    packageAndUserAndApp, forFolderMatch(packageAndUserAndApp));

            } else {

                // Do not use Folder as a criteria, since it'll cause a crash when trying to draw

                // FolderAdaptiveIcon as the background.

                return getFirstMatch(containers, preferredItem, packageAndUserAndApp);

            }

        }

    }

src/com/android/launcher3/config/FeatureFlags.java

+0 −3
Original line number Diff line number Diff line
@@ -79,9 +79,6 @@ public final class FeatureFlags { 
    public static final BooleanFlag KEYGUARD_ANIMATION = getDebugFlag(

            "KEYGUARD_ANIMATION", false, "Enable animation for keyguard going away on wallpaper");



    public static final BooleanFlag ADAPTIVE_ICON_WINDOW_ANIM = getDebugFlag(

            "ADAPTIVE_ICON_WINDOW_ANIM", true, "Use adaptive icons for window animations.");



    public static final BooleanFlag ENABLE_QUICKSTEP_LIVE_TILE = getDebugFlag(

            "ENABLE_QUICKSTEP_LIVE_TILE", true, "Enable live tile in Quickstep overview");

src/com/android/launcher3/views/FloatingIconView.java

+1 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ package com.android.launcher3.views; 


import static com.android.launcher3.Utilities.getBadge;

import static com.android.launcher3.Utilities.getFullDrawable;

import static com.android.launcher3.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM;

import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;

import static com.android.launcher3.views.IconLabelDotView.setIconAndDotVisible;
@@ -254,8 +253,7 @@ public class FloatingIconView extends FrameLayout implements 
    private static void getIconResult(Launcher l, View originalView, ItemInfo info, RectF pos,

            Drawable btvIcon, IconLoadResult iconLoadResult) {

        Drawable drawable;

        boolean supportsAdaptiveIcons = ADAPTIVE_ICON_WINDOW_ANIM.get()

                && !info.isDisabled(); // Use original icon for disabled icons.

        boolean supportsAdaptiveIcons = !info.isDisabled(); // Use original icon for disabled icons.



        Drawable badge = null;

        if (info instanceof SystemShortcut) {