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

Commit baf03074 authored by mpodolian's avatar mpodolian
Browse files

Added scrim visibility check. 

Scrim view was not shown because the TaskbarScrimViewController did not
check taskbar visibility on initialization. Added the check to fix the
issue.

Fixes: 353583417
Flag: com.android.wm.shell.enable_bubble_bar
Test: manual
Switch task bar to transient mode on overview screen or inside an
application. Expand bubble bar.

Change-Id: Ia8a05802a779a4bac70906e7e52ac6650308c85c
parent 300ca342

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

+2 −1
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ import static android.view.View.VISIBLE; 
import static com.android.launcher3.taskbar.bubbles.BubbleBarController.isBubbleBarEnabled;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_EXPANDED;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_MANAGE_MENU_EXPANDED;

import static com.android.wm.shell.common.bubbles.BubbleConstants.BUBBLE_EXPANDED_SCRIM_ALPHA;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE;

import static com.android.wm.shell.common.bubbles.BubbleConstants.BUBBLE_EXPANDED_SCRIM_ALPHA;



import android.animation.ObjectAnimator;

import android.view.animation.Interpolator;
@@ -65,6 +65,7 @@ public class TaskbarScrimViewController implements TaskbarControllers.LoggableTa 
     */

    public void init(TaskbarControllers controllers) {

        mControllers = controllers;

        onTaskbarVisibilityChanged(mControllers.taskbarViewController.getTaskbarVisibility());

    }



    /**

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

+7 −0
Original line number Diff line number Diff line
@@ -229,6 +229,13 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar 
        mActivity.removeOnDeviceProfileChangeListener(mDeviceProfileChangeListener);

    }



    /**

     * Gets the taskbar {@link View.Visibility visibility}.

     */

    public int getTaskbarVisibility() {

        return mTaskbarView.getVisibility();

    }



    public boolean areIconsVisible() {

        return mTaskbarView.areIconsVisible();

    }