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

Commit 33a7ce84 authored by Vinit Nayak's avatar Vinit Nayak
Browse files

Extract assistant logic from NavigationBar to share with Taskbar 

* Added logic into already existing class used
for A11y, renamed that to NavbarHelper
* Prevent destory() in TaskbarDelegate from being called
without init() call first

Bug: 204273914
Test: Assistant is invokable on launcher unfolded
in gesture nav

Change-Id: Ic3232f375c68fd444c7378bc8ddd5a9b6991bd69
parent 9a8937e9

packages/SystemUI/src/com/android/systemui/navigationbar/NavBarHelper.java

0 → 100644
+246 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.navigationbar;



import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;



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

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



import android.content.ContentResolver;

import android.content.Context;

import android.database.ContentObserver;

import android.net.Uri;

import android.os.Bundle;

import android.os.Handler;

import android.os.Looper;

import android.os.UserHandle;

import android.provider.Settings;

import android.view.accessibility.AccessibilityManager;



import androidx.annotation.NonNull;



import com.android.systemui.Dumpable;

import com.android.systemui.accessibility.AccessibilityButtonModeObserver;

import com.android.systemui.assist.AssistManager;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.recents.OverviewProxyService;

import com.android.systemui.settings.UserTracker;

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

import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.List;



import javax.inject.Inject;



import dagger.Lazy;



/**

 * Extracts shared elements between navbar and taskbar delegate to de-dupe logic and help them

 * experience the joys of friendship.

 * The events are then passed through

 *

 * Currently consolidates

 * * A11y

 * * Assistant

 */

@SysUISingleton

