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

Commit 207bbca9 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7960322 from 87f010f3 to sc-v2-release 

Change-Id: I3752df99f203fe9d730bf843a9e7aacf90ec12fa
parents c4846c7b 87f010f3

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

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ public class FallbackTaskbarUIController extends TaskbarUIController { 


    @Override

    protected void onDestroy() {

        super.onDestroy();

        mRecentsActivity.setTaskbarUIController(null);

        mRecentsActivity.getStateManager().removeStateListener(mStateListener);

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController { 


    @Override

    protected void onDestroy() {

        super.onDestroy();

        onLauncherResumedOrPaused(false);

        mTaskbarLauncherStateController.onDestroy();

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

+7 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_I 
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED;

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

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

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



import android.animation.ArgbEvaluator;

import android.animation.ObjectAnimator;
@@ -86,6 +87,7 @@ public class NavbarButtonsViewController { 
    private static final int FLAG_DISABLE_RECENTS = 1 << 8;

    private static final int FLAG_DISABLE_BACK = 1 << 9;

    private static final int FLAG_NOTIFICATION_SHADE_EXPANDED = 1 << 10;

    private static final int FLAG_SCREEN_PINNING_ACTIVE = 1 << 10;



    private static final int MASK_IME_SWITCHER_VISIBLE = FLAG_SWITCHER_SUPPORTED | FLAG_IME_VISIBLE;
@@ -152,7 +154,9 @@ public class NavbarButtonsViewController { 
        mPropertyHolders.add(new StatePropertyHolder(

                mControllers.taskbarViewController.getTaskbarIconAlpha()

                        .getProperty(ALPHA_INDEX_KEYGUARD),

                flags -> (flags & FLAG_KEYGUARD_VISIBLE) == 0, MultiValueAlpha.VALUE, 1, 0));

                flags -> (flags & FLAG_KEYGUARD_VISIBLE) == 0

                        && (flags & FLAG_SCREEN_PINNING_ACTIVE) == 0,

                MultiValueAlpha.VALUE, 1, 0));



        mPropertyHolders.add(new StatePropertyHolder(mControllers.taskbarDragLayerController

                .getKeyguardBgTaskbar(),
@@ -286,6 +290,7 @@ public class NavbarButtonsViewController { 
        int shadeExpandedFlags = SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED

                | SYSUI_STATE_QUICK_SETTINGS_EXPANDED;

        boolean isNotificationShadeExpanded = (sysUiStateFlags & shadeExpandedFlags) != 0;

        boolean isScreenPinningActive = (sysUiStateFlags & SYSUI_STATE_SCREEN_PINNING) != 0;



        // TODO(b/202218289) we're getting IME as not visible on lockscreen from system

        updateStateForFlag(FLAG_IME_VISIBLE, isImeVisible);
@@ -295,6 +300,7 @@ public class NavbarButtonsViewController { 
        updateStateForFlag(FLAG_DISABLE_RECENTS, isRecentsDisabled);

        updateStateForFlag(FLAG_DISABLE_BACK, isBackDisabled);

        updateStateForFlag(FLAG_NOTIFICATION_SHADE_EXPANDED, isNotificationShadeExpanded);

        updateStateForFlag(FLAG_SCREEN_PINNING_ACTIVE, isScreenPinningActive);



        if (mA11yButton != null) {

            // Only used in 3 button

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

+1 −0
Original line number Diff line number Diff line
@@ -361,6 +361,7 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ 
        mControllers.taskbarStashController.updateStateForSysuiFlags(systemUiStateFlags, fromInit);

        mControllers.taskbarScrimViewController.updateStateForSysuiFlags(systemUiStateFlags,

                fromInit);

        mControllers.navButtonController.updateSysuiFlags(systemUiStateFlags);

    }



    /**

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

+3 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ import android.content.pm.ActivityInfo; 
import android.content.res.Configuration;

import android.hardware.display.DisplayManager;

import android.net.Uri;

import android.os.Handler;

import android.provider.Settings;

import android.util.Log;

import android.view.Display;



import androidx.annotation.NonNull;
@@ -93,7 +93,8 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen 
        Display display =

                service.getSystemService(DisplayManager.class).getDisplay(DEFAULT_DISPLAY);

        mContext = service.createWindowContext(display, TYPE_NAVIGATION_BAR_PANEL, null);

        mNavButtonController = new TaskbarNavButtonController(service);

        mNavButtonController = new TaskbarNavButtonController(service,

                SystemUiProxy.INSTANCE.get(mContext), new Handler());

        mUserSetupCompleteListener = isUserSetupComplete -> recreateTaskbar();

        mComponentCallbacks = new ComponentCallbacks() {

            private Configuration mOldConfig = mContext.getResources().getConfiguration();