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

Commit a4f7e457 authored by Jagrut Desai's avatar Jagrut Desai
Browse files

Fix Taskbar Container not being aligned center in 3 button nav mode 

We were applying padding to taskbar container in 3 button navigation mode which we don't need as icon size are already correct.

Test: Manual, Presubmit
Bug: 364492586
Flag: EXEMPT bugfix
Change-Id: Ib9bf55edf2b7bb67fcbeb044e0ad1e90027b17a6
parent 359fb55a

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

+1 −0
Original line number Diff line number Diff line
@@ -919,6 +919,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
     */

    public void onDestroy() {

        mIsDestroyed = true;

        mTaskbarFeatureEvaluator.onDestroy();

        setUIController(TaskbarUIController.DEFAULT);

        mControllers.onDestroy();

        if (!enableTaskbarNoRecreate() && !ENABLE_TASKBAR_NAVBAR_UNIFICATION) {

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

+20 −17
Original line number Diff line number Diff line
@@ -26,23 +26,6 @@ class TaskbarFeatureEvaluator 
private constructor(

    private val taskbarActivityContext: TaskbarActivityContext,

) {



    companion object {

        @Volatile private lateinit var taskbarFeatureEvaluator: TaskbarFeatureEvaluator



        @JvmStatic

        fun getInstance(

            taskbarActivityContext: TaskbarActivityContext,

        ): TaskbarFeatureEvaluator {

            synchronized(this) {

                if (!::taskbarFeatureEvaluator.isInitialized) {

                    taskbarFeatureEvaluator = TaskbarFeatureEvaluator(taskbarActivityContext)

                }

                return taskbarFeatureEvaluator

            }

        }

    }



    val hasAllApps = true

    val hasAppIcons = true

    val hasBubbles = false
@@ -59,4 +42,24 @@ private constructor( 


    val isLandscape: Boolean

        get() = taskbarActivityContext.deviceProfile.isLandscape



    fun onDestroy() {

        taskbarFeatureEvaluator = null

    }



    companion object {

        @Volatile private var taskbarFeatureEvaluator: TaskbarFeatureEvaluator? = null



        @JvmStatic

        fun getInstance(

            taskbarActivityContext: TaskbarActivityContext,

        ): TaskbarFeatureEvaluator {

            synchronized(this) {

                if (taskbarFeatureEvaluator == null) {

                    taskbarFeatureEvaluator = TaskbarFeatureEvaluator(taskbarActivityContext)

                }

                return taskbarFeatureEvaluator!!

            }

        }

    }

}

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

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ object TaskbarIconSpecs { 


    val minimumTaskbarIconTouchSize = TaskbarIconSize(48)



    val transientOrPinnedTaskbarIconPaddingSize = iconSize52dp



    val transientTaskbarIconSizeByGridSize =

        mapOf(

            TransientTaskbarIconSizeKey(6, 5, false) to iconSize52dp,

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

+4 −1
Original line number Diff line number Diff line
@@ -31,7 +31,10 @@ class TaskbarSpecsEvaluator( 
    private var taskbarContainer: List<TaskbarContainer> = emptyList()



    val taskbarIconPadding: Int =

        if (TaskbarIconSpecs.iconSize52dp.size > taskbarIconSize.size) {

        if (

            TaskbarIconSpecs.transientOrPinnedTaskbarIconPaddingSize.size > taskbarIconSize.size &&

                !taskbarFeatureEvaluator.hasNavButtons

        ) {

            (TaskbarIconSpecs.iconSize52dp.size - taskbarIconSize.size) / 2

        } else {

            0