public final class NavBarHelper implements

        AccessibilityButtonModeObserver.ModeChangedListener,

        OverviewProxyService.OverviewProxyListener, NavigationModeController.ModeChangedListener,

        Dumpable {

    private final AccessibilityManager mAccessibilityManager;

    private final Lazy<AssistManager> mAssistManagerLazy;

    private final UserTracker mUserTracker;

    private final AccessibilityButtonModeObserver mAccessibilityButtonModeObserver;

    private final List<NavbarTaskbarStateUpdater> mA11yEventListeners = new ArrayList<>();

    private Context mContext;

    private ContentResolver mContentResolver;

    private boolean mAssistantAvailable;

    private boolean mLongPressHomeEnabled;

    private boolean mAssistantTouchGestureEnabled;

    private int mNavBarMode;



    private final ContentObserver mAssistContentObserver = new ContentObserver(

            new Handler(Looper.getMainLooper())) {

        @Override

        public void onChange(boolean selfChange, Uri uri) {

            updateAssitantAvailability();

        }

    };



    @Inject

    public NavBarHelper(AccessibilityManager accessibilityManager,

            AccessibilityManagerWrapper accessibilityManagerWrapper,

            AccessibilityButtonModeObserver accessibilityButtonModeObserver,

            OverviewProxyService overviewProxyService,

            Lazy<AssistManager> assistManagerLazy,

            NavigationModeController navigationModeController,

            UserTracker userTracker,

            DumpManager dumpManager) {

        mAccessibilityManager = accessibilityManager;

        mAssistManagerLazy = assistManagerLazy;

        mUserTracker = userTracker;

        accessibilityManagerWrapper.addCallback(

                accessibilityManager1 -> NavBarHelper.this.dispatchA11yEventUpdate());

        mAccessibilityButtonModeObserver = accessibilityButtonModeObserver;



        mAccessibilityButtonModeObserver.addListener(this);

        mNavBarMode = navigationModeController.addListener(this);

        overviewProxyService.addCallback(this);

        dumpManager.registerDumpable(this);

    }



    public void init(Context context) {

        mContext = context;

        mContentResolver = mContext.getContentResolver();

        mContentResolver.registerContentObserver(

                Settings.Secure.getUriFor(Settings.Secure.ASSISTANT),

                false /* notifyForDescendants */, mAssistContentObserver, UserHandle.USER_ALL);

        mContentResolver.registerContentObserver(

                Settings.Secure.getUriFor(Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED),

                false, mAssistContentObserver, UserHandle.USER_ALL);

        mContentResolver.registerContentObserver(

                Settings.Secure.getUriFor(Settings.Secure.ASSIST_TOUCH_GESTURE_ENABLED),

                false, mAssistContentObserver, UserHandle.USER_ALL);

        updateAssitantAvailability();

    }



    public void destroy() {

        mContentResolver.unregisterContentObserver(mAssistContentObserver);

    }



    /**

     * @param listener Will immediately get callbacks based on current state

     */

    public void registerNavTaskStateUpdater(NavbarTaskbarStateUpdater listener) {

        mA11yEventListeners.add(listener);

        listener.updateAccessibilityServicesState();

        listener.updateAssistantAvailable(mAssistantAvailable);

    }



    public void removeNavTaskStateUpdater(NavbarTaskbarStateUpdater listener) {

        mA11yEventListeners.remove(listener);

    }



    private void dispatchA11yEventUpdate() {

        for (NavbarTaskbarStateUpdater listener : mA11yEventListeners) {

            listener.updateAccessibilityServicesState();

        }

    }



    private void dispatchAssistantEventUpdate(boolean assistantAvailable) {

        for (NavbarTaskbarStateUpdater listener : mA11yEventListeners) {

            listener.updateAssistantAvailable(assistantAvailable);

        }

    }



    @Override

    public void onAccessibilityButtonModeChanged(int mode) {

        dispatchA11yEventUpdate();

    }



    /**

     * See {@link QuickStepContract#SYSUI_STATE_A11Y_BUTTON_CLICKABLE} and

     * {@link QuickStepContract#SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE}

     *

     * @return the a11y button clickable and long_clickable states, or 0 if there is no

     *         a11y button in the navbar

     */

    public int getA11yButtonState() {

        // AccessibilityManagerService resolves services for the current user since the local

        // AccessibilityManager is created from a Context with the INTERACT_ACROSS_USERS permission

        final List<String> a11yButtonTargets =

                mAccessibilityManager.getAccessibilityShortcutTargets(

                        AccessibilityManager.ACCESSIBILITY_BUTTON);

        final int requestingServices = a11yButtonTargets.size();



        // If accessibility button is floating menu mode, click and long click state should be

        // disabled.

        if (mAccessibilityButtonModeObserver.getCurrentAccessibilityButtonMode()

                == ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU) {

            return 0;

        }



        return (requestingServices >= 1 ? SYSUI_STATE_A11Y_BUTTON_CLICKABLE : 0)

                | (requestingServices >= 2 ? SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE : 0);

    }



    @Override

    public void onConnectionChanged(boolean isConnected) {

        if (isConnected) {

            updateAssitantAvailability();

        }

    }



    private void updateAssitantAvailability() {

        boolean assistantAvailableForUser = mAssistManagerLazy.get()

                .getAssistInfoForUser(UserHandle.USER_CURRENT) != null;

        boolean longPressDefault = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_assistLongPressHomeEnabledDefault);

        mLongPressHomeEnabled = Settings.Secure.getIntForUser(mContentResolver,

                Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED, longPressDefault ? 1 : 0,

                mUserTracker.getUserId()) != 0;

        boolean gestureDefault = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_assistTouchGestureEnabledDefault);

        mAssistantTouchGestureEnabled = Settings.Secure.getIntForUser(mContentResolver,

                Settings.Secure.ASSIST_TOUCH_GESTURE_ENABLED, gestureDefault ? 1 : 0,

                mUserTracker.getUserId()) != 0;



        mAssistantAvailable = assistantAvailableForUser

                && mAssistantTouchGestureEnabled

                && QuickStepContract.isGesturalMode(mNavBarMode);

        dispatchAssistantEventUpdate(mAssistantAvailable);

    }



    public boolean getLongPressHomeEnabled() {

        return mLongPressHomeEnabled;

    }



    @Override

    public void startAssistant(Bundle bundle) {

        mAssistManagerLazy.get().startAssist(bundle);

    }



    @Override

    public void onNavigationModeChanged(int mode) {

        mNavBarMode = mode;

        updateAssitantAvailability();

    }



    /**

     * Callbacks will get fired once immediately after registering via

     * {@link #registerNavTaskStateUpdater(NavbarTaskbarStateUpdater)}

     */

    public interface NavbarTaskbarStateUpdater {

        void updateAccessibilityServicesState();

        void updateAssistantAvailable(boolean available);

    }



    @Override

    public void dump(@NonNull FileDescriptor fd, @NonNull PrintWriter pw, @NonNull String[] args) {

        pw.println("NavbarTaskbarFriendster");

        pw.println("  longPressHomeEnabled=" + mLongPressHomeEnabled);

        pw.println("  mAssistantTouchGestureEnabled=" + mAssistantTouchGestureEnabled);

        pw.println("  mAssistantAvailable=" + mAssistantAvailable);

        pw.println("  mNavBarMode=" + mNavBarMode);

    }

}

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java

