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

Commit 5e8b535a authored by Jagrut Desai's avatar Jagrut Desai
Browse files

Initialize TaskbarFeatureEvaluator and SpecsEvaluator onlyu if customization is on 

Test: presubmit
Bug: 353841430
Flag: com.android.launcher3.enable_taskbar_customization
Change-Id: I5699e99eee0817327ca66598bfccb622801762ab
parent c4ae2f65

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+13 −8
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_ALL; 
import static com.android.launcher3.AbstractFloatingView.TYPE_REBIND_SAFE;

import static com.android.launcher3.AbstractFloatingView.TYPE_TASKBAR_OVERLAY_PROXY;

import static com.android.launcher3.Flags.enableCursorHoverStates;

import static com.android.launcher3.Flags.enableTaskbarCustomization;

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

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

import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_NAVBAR_UNIFICATION;
@@ -207,9 +208,9 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 


    private final LauncherPrefs mLauncherPrefs;



    private final TaskbarFeatureEvaluator mTaskbarFeatureEvaluator;

    private TaskbarFeatureEvaluator mTaskbarFeatureEvaluator;



    private final TaskbarSpecsEvaluator mTaskbarSpecsEvaluator;

    private TaskbarSpecsEvaluator mTaskbarSpecsEvaluator;



    public TaskbarActivityContext(Context windowContext,

            @Nullable Context navigationBarPanelContext, DeviceProfile launcherDp,
@@ -221,12 +222,14 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
        applyDeviceProfile(launcherDp);

        final Resources resources = getResources();



        if (enableTaskbarCustomization()) {

            mTaskbarFeatureEvaluator = TaskbarFeatureEvaluator.getInstance(this);

            mTaskbarSpecsEvaluator = new TaskbarSpecsEvaluator(

                    this,

                    mTaskbarFeatureEvaluator,

                    mDeviceProfile.inv.numRows,

                    mDeviceProfile.inv.numColumns);

        }



        mImeDrawsImeNavBar = getBoolByName(IME_DRAWS_IME_NAV_BAR_RES_NAME, resources, false);

        mIsSafeModeEnabled = TraceHelper.allowIpcs("isSafeMode",
@@ -1663,10 +1666,12 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
        return mControllers.taskbarStashController.isInStashedLauncherState();

    }



    @Nullable

    public TaskbarFeatureEvaluator getTaskbarFeatureEvaluator() {

        return mTaskbarFeatureEvaluator;

    }



    @Nullable

    public TaskbarSpecsEvaluator getTaskbarSpecsEvaluator() {

        return mTaskbarSpecsEvaluator;

    }

quickstep/src/com/android/launcher3/taskbar/customization/TaskbarAllAppsButtonContainer.kt

+3 −3
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ constructor( 


    override val spaceNeeded: Int

        get() {

            return dpToPx(activityContext.taskbarSpecsEvaluator.taskbarIconSize.size.toFloat())

            return dpToPx(activityContext.taskbarSpecsEvaluator!!.taskbarIconSize.size.toFloat())

        }



    init {
@@ -58,9 +58,9 @@ constructor( 
    private fun setUpIcon() {

        val drawable =

            resources.getDrawable(

                getAllAppsButton(activityContext.taskbarFeatureEvaluator.isTransient)

                getAllAppsButton(activityContext.taskbarFeatureEvaluator!!.isTransient)

            )

        val padding = activityContext.taskbarSpecsEvaluator.taskbarIconPadding

        val padding = activityContext.taskbarSpecsEvaluator!!.taskbarIconPadding



        allAppsButton.setIconDrawable(drawable)

        allAppsButton.setPadding(/* left= */ padding)