+40 −77
Original line number Diff line number Diff line
@@ -68,22 +68,18 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.content.res.Configuration;

import android.database.ContentObserver;

import android.graphics.Insets;

import android.graphics.PixelFormat;

import android.graphics.Rect;

import android.graphics.RectF;

import android.inputmethodservice.InputMethodService;

import android.net.Uri;

import android.os.Binder;

import android.os.Bundle;

import android.os.Handler;

import android.os.IBinder;

import android.os.Looper;

import android.os.RemoteException;

import android.os.UserHandle;

import android.provider.DeviceConfig;

import android.provider.Settings;

import android.telecom.TelecomManager;

import android.text.TextUtils;

import android.util.Log;
@@ -200,8 +196,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
    private final Handler mHandler;

    private final NavigationBarOverlayController mNavbarOverlayController;

    private final UiEventLogger mUiEventLogger;

    private final NavigationBarA11yHelper mNavigationBarA11yHelper;

    private final UserTracker mUserTracker;

    private final NavBarHelper mNavBarHelper;

    private final NotificationShadeDepthController mNotificationShadeDepthController;



    private Bundle mSavedState;
@@ -213,9 +208,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
    private int mNavigationIconHints = 0;

    private @TransitionMode int mNavigationBarMode;

    private ContentResolver mContentResolver;

    private boolean mAssistantAvailable;

    private boolean mLongPressHomeEnabled;

    private boolean mAssistantTouchGestureEnabled;



    private int mDisabledFlags1;

    private int mDisabledFlags2;
@@ -309,16 +302,31 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
        }

    };



    private final NavBarHelper.NavbarTaskbarStateUpdater mNavbarTaskbarStateUpdater =

            new NavBarHelper.NavbarTaskbarStateUpdater() {

                @Override

                public void updateAccessibilityServicesState() {

                    updateAcessibilityStateFlags();

                }



                @Override

                public void updateAssistantAvailable(boolean available) {

                    // TODO(b/198002034): Content observers currently can still be called back after

                    //  being unregistered, and in this case we can ignore the change if the nav bar

                    //  has been destroyed already

                    if (mNavigationBarView == null) {

                        return;

                    }

                    mLongPressHomeEnabled = mNavBarHelper.getLongPressHomeEnabled();

                    updateAssistantEntrypoints(available);

                }

            };



    private final OverviewProxyListener mOverviewProxyListener = new OverviewProxyListener() {

        @Override

        public void onConnectionChanged(boolean isConnected) {

            mNavigationBarView.updateStates();

            updateScreenPinningGestures();



            // Send the assistant availability upon connection

            if (isConnected) {

                updateAssistantEntrypoints();

            }

        }



        @Override
@@ -421,20 +429,6 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
        }

    };



    private final ContentObserver mAssistContentObserver = new ContentObserver(

            new Handler(Looper.getMainLooper())) {

        @Override

        public void onChange(boolean selfChange, Uri uri) {

            // TODO(b/198002034): Content observers currently can still be called back after being

            // unregistered, and in this case we can ignore the change if the nav bar has been

            // destroyed already

            if (mNavigationBarView == null) {

                return;

            }

            updateAssistantEntrypoints();

        }

    };



    private final DeviceConfig.OnPropertiesChangedListener mOnPropertiesChangedListener =

            new DeviceConfig.OnPropertiesChangedListener() {

                @Override
@@ -504,7 +498,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
            @Main Handler mainHandler,

            NavigationBarOverlayController navbarOverlayController,

            UiEventLogger uiEventLogger,

            NavigationBarA11yHelper navigationBarA11yHelper,

            NavBarHelper navBarHelper,

            UserTracker userTracker,

            LightBarController mainLightBarController,

            LightBarController.Factory lightBarControllerFactory,
@@ -535,8 +529,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
        mHandler = mainHandler;

        mNavbarOverlayController = navbarOverlayController;

        mUiEventLogger = uiEventLogger;

        mNavigationBarA11yHelper = navigationBarA11yHelper;

        mUserTracker = userTracker;

        mNavBarHelper = navBarHelper;

        mNotificationShadeDepthController = notificationShadeDepthController;

        mMainLightBarController = mainLightBarController;

        mLightBarControllerFactory = lightBarControllerFactory;
@@ -568,18 +561,9 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
        mIsOnDefaultDisplay = mDisplayId == DEFAULT_DISPLAY;



        mCommandQueue.addCallback(this);

        mAssistantAvailable = mAssistManagerLazy.get()

                .getAssistInfoForUser(UserHandle.USER_CURRENT) != null;

        mLongPressHomeEnabled = mNavBarHelper.getLongPressHomeEnabled();

        mContentResolver = mContext.getContentResolver();

        mContentResolver.registerContentObserver(

                Settings.Secure.getUriFor(Settings.Secure.ASSISTANT),

                false /* notifyForDescendants */, mAssistContentObserver, UserHandle.USER_ALL);

        mContentResolver.registerContentObserver(

                Settings.Secure.getUriFor(Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED),

                false, mAssistContentObserver, UserHandle.USER_ALL);

        mContentResolver.registerContentObserver(

                Settings.Secure.getUriFor(Settings.Secure.ASSIST_TOUCH_GESTURE_ENABLED),

                false, mAssistContentObserver, UserHandle.USER_ALL);

        mNavBarHelper.init(mContext);

        mAllowForceNavBarHandleOpaque = mContext.getResources().getBoolean(

                R.bool.allow_force_nav_bar_handle_opaque);

        mForceNavBarHandleOpaque = DeviceConfig.getBoolean(
@@ -593,7 +577,6 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
        )).filter(duration -> duration != 0);

        DeviceConfig.addOnPropertiesChangedListener(

                DeviceConfig.NAMESPACE_SYSTEMUI, mHandler::post, mOnPropertiesChangedListener);

        updateAssistantEntrypoints();



        if (savedState != null) {

            mDisabledFlags1 = savedState.getInt(EXTRA_DISABLE_STATE, 0);
@@ -620,8 +603,8 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
        mWindowManager.removeViewImmediate(mNavigationBarView.getRootView());

        mNavigationModeController.removeListener(this);



        mNavigationBarA11yHelper.removeA11yEventListener(mAccessibilityListener);

        mContentResolver.unregisterContentObserver(mAssistContentObserver);

        mNavBarHelper.removeNavTaskStateUpdater(mNavbarTaskbarStateUpdater);

        mNavBarHelper.destroy();

        mDeviceProvisionedController.removeCallback(mUserSetupListener);

        mNotificationShadeDepthController.removeListener(mDepthListener);
@@ -643,7 +626,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
        mNavigationBarView.setWindowVisible(isNavBarWindowVisible());

        mNavigationBarView.setBehavior(mBehavior);



        mNavigationBarA11yHelper.registerA11yEventListener(mAccessibilityListener);

        mNavBarHelper.registerNavTaskStateUpdater(mNavbarTaskbarStateUpdater);



        mSplitScreenOptional.ifPresent(mNavigationBarView::registerDockedListener);

        mPipOptional.ifPresent(mNavigationBarView::registerPipExclusionBoundsChangeListener);
@@ -716,7 +699,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
        mHandler.removeCallbacks(mAutoDim);

        mHandler.removeCallbacks(mOnVariableDurationHomeLongClick);

        mHandler.removeCallbacks(mEnableLayoutTransitions);

        mNavigationBarA11yHelper.removeA11yEventListener(mAccessibilityListener);

        mNavBarHelper.removeNavTaskStateUpdater(mNavbarTaskbarStateUpdater);

        mFrame = null;

        mNavigationBarView = null;

        mOrientationHandle = null;
@@ -885,7 +868,6 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
        pw.println("  mCurrentRotation=" + mCurrentRotation);

        pw.println("  mHomeButtonLongPressDurationMs=" + mHomeButtonLongPressDurationMs);

        pw.println("  mLongPressHomeEnabled=" + mLongPressHomeEnabled);

        pw.println("  mAssistantTouchGestureEnabled=" + mAssistantTouchGestureEnabled);

        pw.println("  mNavigationBarWindowState="

                + windowStateToString(mNavigationBarWindowState));

        pw.println("  mNavigationBarMode="
@@ -1165,7 +1147,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
        ButtonDispatcher accessibilityButton = mNavigationBarView.getAccessibilityButton();

        accessibilityButton.setOnClickListener(this::onAccessibilityClick);

        accessibilityButton.setOnLongClickListener(this::onAccessibilityLongClick);

        updateAccessibilityServicesState();

        updateAcessibilityStateFlags();



        ButtonDispatcher imeSwitcherButton = mNavigationBarView.getImeSwitchButton();

        imeSwitcherButton.setOnClickListener(this::onImeSwitcherClick);
@@ -1390,8 +1372,8 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
        return true;

    }



    void updateAccessibilityServicesState() {

        int a11yFlags = mNavigationBarA11yHelper.getA11yButtonState();

    void updateAcessibilityStateFlags() {

        int a11yFlags = mNavBarHelper.getA11yButtonState();



        if (mNavigationBarView != null) {

            boolean clickable = (a11yFlags & SYSUI_STATE_A11Y_BUTTON_CLICKABLE) != 0;
@@ -1403,7 +1385,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 


    public void updateSystemUiStateFlags(int a11yFlags) {

        if (a11yFlags < 0) {

            a11yFlags = mNavigationBarA11yHelper.getA11yButtonState();

            a11yFlags = mNavBarHelper.getA11yButtonState();

        }

        boolean clickable = (a11yFlags & SYSUI_STATE_A11Y_BUTTON_CLICKABLE) != 0;

        boolean longClickable = (a11yFlags & SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE) != 0;
@@ -1430,24 +1412,10 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
        }

    }



    private void updateAssistantEntrypoints() {

        mAssistantAvailable = mAssistManagerLazy.get()

                .getAssistInfoForUser(UserHandle.USER_CURRENT) != null;

        boolean longPressDefault = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_assistLongPressHomeEnabledDefault);

        mLongPressHomeEnabled = Settings.Secure.getIntForUser(mContentResolver,

                Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED, longPressDefault ? 1 : 0,

                mUserTracker.getUserId()) != 0;

        boolean gestureDefault = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_assistTouchGestureEnabledDefault);

        mAssistantTouchGestureEnabled = Settings.Secure.getIntForUser(mContentResolver,

                Settings.Secure.ASSIST_TOUCH_GESTURE_ENABLED, gestureDefault ? 1 : 0,

                mUserTracker.getUserId()) != 0;

    private void updateAssistantEntrypoints(boolean assistantAvailable) {

        if (mOverviewProxyService.getProxy() != null) {

            try {

                mOverviewProxyService.getProxy().onAssistantAvailable(mAssistantAvailable

                        && mAssistantTouchGestureEnabled

                        && QuickStepContract.isGesturalMode(mNavBarMode));

                mOverviewProxyService.getProxy().onAssistantAvailable(assistantAvailable);

            } catch (RemoteException e) {

                Log.w(TAG, "Unable to send assistant availability data to launcher");

            }
@@ -1518,8 +1486,6 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
    @Override

    public void onNavigationModeChanged(int mode) {

        mNavBarMode = mode;

        // update assistant entry points on system navigation radio button click

        updateAssistantEntrypoints();



        if (!QuickStepContract.isGesturalMode(mode)) {

            // Reset the override alpha
@@ -1558,9 +1524,6 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
        mNavigationBarView.getBarTransitions().finishAnimations();

    }



    private final NavigationBarA11yHelper.NavA11yEventListener mAccessibilityListener =

            this::updateAccessibilityServicesState;



    private WindowManager.LayoutParams getBarLayoutParams(int rotation) {

        WindowManager.LayoutParams lp = getBarLayoutParamsForRotation(rotation);

        lp.paramsForRotation = new WindowManager.LayoutParams[4];
@@ -1668,7 +1631,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
            }

            if (Intent.ACTION_USER_SWITCHED.equals(action)) {

                // The accessibility settings may be different for the new user

                updateAccessibilityServicesState();

                updateAcessibilityStateFlags();

            }

        }

    };
@@ -1704,7 +1667,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
        private final Handler mMainHandler;

        private final NavigationBarOverlayController mNavbarOverlayController;

        private final UiEventLogger mUiEventLogger;

        private final NavigationBarA11yHelper mNavigationBarA11yHelper;

        private final NavBarHelper mNavBarHelper;

        private final UserTracker mUserTracker;

        private final LightBarController mMainLightBarController;

        private final LightBarController.Factory mLightBarControllerFactory;
@@ -1737,7 +1700,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
                @Main Handler mainHandler,

                NavigationBarOverlayController navbarOverlayController,

                UiEventLogger uiEventLogger,

                NavigationBarA11yHelper navigationBarA11yHelper,

                NavBarHelper navBarHelper,

                UserTracker userTracker,

                LightBarController mainLightBarController,

                LightBarController.Factory lightBarControllerFactory,
@@ -1767,7 +1730,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
            mMainHandler = mainHandler;

            mNavbarOverlayController = navbarOverlayController;

            mUiEventLogger = uiEventLogger;

            mNavigationBarA11yHelper = navigationBarA11yHelper;

            mNavBarHelper = navBarHelper;

            mUserTracker = userTracker;

            mMainLightBarController = mainLightBarController;

            mLightBarControllerFactory = lightBarControllerFactory;
@@ -1788,7 +1751,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
                    mSplitScreenOptional, mRecentsOptional, mStatusBarOptionalLazy,

                    mShadeController, mNotificationRemoteInputManager,

                    mNotificationShadeDepthController, mSystemActions, mMainHandler,

                    mNavbarOverlayController, mUiEventLogger, mNavigationBarA11yHelper,

                    mNavbarOverlayController, mUiEventLogger, mNavBarHelper,

                    mUserTracker, mMainLightBarController, mLightBarControllerFactory,

                    mMainAutoHideController, mAutoHideControllerFactory, mTelecomManagerOptional,

                    mInputMethodManager);

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarA11yHelper.java

deleted100644 → 0
+0 −90

File deleted.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java

+2 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ public class NavigationBarController implements 
            CommandQueue commandQueue,

            @Main Handler mainHandler,

            ConfigurationController configurationController,

            NavigationBarA11yHelper navigationBarA11yHelper,

            NavBarHelper navBarHelper,

            TaskbarDelegate taskbarDelegate,

            NavigationBar.Factory navigationBarFactory,

            DumpManager dumpManager,
@@ -115,7 +115,7 @@ public class NavigationBarController implements 
        mNavMode = navigationModeController.addListener(this);

        mTaskbarDelegate = taskbarDelegate;

        mTaskbarDelegate.setDependencies(commandQueue, overviewProxyService,

                navigationBarA11yHelper, navigationModeController, sysUiFlagsContainer,

                navBarHelper, navigationModeController, sysUiFlagsContainer,

                dumpManager, autoHideController);

        mIsTablet = isTablet(mContext);

        dumpManager.registerDumpable(this);

packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java

+44 −9

File changed.

Preview size limit exceeded, changes collapsed.