Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Convert NavigationBar to subclass ViewController." into tm-dev

Browse Source
This commit is contained in:
Dave Mankoff
2022-03-22 15:13:30 +00:00
committed by Android (Google) Code Review
parent c77ec18a2d 29e48d1fc2
commit ffa408408e
8 changed files with 359 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java
View File

@@ -43,6 +43,7 @@ import com.android.systemui.fragments.FragmentService;
import com.android.systemui.log.dagger.LogModule; import com.android.systemui.log.dagger.LogModule;
import com.android.systemui.lowlightclock.LowLightClockController; import com.android.systemui.lowlightclock.LowLightClockController;
import com.android.systemui.model.SysUiState; import com.android.systemui.model.SysUiState;
import com.android.systemui.navigationbar.NavigationBarComponent;
import com.android.systemui.plugins.BcSmartspaceDataPlugin; import com.android.systemui.plugins.BcSmartspaceDataPlugin;
import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.plugins.statusbar.StatusBarStateController;
import com.android.systemui.recents.Recents; import com.android.systemui.recents.Recents;
@@ -132,6 +133,7 @@ import dagger.Provides;
}, },
subcomponents = { subcomponents = {
CentralSurfacesComponent.class, CentralSurfacesComponent.class,
NavigationBarComponent.class,
NotificationRowComponent.class, NotificationRowComponent.class,
DozeComponent.class, DozeComponent.class,
ExpandableNotificationRowComponent.class, ExpandableNotificationRowComponent.class,

289
packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
View File

@@ -86,7 +86,6 @@ import android.view.HapticFeedbackConstants;
import android.view.InsetsState.InternalInsetsType; import android.view.InsetsState.InternalInsetsType;
import android.view.InsetsVisibilities; import android.view.InsetsVisibilities;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.Surface; import android.view.Surface;
import android.view.View; import android.view.View;
@@ -98,6 +97,7 @@ import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityManager;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import com.android.internal.accessibility.dialog.AccessibilityButtonChooserActivity; import com.android.internal.accessibility.dialog.AccessibilityButtonChooserActivity;
@@ -111,8 +111,10 @@ import com.android.systemui.Gefingerpoken;
import com.android.systemui.R; import com.android.systemui.R;
import com.android.systemui.assist.AssistManager; import com.android.systemui.assist.AssistManager;
import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.broadcast.BroadcastDispatcher;
import com.android.systemui.dagger.qualifiers.DisplayId;
import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dagger.qualifiers.Main;
import com.android.systemui.model.SysUiState; import com.android.systemui.model.SysUiState;
import com.android.systemui.navigationbar.NavigationBarComponent.NavigationBarScope;
import com.android.systemui.navigationbar.NavigationModeController.ModeChangedListener; import com.android.systemui.navigationbar.NavigationModeController.ModeChangedListener;
import com.android.systemui.navigationbar.buttons.ButtonDispatcher; import com.android.systemui.navigationbar.buttons.ButtonDispatcher;
import com.android.systemui.navigationbar.buttons.DeadZone; import com.android.systemui.navigationbar.buttons.DeadZone;
@@ -140,7 +142,10 @@ import com.android.systemui.statusbar.phone.BarTransitions;
import com.android.systemui.statusbar.phone.CentralSurfaces; import com.android.systemui.statusbar.phone.CentralSurfaces;
import com.android.systemui.statusbar.phone.LightBarController; import com.android.systemui.statusbar.phone.LightBarController;
import com.android.systemui.statusbar.phone.ShadeController; import com.android.systemui.statusbar.phone.ShadeController;
import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.statusbar.policy.DeviceProvisionedController;
import com.android.systemui.util.DeviceConfigProxy;
import com.android.systemui.util.ViewController;
import com.android.wm.shell.back.BackAnimation; import com.android.wm.shell.back.BackAnimation;
import com.android.wm.shell.pip.Pip; import com.android.wm.shell.pip.Pip;
@@ -149,15 +154,15 @@ import java.util.Locale;
import java.util.Optional; import java.util.Optional;
import java.util.function.Consumer; import java.util.function.Consumer;
import javax.inject.Inject;
import dagger.Lazy; import dagger.Lazy;
import dagger.assisted.Assisted;
import dagger.assisted.AssistedFactory;
import dagger.assisted.AssistedInject;
/** /**
* Contains logic for a navigation bar view. * Contains logic for a navigation bar view.
*/ */
public class NavigationBar implements View.OnAttachStateChangeListener, Callbacks { @NavigationBarScope
public class NavigationBar extends ViewController<NavigationBarView> implements Callbacks {
public static final String TAG = "NavigationBar"; public static final String TAG = "NavigationBar";
private static final boolean DEBUG = false; private static final boolean DEBUG = false;
@@ -172,12 +177,14 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
private static final long AUTODIM_TIMEOUT_MS = 2250; private static final long AUTODIM_TIMEOUT_MS = 2250;
private final Context mContext; private final Context mContext;
private final Bundle mSavedState;
private final WindowManager mWindowManager; private final WindowManager mWindowManager;
private final AccessibilityManager mAccessibilityManager; private final AccessibilityManager mAccessibilityManager;
private final DeviceProvisionedController mDeviceProvisionedController; private final DeviceProvisionedController mDeviceProvisionedController;
private final StatusBarStateController mStatusBarStateController; private final StatusBarStateController mStatusBarStateController;
private final MetricsLogger mMetricsLogger; private final MetricsLogger mMetricsLogger;
private final Lazy<AssistManager> mAssistManagerLazy; private final Lazy<AssistManager> mAssistManagerLazy;
private final StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;
private final SysUiState mSysUiFlagsContainer; private final SysUiState mSysUiFlagsContainer;
private final Lazy<Optional<CentralSurfaces>> mCentralSurfacesOptionalLazy; private final Lazy<Optional<CentralSurfaces>> mCentralSurfacesOptionalLazy;
private final ShadeController mShadeController; private final ShadeController mShadeController;
@@ -188,15 +195,13 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
private final CommandQueue mCommandQueue; private final CommandQueue mCommandQueue;
private final Optional<Pip> mPipOptional; private final Optional<Pip> mPipOptional;
private final Optional<Recents> mRecentsOptional; private final Optional<Recents> mRecentsOptional;
private final DeviceConfigProxy mDeviceConfigProxy;
private final Optional<BackAnimation> mBackAnimation; private final Optional<BackAnimation> mBackAnimation;
private final Handler mHandler; private final Handler mHandler;
private final NavigationBarOverlayController mNavbarOverlayController; private final NavigationBarOverlayController mNavbarOverlayController;
private final UiEventLogger mUiEventLogger; private final UiEventLogger mUiEventLogger;
private final NavBarHelper mNavBarHelper; private final NavBarHelper mNavBarHelper;
private final NotificationShadeDepthController mNotificationShadeDepthController; private final NotificationShadeDepthController mNotificationShadeDepthController;
private Bundle mSavedState;
private NavigationBarView mNavigationBarView;
private NavigationBarFrame mFrame; private NavigationBarFrame mFrame;
private @WindowVisibleState int mNavigationBarWindowState = WINDOW_STATE_SHOWING; private @WindowVisibleState int mNavigationBarWindowState = WINDOW_STATE_SHOWING;
@@ -256,7 +261,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
private int mCurrentRotation; private int mCurrentRotation;
private ViewTreeObserver.OnGlobalLayoutListener mOrientationHandleGlobalLayoutListener; private ViewTreeObserver.OnGlobalLayoutListener mOrientationHandleGlobalLayoutListener;
private boolean mShowOrientedHandleForImmersiveMode; private boolean mShowOrientedHandleForImmersiveMode;
private DeadZone mDeadZone; private final DeadZone mDeadZone;
private boolean mImeVisible; private boolean mImeVisible;
@com.android.internal.annotations.VisibleForTesting @com.android.internal.annotations.VisibleForTesting
@@ -311,7 +316,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
// TODO(b/198002034): Content observers currently can still be called back after // 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 // being unregistered, and in this case we can ignore the change if the nav bar
// has been destroyed already // has been destroyed already
if (mNavigationBarView == null) { if (mView == null) {
return; return;
} }
mLongPressHomeEnabled = mNavBarHelper.getLongPressHomeEnabled(); mLongPressHomeEnabled = mNavBarHelper.getLongPressHomeEnabled();
@@ -322,14 +327,14 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
private final OverviewProxyListener mOverviewProxyListener = new OverviewProxyListener() { private final OverviewProxyListener mOverviewProxyListener = new OverviewProxyListener() {
@Override @Override
public void onConnectionChanged(boolean isConnected) { public void onConnectionChanged(boolean isConnected) {
mNavigationBarView.updateStates(); mView.updateStates();
updateScreenPinningGestures(); updateScreenPinningGestures();
} }
@Override @Override
public void onQuickStepStarted() { public void onQuickStepStarted() {
// Use navbar dragging as a signal to hide the rotate button // Use navbar dragging as a signal to hide the rotate button
mNavigationBarView.getRotationButtonController().setRotateSuggestionButtonState(false); mView.getRotationButtonController().setRotateSuggestionButtonState(false);
// Hide the notifications panel when quick step starts // Hide the notifications panel when quick step starts
mShadeController.collapsePanel(true /* animate */); mShadeController.collapsePanel(true /* animate */);
@@ -366,12 +371,12 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
// Disallow home handle animations when in gestural // Disallow home handle animations when in gestural
animate = false; animate = false;
forceVisible = mAllowForceNavBarHandleOpaque && mForceNavBarHandleOpaque; forceVisible = mAllowForceNavBarHandleOpaque && mForceNavBarHandleOpaque;
buttonDispatcher = mNavigationBarView.getHomeHandle(); buttonDispatcher = mView.getHomeHandle();
if (getBarTransitions() != null) { if (getBarTransitions() != null) {
getBarTransitions().setBackgroundOverrideAlpha(alpha); getBarTransitions().setBackgroundOverrideAlpha(alpha);
} }
} else if (QuickStepContract.isSwipeUpMode(mNavBarMode)) { } else if (QuickStepContract.isSwipeUpMode(mNavBarMode)) {
buttonDispatcher = mNavigationBarView.getBackButton(); buttonDispatcher = mView.getBackButton();
} }
if (buttonDispatcher != null) { if (buttonDispatcher != null) {
buttonDispatcher.setVisibility( buttonDispatcher.setVisibility(
@@ -382,7 +387,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
@Override @Override
public void onHomeRotationEnabled(boolean enabled) { public void onHomeRotationEnabled(boolean enabled) {
mNavigationBarView.getRotationButtonController().setHomeRotationEnabled(enabled); mView.getRotationButtonController().setHomeRotationEnabled(enabled);
} }
@Override @Override
@@ -390,20 +395,18 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
// If the overview has fixed orientation that may change display to natural rotation, // If the overview has fixed orientation that may change display to natural rotation,
// we don't want the user rotation to be reset. So after user returns to application, // we don't want the user rotation to be reset. So after user returns to application,
// it can keep in the original rotation. // it can keep in the original rotation.
mNavigationBarView.getRotationButtonController().setSkipOverrideUserLockPrefsOnce(); mView.getRotationButtonController().setSkipOverrideUserLockPrefsOnce();
} }
@Override @Override
public void onTaskbarStatusUpdated(boolean visible, boolean stashed) { public void onTaskbarStatusUpdated(boolean visible, boolean stashed) {
mNavigationBarView mView.getFloatingRotationButton().onTaskbarStateChanged(visible, stashed);
.getFloatingRotationButton()
.onTaskbarStateChanged(visible, stashed);
} }
@Override @Override
public void onToggleRecentApps() { public void onToggleRecentApps() {
// The same case as onOverviewShown but only for 3-button navigation. // The same case as onOverviewShown but only for 3-button navigation.
mNavigationBarView.getRotationButtonController().setSkipOverrideUserLockPrefsOnce(); mView.getRotationButtonController().setSkipOverrideUserLockPrefsOnce();
} }
}; };
@@ -416,11 +419,10 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
}; };
private final Runnable mAutoDim = () -> getBarTransitions().setAutoDim(true); private final Runnable mAutoDim = () -> getBarTransitions().setAutoDim(true);
private final Runnable mEnableLayoutTransitions = () -> private final Runnable mEnableLayoutTransitions = () -> mView.setLayoutTransitionsEnabled(true);
mNavigationBarView.setLayoutTransitionsEnabled(true);
private final Runnable mOnVariableDurationHomeLongClick = () -> { private final Runnable mOnVariableDurationHomeLongClick = () -> {
if (onHomeLongClick(mNavigationBarView.getHomeButton().getCurrentView())) { if (onHomeLongClick(mView.getHomeButton().getCurrentView())) {
mNavigationBarView.getHomeButton().getCurrentView().performHapticFeedback( mView.getHomeButton().getCurrentView().performHapticFeedback(
HapticFeedbackConstants.LONG_PRESS, HapticFeedbackConstants.LONG_PRESS,
HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING); HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING);
} }
@@ -439,7 +441,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
mHomeButtonLongPressDurationMs = Optional.of( mHomeButtonLongPressDurationMs = Optional.of(
properties.getLong(HOME_BUTTON_LONG_PRESS_DURATION_MS, 0) properties.getLong(HOME_BUTTON_LONG_PRESS_DURATION_MS, 0)
).filter(duration -> duration != 0); ).filter(duration -> duration != 0);
if (mNavigationBarView != null) { if (mView != null) {
reconfigureHomeLongClick(); reconfigureHomeLongClick();
} }
} }
@@ -469,14 +471,17 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
return; return;
} }
mHasBlurs = hasBlurs; mHasBlurs = hasBlurs;
mNavigationBarView.setWindowHasBlurs(hasBlurs); mView.setWindowHasBlurs(hasBlurs);
} }
}; };
@AssistedInject @Inject
NavigationBar( NavigationBar(
@Assisted Context context, NavigationBarView navigationBarView,
@Assisted WindowManager windowManager, NavigationBarFrame navigationBarFrame,
@Nullable Bundle savedState,
@DisplayId Context context,
@DisplayId WindowManager windowManager,
Lazy<AssistManager> assistManagerLazy, Lazy<AssistManager> assistManagerLazy,
AccessibilityManager accessibilityManager, AccessibilityManager accessibilityManager,
DeviceProvisionedController deviceProvisionedController, DeviceProvisionedController deviceProvisionedController,
@@ -484,6 +489,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
OverviewProxyService overviewProxyService, OverviewProxyService overviewProxyService,
NavigationModeController navigationModeController, NavigationModeController navigationModeController,
StatusBarStateController statusBarStateController, StatusBarStateController statusBarStateController,
StatusBarKeyguardViewManager statusBarKeyguardViewManager,
SysUiState sysUiFlagsContainer, SysUiState sysUiFlagsContainer,
BroadcastDispatcher broadcastDispatcher, BroadcastDispatcher broadcastDispatcher,
CommandQueue commandQueue, CommandQueue commandQueue,
@@ -503,14 +509,20 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
AutoHideController.Factory autoHideControllerFactory, AutoHideController.Factory autoHideControllerFactory,
Optional<TelecomManager> telecomManagerOptional, Optional<TelecomManager> telecomManagerOptional,
InputMethodManager inputMethodManager, InputMethodManager inputMethodManager,
DeadZone deadZone,
DeviceConfigProxy deviceConfigProxy,
Optional<BackAnimation> backAnimation) { Optional<BackAnimation> backAnimation) {
super(navigationBarView);
mFrame = navigationBarFrame;
mContext = context; mContext = context;
mSavedState = savedState;
mWindowManager = windowManager; mWindowManager = windowManager;
mAccessibilityManager = accessibilityManager; mAccessibilityManager = accessibilityManager;
mDeviceProvisionedController = deviceProvisionedController; mDeviceProvisionedController = deviceProvisionedController;
mStatusBarStateController = statusBarStateController; mStatusBarStateController = statusBarStateController;
mMetricsLogger = metricsLogger; mMetricsLogger = metricsLogger;
mAssistManagerLazy = assistManagerLazy; mAssistManagerLazy = assistManagerLazy;
mStatusBarKeyguardViewManager = statusBarKeyguardViewManager;
mSysUiFlagsContainer = sysUiFlagsContainer; mSysUiFlagsContainer = sysUiFlagsContainer;
mCentralSurfacesOptionalLazy = centralSurfacesOptionalLazy; mCentralSurfacesOptionalLazy = centralSurfacesOptionalLazy;
mShadeController = shadeController; mShadeController = shadeController;
@@ -521,6 +533,8 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
mCommandQueue = commandQueue; mCommandQueue = commandQueue;
mPipOptional = pipOptional; mPipOptional = pipOptional;
mRecentsOptional = recentsOptional; mRecentsOptional = recentsOptional;
mDeadZone = deadZone;
mDeviceConfigProxy = deviceConfigProxy;
mBackAnimation = backAnimation; mBackAnimation = backAnimation;
mHandler = mainHandler; mHandler = mainHandler;
mNavbarOverlayController = navbarOverlayController; mNavbarOverlayController = navbarOverlayController;
@@ -538,25 +552,23 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
} }
public NavigationBarView getView() { public NavigationBarView getView() {
return mNavigationBarView; return mView;
} }
public View createView(Bundle savedState, boolean initialVisibility) { @Override
mFrame = (NavigationBarFrame) LayoutInflater.from(mContext).inflate( public void onInit() {
R.layout.navigation_bar_window, null); // TODO: A great deal of this code should probalby live in onViewAttached.
View barView = LayoutInflater.from(mFrame.getContext()).inflate( // It should also has corresponding cleanup in onViewDetached.
R.layout.navigation_bar, mFrame); mView.setTouchHandler(mTouchHandler);
barView.addOnAttachStateChangeListener(this); mView.setNavBarMode(mNavBarMode);
mNavigationBarView = barView.findViewById(R.id.navigation_bar_view);
mDeadZone = new DeadZone(mNavigationBarView);
mNavigationBarView.setTouchHandler(mTouchHandler);
mNavigationBarView.setNavBarMode(mNavBarMode);
mNavigationBarView.updateRotationButton(); mView.updateRotationButton();
mNavigationBarView.setVisibility(initialVisibility ? View.VISIBLE : View.INVISIBLE); mView.setVisibility(
mStatusBarKeyguardViewManager.isNavBarVisible() ? View.VISIBLE : View.INVISIBLE);
if (DEBUG) Log.v(TAG, "addNavigationBar: about to add " + mView);
if (DEBUG) Log.v(TAG, "addNavigationBar: about to add " + barView);
mWindowManager.addView(mFrame, mWindowManager.addView(mFrame,
getBarLayoutParams(mContext.getResources().getConfiguration().windowConfiguration getBarLayoutParams(mContext.getResources().getConfiguration().windowConfiguration
.getRotation())); .getRotation()));
@@ -568,26 +580,25 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
mNavBarHelper.init(); mNavBarHelper.init();
mAllowForceNavBarHandleOpaque = mContext.getResources().getBoolean( mAllowForceNavBarHandleOpaque = mContext.getResources().getBoolean(
R.bool.allow_force_nav_bar_handle_opaque); R.bool.allow_force_nav_bar_handle_opaque);
mForceNavBarHandleOpaque = DeviceConfig.getBoolean( mForceNavBarHandleOpaque = mDeviceConfigProxy.getBoolean(
DeviceConfig.NAMESPACE_SYSTEMUI, DeviceConfig.NAMESPACE_SYSTEMUI,
NAV_BAR_HANDLE_FORCE_OPAQUE, NAV_BAR_HANDLE_FORCE_OPAQUE,
/* defaultValue = */ true); /* defaultValue = */ true);
mHomeButtonLongPressDurationMs = Optional.of(DeviceConfig.getLong( mHomeButtonLongPressDurationMs = Optional.of(mDeviceConfigProxy.getLong(
DeviceConfig.NAMESPACE_SYSTEMUI, DeviceConfig.NAMESPACE_SYSTEMUI,
HOME_BUTTON_LONG_PRESS_DURATION_MS, HOME_BUTTON_LONG_PRESS_DURATION_MS,
/* defaultValue = */ 0 /* defaultValue = */ 0
)).filter(duration -> duration != 0); )).filter(duration -> duration != 0);
DeviceConfig.addOnPropertiesChangedListener( mDeviceConfigProxy.addOnPropertiesChangedListener(
DeviceConfig.NAMESPACE_SYSTEMUI, mHandler::post, mOnPropertiesChangedListener); DeviceConfig.NAMESPACE_SYSTEMUI, mHandler::post, mOnPropertiesChangedListener);
if (savedState != null) { if (mSavedState != null) {
mDisabledFlags1 = savedState.getInt(EXTRA_DISABLE_STATE, 0); mDisabledFlags1 = mSavedState.getInt(EXTRA_DISABLE_STATE, 0);
mDisabledFlags2 = savedState.getInt(EXTRA_DISABLE2_STATE, 0); mDisabledFlags2 = mSavedState.getInt(EXTRA_DISABLE2_STATE, 0);
mAppearance = savedState.getInt(EXTRA_APPEARANCE, 0); mAppearance = mSavedState.getInt(EXTRA_APPEARANCE, 0);
mBehavior = savedState.getInt(EXTRA_BEHAVIOR, 0); mBehavior = mSavedState.getInt(EXTRA_BEHAVIOR, 0);
mTransientShown = savedState.getBoolean(EXTRA_TRANSIENT_STATE, false); mTransientShown = mSavedState.getBoolean(EXTRA_TRANSIENT_STATE, false);
} }
mSavedState = savedState;
// Respect the latest disabled-flags. // Respect the latest disabled-flags.
mCommandQueue.recomputeDisableFlags(mDisplayId, false); mCommandQueue.recomputeDisableFlags(mDisplayId, false);
@@ -595,14 +606,12 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
mIsCurrentUserSetup = mDeviceProvisionedController.isCurrentUserSetup(); mIsCurrentUserSetup = mDeviceProvisionedController.isCurrentUserSetup();
mDeviceProvisionedController.addCallback(mUserSetupListener); mDeviceProvisionedController.addCallback(mUserSetupListener);
mNotificationShadeDepthController.addListener(mDepthListener); mNotificationShadeDepthController.addListener(mDepthListener);
return barView;
} }
public void destroyView() { public void destroyView() {
setAutoHideController(/* autoHideController */ null); setAutoHideController(/* autoHideController */ null);
mCommandQueue.removeCallback(this); mCommandQueue.removeCallback(this);
mWindowManager.removeViewImmediate(mNavigationBarView.getRootView()); mWindowManager.removeViewImmediate(mView.getRootView());
mNavigationModeController.removeListener(mModeChangedListener); mNavigationModeController.removeListener(mModeChangedListener);
mNavBarHelper.removeNavTaskStateUpdater(mNavbarTaskbarStateUpdater); mNavBarHelper.removeNavTaskStateUpdater(mNavbarTaskbarStateUpdater);
@@ -610,29 +619,29 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
mDeviceProvisionedController.removeCallback(mUserSetupListener); mDeviceProvisionedController.removeCallback(mUserSetupListener);
mNotificationShadeDepthController.removeListener(mDepthListener); mNotificationShadeDepthController.removeListener(mDepthListener);
DeviceConfig.removeOnPropertiesChangedListener(mOnPropertiesChangedListener); mDeviceConfigProxy.removeOnPropertiesChangedListener(mOnPropertiesChangedListener);
} }
@Override @Override
public void onViewAttachedToWindow(View v) { public void onViewAttached() {
final Display display = v.getDisplay(); final Display display = mView.getDisplay();
mNavigationBarView.setComponents(mRecentsOptional); mView.setComponents(mRecentsOptional);
mNavigationBarView.setComponents(mCentralSurfacesOptionalLazy.get().get().getPanelController()); mView.setComponents(mCentralSurfacesOptionalLazy.get().get().getPanelController());
mNavigationBarView.setDisabledFlags(mDisabledFlags1, mSysUiFlagsContainer); mView.setDisabledFlags(mDisabledFlags1, mSysUiFlagsContainer);
mNavigationBarView.setOnVerticalChangedListener(this::onVerticalChanged); mView.setOnVerticalChangedListener(this::onVerticalChanged);
mNavigationBarView.setOnTouchListener(this::onNavigationTouch); mView.setOnTouchListener(this::onNavigationTouch);
if (mSavedState != null) { if (mSavedState != null) {
mNavigationBarView.getLightTransitionsController().restoreState(mSavedState); mView.getLightTransitionsController().restoreState(mSavedState);
} }
setNavigationIconHints(mNavigationIconHints); setNavigationIconHints(mNavigationIconHints);
mNavigationBarView.setWindowVisible(isNavBarWindowVisible()); mView.setWindowVisible(isNavBarWindowVisible());
mNavigationBarView.setBehavior(mBehavior); mView.setBehavior(mBehavior);
mNavigationBarView.setNavBarMode(mNavBarMode); mView.setNavBarMode(mNavBarMode);
mNavBarHelper.registerNavTaskStateUpdater(mNavbarTaskbarStateUpdater); mNavBarHelper.registerNavTaskStateUpdater(mNavbarTaskbarStateUpdater);
mPipOptional.ifPresent(mNavigationBarView::addPipExclusionBoundsChangeListener); mPipOptional.ifPresent(mView::addPipExclusionBoundsChangeListener);
mBackAnimation.ifPresent(mNavigationBarView::registerBackAnimation); mBackAnimation.ifPresent(mView::registerBackAnimation);
prepareNavigationBarView(); prepareNavigationBarView();
checkNavBarModes(); checkNavBarModes();
@@ -650,7 +659,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
// Currently there is no accelerometer sensor on non-default display. // Currently there is no accelerometer sensor on non-default display.
if (mIsOnDefaultDisplay) { if (mIsOnDefaultDisplay) {
final RotationButtonController rotationButtonController = final RotationButtonController rotationButtonController =
mNavigationBarView.getRotationButtonController(); mView.getRotationButtonController();
rotationButtonController.setRotationCallback(mRotationWatcher); rotationButtonController.setRotationCallback(mRotationWatcher);
// Reset user rotation pref to match that of the WindowManager if starting in locked // Reset user rotation pref to match that of the WindowManager if starting in locked
@@ -684,12 +693,12 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
} }
@Override @Override
public void onViewDetachedFromWindow(View v) { public void onViewDetached() {
final RotationButtonController rotationButtonController = final RotationButtonController rotationButtonController =
mNavigationBarView.getRotationButtonController(); mView.getRotationButtonController();
rotationButtonController.setRotationCallback(null); rotationButtonController.setRotationCallback(null);
mNavigationBarView.getBarTransitions().destroy(); mView.getBarTransitions().destroy();
mNavigationBarView.getLightTransitionsController().destroy(mContext); mView.getLightTransitionsController().destroy(mContext);
mOverviewProxyService.removeCallback(mOverviewProxyListener); mOverviewProxyService.removeCallback(mOverviewProxyListener);
mBroadcastDispatcher.unregisterReceiver(mBroadcastReceiver); mBroadcastDispatcher.unregisterReceiver(mBroadcastReceiver);
if (mOrientationHandle != null) { if (mOrientationHandle != null) {
@@ -703,9 +712,8 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
mHandler.removeCallbacks(mOnVariableDurationHomeLongClick); mHandler.removeCallbacks(mOnVariableDurationHomeLongClick);
mHandler.removeCallbacks(mEnableLayoutTransitions); mHandler.removeCallbacks(mEnableLayoutTransitions);
mNavBarHelper.removeNavTaskStateUpdater(mNavbarTaskbarStateUpdater); mNavBarHelper.removeNavTaskStateUpdater(mNavbarTaskbarStateUpdater);
mPipOptional.ifPresent(mNavigationBarView::removePipExclusionBoundsChangeListener); mPipOptional.ifPresent(mView::removePipExclusionBoundsChangeListener);
mFrame = null; mFrame = null;
mNavigationBarView = null;
mOrientationHandle = null; mOrientationHandle = null;
} }
@@ -716,7 +724,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
outState.putInt(EXTRA_APPEARANCE, mAppearance); outState.putInt(EXTRA_APPEARANCE, mAppearance);
outState.putInt(EXTRA_BEHAVIOR, mBehavior); outState.putInt(EXTRA_BEHAVIOR, mBehavior);
outState.putBoolean(EXTRA_TRANSIENT_STATE, mTransientShown); outState.putBoolean(EXTRA_TRANSIENT_STATE, mTransientShown);
mNavigationBarView.getLightTransitionsController().saveState(outState); mView.getLightTransitionsController().saveState(outState);
} }
/** /**
@@ -779,7 +787,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
mOrientationHandle.mapRectFromViewToScreenCoords(boundsOnScreen, true); mOrientationHandle.mapRectFromViewToScreenCoords(boundsOnScreen, true);
Rect boundsRounded = new Rect(); Rect boundsRounded = new Rect();
boundsOnScreen.roundOut(boundsRounded); boundsOnScreen.roundOut(boundsRounded);
mNavigationBarView.setOrientedHandleSamplingRegion(boundsRounded); mView.setOrientedHandleSamplingRegion(boundsRounded);
}; };
mOrientationHandle.getViewTreeObserver().addOnGlobalLayoutListener( mOrientationHandle.getViewTreeObserver().addOnGlobalLayoutListener(
mOrientationHandleGlobalLayoutListener); mOrientationHandleGlobalLayoutListener);
@@ -808,7 +816,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
case Surface.ROTATION_90: case Surface.ROTATION_90:
case Surface.ROTATION_270: case Surface.ROTATION_270:
height = dispSize.height(); height = dispSize.height();
width = mNavigationBarView.getHeight(); width = mView.getHeight();
break; break;
case Surface.ROTATION_180: case Surface.ROTATION_180:
case Surface.ROTATION_0: case Surface.ROTATION_0:
@@ -818,7 +826,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
return; return;
} }
width = dispSize.width(); width = dispSize.width();
height = mNavigationBarView.getHeight(); height = mView.getHeight();
break; break;
} }
@@ -828,7 +836,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
mOrientationParams.height = height; mOrientationParams.height = height;
mOrientationParams.width = width; mOrientationParams.width = width;
mWindowManager.updateViewLayout(mOrientationHandle, mOrientationParams); mWindowManager.updateViewLayout(mOrientationHandle, mOrientationParams);
mNavigationBarView.setVisibility(View.GONE); mView.setVisibility(View.GONE);
mOrientationHandle.setVisibility(View.VISIBLE); mOrientationHandle.setVisibility(View.VISIBLE);
} }
} }
@@ -839,22 +847,22 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
// mOrientedHandle is initialized lazily // mOrientedHandle is initialized lazily
mOrientationHandle.setVisibility(View.GONE); mOrientationHandle.setVisibility(View.GONE);
} }
mNavigationBarView.setVisibility(View.VISIBLE); mView.setVisibility(View.VISIBLE);
mNavigationBarView.setOrientedHandleSamplingRegion(null); mView.setOrientedHandleSamplingRegion(null);
} }
private void reconfigureHomeLongClick() { private void reconfigureHomeLongClick() {
if (mNavigationBarView.getHomeButton().getCurrentView() == null) { if (mView.getHomeButton().getCurrentView() == null) {
return; return;
} }
if (mHomeButtonLongPressDurationMs.isPresent() || !mLongPressHomeEnabled) { if (mHomeButtonLongPressDurationMs.isPresent() || !mLongPressHomeEnabled) {
mNavigationBarView.getHomeButton().getCurrentView().setLongClickable(false); mView.getHomeButton().getCurrentView().setLongClickable(false);
mNavigationBarView.getHomeButton().getCurrentView().setHapticFeedbackEnabled(false); mView.getHomeButton().getCurrentView().setHapticFeedbackEnabled(false);
mNavigationBarView.getHomeButton().setOnLongClickListener(null); mView.getHomeButton().setOnLongClickListener(null);
} else { } else {
mNavigationBarView.getHomeButton().getCurrentView().setLongClickable(true); mView.getHomeButton().getCurrentView().setLongClickable(true);
mNavigationBarView.getHomeButton().getCurrentView().setHapticFeedbackEnabled(true); mView.getHomeButton().getCurrentView().setHapticFeedbackEnabled(true);
mNavigationBarView.getHomeButton().setOnLongClickListener(this::onHomeLongClick); mView.getHomeButton().setOnLongClickListener(this::onHomeLongClick);
} }
} }
@@ -877,8 +885,8 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
pw.println(" mTransientShown=" + mTransientShown); pw.println(" mTransientShown=" + mTransientShown);
pw.println(" mTransientShownFromGestureOnSystemBar=" pw.println(" mTransientShownFromGestureOnSystemBar="
+ mTransientShownFromGestureOnSystemBar); + mTransientShownFromGestureOnSystemBar);
dumpBarTransitions(pw, "mNavigationBarView", mNavigationBarView.getBarTransitions()); dumpBarTransitions(pw, "mNavigationBarView", mView.getBarTransitions());
mNavigationBarView.dump(pw); mView.dump(pw);
} }
// ----- CommandQueue Callbacks ----- // ----- CommandQueue Callbacks -----
@@ -914,7 +922,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
orientSecondaryHomeHandle(); orientSecondaryHomeHandle();
} }
if (DEBUG_WINDOW_STATE) Log.d(TAG, "Navigation bar " + windowStateToString(state)); if (DEBUG_WINDOW_STATE) Log.d(TAG, "Navigation bar " + windowStateToString(state));
mNavigationBarView.setWindowVisible(isNavBarWindowVisible()); mView.setWindowVisible(isNavBarWindowVisible());
} }
} }
@@ -923,12 +931,12 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
// The CommandQueue callbacks are added when the view is created to ensure we track other // The CommandQueue callbacks are added when the view is created to ensure we track other
// states, but until the view is attached (at the next traversal), the view's display is // states, but until the view is attached (at the next traversal), the view's display is
// not valid. Just ignore the rotation in this case. // not valid. Just ignore the rotation in this case.
if (!mNavigationBarView.isAttachedToWindow()) return; if (!mView.isAttachedToWindow()) return;
final boolean rotateSuggestionsDisabled = RotationButtonController final boolean rotateSuggestionsDisabled = RotationButtonController
.hasDisable2RotateSuggestionFlag(mDisabledFlags2); .hasDisable2RotateSuggestionFlag(mDisabledFlags2);
final RotationButtonController rotationButtonController = final RotationButtonController rotationButtonController =
mNavigationBarView.getRotationButtonController(); mView.getRotationButtonController();
final RotationButton rotationButton = rotationButtonController.getRotationButton(); final RotationButton rotationButton = rotationButtonController.getRotationButton();
if (RotationContextButton.DEBUG_ROTATION) { if (RotationContextButton.DEBUG_ROTATION) {
@@ -950,7 +958,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
if (running) { if (running) {
mNavbarOverlayController.setButtonState(/* visible */false, /* force */true); mNavbarOverlayController.setButtonState(/* visible */false, /* force */true);
} }
mNavigationBarView.getRotationButtonController().setRecentsAnimationRunning(running); mView.getRotationButtonController().setRecentsAnimationRunning(running);
} }
/** Restores the appearance and the transient saved state to {@link NavigationBar}. */ /** Restores the appearance and the transient saved state to {@link NavigationBar}. */
@@ -985,7 +993,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
} }
if (mBehavior != behavior) { if (mBehavior != behavior) {
mBehavior = behavior; mBehavior = behavior;
mNavigationBarView.setBehavior(behavior); mView.setBehavior(behavior);
updateSystemUiStateFlags(); updateSystemUiStateFlags();
} }
} }
@@ -1026,7 +1034,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
} }
private void handleTransientChanged() { private void handleTransientChanged() {
mNavigationBarView.onTransientStateChanged(mTransientShown, mView.onTransientStateChanged(mTransientShown,
mTransientShownFromGestureOnSystemBar); mTransientShownFromGestureOnSystemBar);
final int transitionMode = transitionMode(mTransientShown, mAppearance); final int transitionMode = transitionMode(mTransientShown, mAppearance);
if (updateTransitionMode(transitionMode) && mLightBarController != null) { if (updateTransitionMode(transitionMode) && mLightBarController != null) {
@@ -1076,7 +1084,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
| StatusBarManager.DISABLE_SEARCH); | StatusBarManager.DISABLE_SEARCH);
if (masked != mDisabledFlags1) { if (masked != mDisabledFlags1) {
mDisabledFlags1 = masked; mDisabledFlags1 = masked;
mNavigationBarView.setDisabledFlags(state1, mSysUiFlagsContainer); mView.setDisabledFlags(state1, mSysUiFlagsContainer);
updateScreenPinningGestures(); updateScreenPinningGestures();
} }
@@ -1092,13 +1100,13 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
private void setDisabled2Flags(int state2) { private void setDisabled2Flags(int state2) {
// Method only called on change of disable2 flags // Method only called on change of disable2 flags
mNavigationBarView.getRotationButtonController().onDisable2FlagChanged(state2); mView.getRotationButtonController().onDisable2FlagChanged(state2);
} }
// ----- Internal stuff ----- // ----- Internal stuff -----
private void refreshLayout(int layoutDirection) { private void refreshLayout(int layoutDirection) {
mNavigationBarView.setLayoutDirection(layoutDirection); mView.setLayoutDirection(layoutDirection);
} }
private boolean shouldDisableNavbarGestures() { private boolean shouldDisableNavbarGestures() {
@@ -1107,7 +1115,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
} }
private void repositionNavigationBar(int rotation) { private void repositionNavigationBar(int rotation) {
if (mNavigationBarView == null || !mNavigationBarView.isAttachedToWindow()) return; if (mView == null || !mView.isAttachedToWindow()) return;
prepareNavigationBarView(); prepareNavigationBarView();
@@ -1117,10 +1125,10 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
private void updateScreenPinningGestures() { private void updateScreenPinningGestures() {
// Change the cancel pin gesture to home and back if recents button is invisible // Change the cancel pin gesture to home and back if recents button is invisible
boolean pinningActive = ActivityManagerWrapper.getInstance().isScreenPinningActive(); boolean pinningActive = ActivityManagerWrapper.getInstance().isScreenPinningActive();
ButtonDispatcher backButton = mNavigationBarView.getBackButton(); ButtonDispatcher backButton = mView.getBackButton();
ButtonDispatcher recentsButton = mNavigationBarView.getRecentsButton(); ButtonDispatcher recentsButton = mView.getRecentsButton();
if (pinningActive) { if (pinningActive) {
boolean recentsVisible = mNavigationBarView.isRecentsButtonVisible(); boolean recentsVisible = mView.isRecentsButtonVisible();
backButton.setOnLongClickListener(recentsVisible backButton.setOnLongClickListener(recentsVisible
? this::onLongPressBackRecents ? this::onLongPressBackRecents
: this::onLongPressBackHome); : this::onLongPressBackHome);
@@ -1135,27 +1143,27 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
} }
private void notifyNavigationBarScreenOn() { private void notifyNavigationBarScreenOn() {
mNavigationBarView.updateNavButtonIcons(); mView.updateNavButtonIcons();
} }
private void prepareNavigationBarView() { private void prepareNavigationBarView() {
mNavigationBarView.reorient(); mView.reorient();
ButtonDispatcher recentsButton = mNavigationBarView.getRecentsButton(); ButtonDispatcher recentsButton = mView.getRecentsButton();
recentsButton.setOnClickListener(this::onRecentsClick); recentsButton.setOnClickListener(this::onRecentsClick);
recentsButton.setOnTouchListener(this::onRecentsTouch); recentsButton.setOnTouchListener(this::onRecentsTouch);
ButtonDispatcher homeButton = mNavigationBarView.getHomeButton(); ButtonDispatcher homeButton = mView.getHomeButton();
homeButton.setOnTouchListener(this::onHomeTouch); homeButton.setOnTouchListener(this::onHomeTouch);
reconfigureHomeLongClick(); reconfigureHomeLongClick();
ButtonDispatcher accessibilityButton = mNavigationBarView.getAccessibilityButton(); ButtonDispatcher accessibilityButton = mView.getAccessibilityButton();
accessibilityButton.setOnClickListener(this::onAccessibilityClick); accessibilityButton.setOnClickListener(this::onAccessibilityClick);
accessibilityButton.setOnLongClickListener(this::onAccessibilityLongClick); accessibilityButton.setOnLongClickListener(this::onAccessibilityLongClick);
updateAccessibilityStateFlags(); updateAccessibilityStateFlags();
ButtonDispatcher imeSwitcherButton = mNavigationBarView.getImeSwitchButton(); ButtonDispatcher imeSwitcherButton = mView.getImeSwitchButton();
imeSwitcherButton.setOnClickListener(this::onImeSwitcherClick); imeSwitcherButton.setOnClickListener(this::onImeSwitcherClick);
updateScreenPinningGestures(); updateScreenPinningGestures();
@@ -1212,7 +1220,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
@VisibleForTesting @VisibleForTesting
boolean onHomeLongClick(View v) { boolean onHomeLongClick(View v) {
if (!mNavigationBarView.isRecentsButtonVisible() if (!mView.isRecentsButtonVisible()
&& ActivityManagerWrapper.getInstance().isScreenPinningActive()) { && ActivityManagerWrapper.getInstance().isScreenPinningActive()) {
return onLongPressBackHome(v); return onLongPressBackHome(v);
} }
@@ -1227,7 +1235,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
AssistManager.INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS); AssistManager.INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS);
mAssistManagerLazy.get().startAssist(args); mAssistManagerLazy.get().startAssist(args);
mCentralSurfacesOptionalLazy.get().ifPresent(CentralSurfaces::awakenDreams); mCentralSurfacesOptionalLazy.get().ifPresent(CentralSurfaces::awakenDreams);
mNavigationBarView.abortCurrentGesture(); mView.abortCurrentGesture();
return true; return true;
} }
@@ -1302,8 +1310,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
return true; return true;
} else if (v.getId() == btnId1) { } else if (v.getId() == btnId1) {
ButtonDispatcher button = btnId2 == R.id.recent_apps ButtonDispatcher button = btnId2 == R.id.recent_apps
? mNavigationBarView.getRecentsButton() ? mView.getRecentsButton() : mView.getHomeButton();
: mNavigationBarView.getHomeButton();
if (!button.getCurrentView().isPressed()) { if (!button.getCurrentView().isPressed()) {
// If we aren't pressing recents/home right now then they presses // If we aren't pressing recents/home right now then they presses
// won't be together, so send the standard long-press action. // won't be together, so send the standard long-press action.
@@ -1323,15 +1330,14 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
} else if (v.getId() == btnId2) { } else if (v.getId() == btnId2) {
return btnId2 == R.id.recent_apps return btnId2 == R.id.recent_apps
? false ? false
: onHomeLongClick( : onHomeLongClick(mView.getHomeButton().getCurrentView());
mNavigationBarView.getHomeButton().getCurrentView());
} }
} }
} finally { } finally {
if (stopLockTaskMode) { if (stopLockTaskMode) {
activityManager.stopSystemLockTaskMode(); activityManager.stopSystemLockTaskMode();
// When exiting refresh disabled flags. // When exiting refresh disabled flags.
mNavigationBarView.updateNavButtonIcons(); mView.updateNavButtonIcons();
} }
} }
@@ -1363,11 +1369,11 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
} }
void updateAccessibilityStateFlags() { void updateAccessibilityStateFlags() {
if (mNavigationBarView != null) { if (mView != null) {
int a11yFlags = mNavBarHelper.getA11yButtonState(); int a11yFlags = mNavBarHelper.getA11yButtonState();
boolean clickable = (a11yFlags & SYSUI_STATE_A11Y_BUTTON_CLICKABLE) != 0; boolean clickable = (a11yFlags & SYSUI_STATE_A11Y_BUTTON_CLICKABLE) != 0;
boolean longClickable = (a11yFlags & SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE) != 0; boolean longClickable = (a11yFlags & SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE) != 0;
mNavigationBarView.setAccessibilityButtonState(clickable, longClickable); mView.setAccessibilityButtonState(clickable, longClickable);
} }
updateSystemUiStateFlags(); updateSystemUiStateFlags();
} }
@@ -1416,7 +1422,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
mLightBarController = lightBarController; mLightBarController = lightBarController;
if (mLightBarController != null) { if (mLightBarController != null) {
mLightBarController.setNavigationBar( mLightBarController.setNavigationBar(
mNavigationBarView.getLightTransitionsController()); mView.getLightTransitionsController());
} }
} }
@@ -1426,7 +1432,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
if (mAutoHideController != null) { if (mAutoHideController != null) {
mAutoHideController.setNavigationBar(mAutoHideUiElement); mAutoHideController.setNavigationBar(mAutoHideUiElement);
} }
mNavigationBarView.setAutoHideController(autoHideController); mView.setAutoHideController(autoHideController);
} }
private boolean isTransientShown() { private boolean isTransientShown() {
@@ -1458,11 +1464,11 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
mCentralSurfacesOptionalLazy.get().map(CentralSurfaces::isDeviceInteractive) mCentralSurfacesOptionalLazy.get().map(CentralSurfaces::isDeviceInteractive)
.orElse(false) .orElse(false)
&& mNavigationBarWindowState != WINDOW_STATE_HIDDEN; && mNavigationBarWindowState != WINDOW_STATE_HIDDEN;
mNavigationBarView.getBarTransitions().transitionTo(mTransitionMode, anim); mView.getBarTransitions().transitionTo(mTransitionMode, anim);
} }
public void disableAnimationsDuringHide(long delay) { public void disableAnimationsDuringHide(long delay) {
mNavigationBarView.setLayoutTransitionsEnabled(false); mView.setLayoutTransitionsEnabled(false);
mHandler.postDelayed(mEnableLayoutTransitions, mHandler.postDelayed(mEnableLayoutTransitions,
delay + StackStateAnimator.ANIMATION_DURATION_GO_TO_FULL_SHADE); delay + StackStateAnimator.ANIMATION_DURATION_GO_TO_FULL_SHADE);
} }
@@ -1478,11 +1484,11 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
} }
public NavigationBarTransitions getBarTransitions() { public NavigationBarTransitions getBarTransitions() {
return mNavigationBarView.getBarTransitions(); return mView.getBarTransitions();
} }
public void finishBarAnimations() { public void finishBarAnimations() {
mNavigationBarView.getBarTransitions().finishAnimations(); mView.getBarTransitions().finishAnimations();
} }
private WindowManager.LayoutParams getBarLayoutParams(int rotation) { private WindowManager.LayoutParams getBarLayoutParams(int rotation) {
@@ -1567,8 +1573,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
} }
private final Consumer<Integer> mRotationWatcher = rotation -> { private final Consumer<Integer> mRotationWatcher = rotation -> {
if (mNavigationBarView != null if (mView != null && mView.needsReorient(rotation)) {
&& mNavigationBarView.needsReorient(rotation)) {
repositionNavigationBar(rotation); repositionNavigationBar(rotation);
} }
}; };
@@ -1578,14 +1583,14 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
// TODO(193941146): Currently unregistering a receiver through BroadcastDispatcher is // TODO(193941146): Currently unregistering a receiver through BroadcastDispatcher is
// async, but we've already cleared the fields. Just return early in this case. // async, but we've already cleared the fields. Just return early in this case.
if (mNavigationBarView == null) { if (mView == null) {
return; return;
} }
String action = intent.getAction(); String action = intent.getAction();
if (Intent.ACTION_SCREEN_OFF.equals(action) if (Intent.ACTION_SCREEN_OFF.equals(action)
|| Intent.ACTION_SCREEN_ON.equals(action)) { || Intent.ACTION_SCREEN_ON.equals(action)) {
notifyNavigationBarScreenOn(); notifyNavigationBarScreenOn();
mNavigationBarView.onScreenStateChanged(Intent.ACTION_SCREEN_ON.equals(action)); mView.onScreenStateChanged(Intent.ACTION_SCREEN_ON.equals(action));
} }
if (Intent.ACTION_USER_SWITCHED.equals(action)) { if (Intent.ACTION_USER_SWITCHED.equals(action)) {
// The accessibility settings may be different for the new user // The accessibility settings may be different for the new user
@@ -1607,11 +1612,11 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
final boolean oldBackAlt = final boolean oldBackAlt =
(mNavigationIconHints & StatusBarManager.NAVIGATION_HINT_BACK_ALT) != 0; (mNavigationIconHints & StatusBarManager.NAVIGATION_HINT_BACK_ALT) != 0;
if (newBackAlt != oldBackAlt) { if (newBackAlt != oldBackAlt) {
mNavigationBarView.onImeVisibilityChanged(newBackAlt); mView.onImeVisibilityChanged(newBackAlt);
mImeVisible = newBackAlt; mImeVisible = newBackAlt;
} }
mNavigationBarView.setNavigationIconHints(hints); mView.setNavigationIconHints(hints);
} }
if (DEBUG) { if (DEBUG) {
android.widget.Toast.makeText(mContext, android.widget.Toast.makeText(mContext,
@@ -1637,8 +1642,8 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
if (!canShowSecondaryHandle()) { if (!canShowSecondaryHandle()) {
resetSecondaryHandle(); resetSecondaryHandle();
} }
if (mNavigationBarView != null) { if (mView != null) {
mNavigationBarView.setNavBarMode(mode); mView.setNavBarMode(mode);
} }
} }
}; };
@@ -1671,14 +1676,14 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
switch (action) { switch (action) {
case MotionEvent.ACTION_DOWN: case MotionEvent.ACTION_DOWN:
// Allow gestures starting in the deadzone to be slippery // Allow gestures starting in the deadzone to be slippery
mNavigationBarView.setSlippery(true); mView.setSlippery(true);
mDeadZoneConsuming = true; mDeadZoneConsuming = true;
break; break;
case MotionEvent.ACTION_CANCEL: case MotionEvent.ACTION_CANCEL:
case MotionEvent.ACTION_UP: case MotionEvent.ACTION_UP:
// When a gesture started in the deadzone is finished, restore // When a gesture started in the deadzone is finished, restore
// slippery state // slippery state
mNavigationBarView.updateSlippery(); mView.updateSlippery();
mDeadZoneConsuming = false; mDeadZoneConsuming = false;
break; break;
} }
@@ -1687,14 +1692,4 @@ public class NavigationBar implements View.OnAttachStateChangeListener, Callback
return false; return false;
} }
}; };
/**
* Injectable factory for construction a {@link NavigationBar}.
*/
@AssistedFactory
public interface Factory {
/** Construct a {@link NavigationBar} */
NavigationBar create(Context context, WindowManager windowManager);
}
} }

63
packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarComponent.java Normal file
View File

@@ -0,0 +1,63 @@
/*
* Copyright (C) 2022 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 java.lang.annotation.RetentionPolicy.RUNTIME;
import android.content.Context;
import android.os.Bundle;
import androidx.annotation.Nullable;
import com.android.systemui.dagger.qualifiers.DisplayId;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import javax.inject.Scope;
import dagger.BindsInstance;
import dagger.Subcomponent;
/**
* Subcomponent for a NavigationBar.
*
* Generally creatd on a per-display basis.
*/
@Subcomponent(modules = { NavigationBarModule.class })
@NavigationBarComponent.NavigationBarScope
public interface NavigationBarComponent {
/** Factory for {@link NavigationBarComponent}. */
@Subcomponent.Factory
interface Factory {
NavigationBarComponent create(
@BindsInstance @DisplayId Context context,
@BindsInstance @Nullable Bundle savedState);
}
/** */
NavigationBar getNavigationBar();
/**
* Scope annotation for singleton items within the NavigationBarComponent.
*/
@Documented
@Retention(RUNTIME)
@Scope
@interface NavigationBarScope {}
}

18
packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java
View File

@@ -39,7 +39,6 @@ import android.util.SparseArray;
import android.view.Display; import android.view.Display;
import android.view.IWindowManager; import android.view.IWindowManager;
import android.view.View; import android.view.View;
import android.view.WindowManager;
import android.view.WindowManagerGlobal; import android.view.WindowManagerGlobal;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@@ -84,7 +83,7 @@ public class NavigationBarController implements
private final Context mContext; private final Context mContext;
private final Handler mHandler; private final Handler mHandler;
private final NavigationBar.Factory mNavigationBarFactory; private final NavigationBarComponent.Factory mNavigationBarComponentFactory;
private final DisplayManager mDisplayManager; private final DisplayManager mDisplayManager;
private final TaskbarDelegate mTaskbarDelegate; private final TaskbarDelegate mTaskbarDelegate;
private final StatusBarKeyguardViewManager mStatusBarKeyguardViewManager; private final StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;
@@ -110,7 +109,7 @@ public class NavigationBarController implements
ConfigurationController configurationController, ConfigurationController configurationController,
NavBarHelper navBarHelper, NavBarHelper navBarHelper,
TaskbarDelegate taskbarDelegate, TaskbarDelegate taskbarDelegate,
NavigationBar.Factory navigationBarFactory, NavigationBarComponent.Factory navigationBarComponentFactory,
StatusBarKeyguardViewManager statusBarKeyguardViewManager, StatusBarKeyguardViewManager statusBarKeyguardViewManager,
DumpManager dumpManager, DumpManager dumpManager,
AutoHideController autoHideController, AutoHideController autoHideController,
@@ -119,7 +118,7 @@ public class NavigationBarController implements
Optional<BackAnimation> backAnimation) { Optional<BackAnimation> backAnimation) {
mContext = context; mContext = context;
mHandler = mainHandler; mHandler = mainHandler;
mNavigationBarFactory = navigationBarFactory; mNavigationBarComponentFactory = navigationBarComponentFactory;
mDisplayManager = mContext.getSystemService(DisplayManager.class); mDisplayManager = mContext.getSystemService(DisplayManager.class);
commandQueue.addCallback(this); commandQueue.addCallback(this);
configurationController.addCallback(this); configurationController.addCallback(this);
@@ -324,14 +323,13 @@ public class NavigationBarController implements
final Context context = isOnDefaultDisplay final Context context = isOnDefaultDisplay
? mContext ? mContext
: mContext.createDisplayContext(display); : mContext.createDisplayContext(display);
NavigationBar navBar = mNavigationBarFactory.create( NavigationBarComponent component = mNavigationBarComponentFactory.create(
context, context.getSystemService(WindowManager.class)); context, savedState);
NavigationBar navBar = component.getNavigationBar();
navBar.init();
mNavigationBars.put(displayId, navBar); mNavigationBars.put(displayId, navBar);
boolean navBarVisible = mStatusBarKeyguardViewManager.isNavBarVisible(); navBar.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
View navigationBarView = navBar.createView(savedState, navBarVisible);
navigationBarView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
@Override @Override
public void onViewAttachedToWindow(View v) { public void onViewAttachedToWindow(View v) {
if (result != null) { if (result != null) {

65
packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarModule.java Normal file
View File

@@ -0,0 +1,65 @@
/*
* Copyright (C) 2022 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 android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.WindowManager;
import com.android.systemui.R;
import com.android.systemui.dagger.qualifiers.DisplayId;
import com.android.systemui.navigationbar.NavigationBarComponent.NavigationBarScope;
import dagger.Module;
import dagger.Provides;
/** Module for {@link com.android.systemui.navigationbar.NavigationBarComponent}. */
@Module
public interface NavigationBarModule {
/** A Layout inflater specific to the display's context. */
@Provides
@NavigationBarScope
@DisplayId
static LayoutInflater provideLayoutInflater(@DisplayId Context context) {
return LayoutInflater.from(context);
}
/** */
@Provides
@NavigationBarScope
static NavigationBarFrame provideNavigationBarFrame(@DisplayId LayoutInflater layoutInflater) {
return (NavigationBarFrame) layoutInflater.inflate(R.layout.navigation_bar_window, null);
}
/** */
@Provides
@NavigationBarScope
static NavigationBarView provideNavigationBarview(
@DisplayId LayoutInflater layoutInflater, NavigationBarFrame frame) {
View barView = layoutInflater.inflate(R.layout.navigation_bar, frame);
return barView.findViewById(R.id.navigation_bar_view);
}
/** A WindowManager specific to the display's context. */
@Provides
@NavigationBarScope
@DisplayId
static WindowManager provideWindowManager(@DisplayId Context context) {
return context.getSystemService(WindowManager.class);
}
}

3
packages/SystemUI/src/com/android/systemui/navigationbar/buttons/DeadZone.java
View File

@@ -30,6 +30,8 @@ import com.android.systemui.R;
import com.android.systemui.navigationbar.NavigationBarController; import com.android.systemui.navigationbar.NavigationBarController;
import com.android.systemui.navigationbar.NavigationBarView; import com.android.systemui.navigationbar.NavigationBarView;
import javax.inject.Inject;
/** /**
* The "dead zone" consumes unintentional taps along the top edge of the navigation bar. * The "dead zone" consumes unintentional taps along the top edge of the navigation bar.
* When users are typing quickly on an IME they may attempt to hit the space bar, overshoot, and * When users are typing quickly on an IME they may attempt to hit the space bar, overshoot, and
@@ -82,6 +84,7 @@ public class DeadZone {
} }
}; };
@Inject
public DeadZone(NavigationBarView view) { public DeadZone(NavigationBarView view) {
mNavigationBarView = view; mNavigationBarView = view;
mNavBarController = Dependency.get(NavigationBarController.class); mNavBarController = Dependency.get(NavigationBarController.class);

2
packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerTest.java
View File

@@ -75,7 +75,7 @@ public class NavigationBarControllerTest extends SysuiTestCase {
@Mock @Mock
private CommandQueue mCommandQueue; private CommandQueue mCommandQueue;
@Mock @Mock
private NavigationBar.Factory mNavigationBarFactory; private NavigationBarComponent.Factory mNavigationBarFactory;
@Before @Before
public void setUp() { public void setUp() {

106
packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java
View File

@@ -29,8 +29,6 @@ import static android.view.WindowInsets.Type.ime;
import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.HOME_BUTTON_LONG_PRESS_DURATION_MS; import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.HOME_BUTTON_LONG_PRESS_DURATION_MS;
import static com.android.systemui.navigationbar.NavigationBar.NavBarActionEvent.NAVBAR_ASSIST_LONGPRESS; import static com.android.systemui.navigationbar.NavigationBar.NavBarActionEvent.NAVBAR_ASSIST_LONGPRESS;
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
@@ -54,7 +52,6 @@ import android.os.Handler;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.UserHandle; import android.os.UserHandle;
import android.provider.DeviceConfig; import android.provider.DeviceConfig;
import android.provider.Settings;
import android.telecom.TelecomManager; import android.telecom.TelecomManager;
import android.testing.AndroidTestingRunner; import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper; import android.testing.TestableLooper;
@@ -82,26 +79,31 @@ import com.android.systemui.assist.AssistManager;
import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.broadcast.BroadcastDispatcher;
import com.android.systemui.dump.DumpManager; import com.android.systemui.dump.DumpManager;
import com.android.systemui.model.SysUiState; import com.android.systemui.model.SysUiState;
import com.android.systemui.navigationbar.buttons.ButtonDispatcher;
import com.android.systemui.navigationbar.buttons.DeadZone;
import com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler; import com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler;
import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.plugins.statusbar.StatusBarStateController;
import com.android.systemui.recents.OverviewProxyService; import com.android.systemui.recents.OverviewProxyService;
import com.android.systemui.recents.Recents; import com.android.systemui.recents.Recents;
import com.android.systemui.settings.UserTracker; import com.android.systemui.settings.UserTracker;
import com.android.systemui.shared.rotation.RotationButtonController;
import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.CommandQueue;
import com.android.systemui.statusbar.NotificationRemoteInputManager; import com.android.systemui.statusbar.NotificationRemoteInputManager;
import com.android.systemui.statusbar.NotificationShadeDepthController; import com.android.systemui.statusbar.NotificationShadeDepthController;
import com.android.systemui.statusbar.phone.AutoHideController; import com.android.systemui.statusbar.phone.AutoHideController;
import com.android.systemui.statusbar.phone.CentralSurfaces; import com.android.systemui.statusbar.phone.CentralSurfaces;
import com.android.systemui.statusbar.phone.LightBarController; import com.android.systemui.statusbar.phone.LightBarController;
import com.android.systemui.statusbar.phone.LightBarTransitionsController;
import com.android.systemui.statusbar.phone.NotificationShadeWindowView; import com.android.systemui.statusbar.phone.NotificationShadeWindowView;
import com.android.systemui.statusbar.phone.ShadeController; import com.android.systemui.statusbar.phone.ShadeController;
import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.statusbar.policy.DeviceProvisionedController;
import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.statusbar.policy.KeyguardStateController;
import com.android.systemui.util.DeviceConfigProxyFake;
import com.android.systemui.utils.leaks.LeakCheckedTest; import com.android.systemui.utils.leaks.LeakCheckedTest;
import com.android.wm.shell.back.BackAnimation; import com.android.wm.shell.back.BackAnimation;
import com.android.wm.shell.pip.Pip; import com.android.wm.shell.pip.Pip;
import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
@@ -122,12 +124,34 @@ public class NavigationBarTest extends SysuiTestCase {
private SysuiTestableContext mSysuiTestableContextExternal; private SysuiTestableContext mSysuiTestableContextExternal;
@Mock @Mock
NavigationBarFrame mNavigationBarFrame;
@Mock
NavigationBarView mNavigationBarView;
@Mock
ButtonDispatcher mHomeButton;
@Mock
ButtonDispatcher mRecentsButton;
@Mock
ButtonDispatcher mAccessibilityButton;
@Mock
ButtonDispatcher mImeSwitchButton;
@Mock
ButtonDispatcher mBackButton;
@Mock
NavigationBarTransitions mNavigationBarTransitions;
@Mock
RotationButtonController mRotationButtonController;
@Mock
LightBarTransitionsController mLightBarTransitionsController;
@Mock
private SystemActions mSystemActions; private SystemActions mSystemActions;
@Mock @Mock
private OverviewProxyService mOverviewProxyService; private OverviewProxyService mOverviewProxyService;
@Mock @Mock
private StatusBarStateController mStatusBarStateController; private StatusBarStateController mStatusBarStateController;
@Mock @Mock
private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;
@Mock
private NavigationModeController mNavigationModeController; private NavigationModeController mNavigationModeController;
@Mock @Mock
private CommandQueue mCommandQueue; private CommandQueue mCommandQueue;
@@ -160,7 +184,10 @@ public class NavigationBarTest extends SysuiTestCase {
@Mock @Mock
private AssistManager mAssistManager; private AssistManager mAssistManager;
@Mock @Mock
private DeadZone mDeadZone;
@Mock
private CentralSurfaces mCentralSurfaces; private CentralSurfaces mCentralSurfaces;
private DeviceConfigProxyFake mDeviceConfigProxyFake = new DeviceConfigProxyFake();
@Rule @Rule
public final LeakCheckedTest.SysuiLeakCheck mLeakCheck = new LeakCheckedTest.SysuiLeakCheck(); public final LeakCheckedTest.SysuiLeakCheck mLeakCheck = new LeakCheckedTest.SysuiLeakCheck();
@@ -173,6 +200,17 @@ public class NavigationBarTest extends SysuiTestCase {
.thenReturn(mEdgeBackGestureHandler); .thenReturn(mEdgeBackGestureHandler);
when(mLightBarcontrollerFactory.create(any(Context.class))).thenReturn(mLightBarController); when(mLightBarcontrollerFactory.create(any(Context.class))).thenReturn(mLightBarController);
when(mAutoHideControllerFactory.create(any(Context.class))).thenReturn(mAutoHideController); when(mAutoHideControllerFactory.create(any(Context.class))).thenReturn(mAutoHideController);
when(mNavigationBarView.getHomeButton()).thenReturn(mHomeButton);
when(mNavigationBarView.getRecentsButton()).thenReturn(mRecentsButton);
when(mNavigationBarView.getAccessibilityButton()).thenReturn(mAccessibilityButton);
when(mNavigationBarView.getImeSwitchButton()).thenReturn(mImeSwitchButton);
when(mNavigationBarView.getBackButton()).thenReturn(mBackButton);
when(mNavigationBarView.getBarTransitions()).thenReturn(mNavigationBarTransitions);
when(mNavigationBarView.getRotationButtonController())
.thenReturn(mRotationButtonController);
when(mNavigationBarView.getLightTransitionsController())
.thenReturn(mLightBarTransitionsController);
when(mStatusBarKeyguardViewManager.isNavBarVisible()).thenReturn(true);
setupSysuiDependency(); setupSysuiDependency();
// This class inflates views that call Dependency.get, thus these injections are still // This class inflates views that call Dependency.get, thus these injections are still
// necessary. // necessary.
@@ -197,12 +235,6 @@ public class NavigationBarTest extends SysuiTestCase {
}); });
} }
@After
public void tearDown() throws Exception {
DeviceConfig.resetToDefaults(
Settings.RESET_MODE_PACKAGE_DEFAULTS, DeviceConfig.NAMESPACE_SYSTEMUI);
}
private void setupSysuiDependency() { private void setupSysuiDependency() {
Display display = new Display(DisplayManagerGlobal.getInstance(), EXTERNAL_DISPLAY_ID, Display display = new Display(DisplayManagerGlobal.getInstance(), EXTERNAL_DISPLAY_ID,
new DisplayInfo(), DEFAULT_DISPLAY_ADJUSTMENTS); new DisplayInfo(), DEFAULT_DISPLAY_ADJUSTMENTS);
@@ -228,8 +260,8 @@ public class NavigationBarTest extends SysuiTestCase {
@Test @Test
public void testHomeLongPress() { public void testHomeLongPress() {
mNavigationBar.onViewAttachedToWindow(mNavigationBar mNavigationBar.init();
.createView(null, /* initialVisibility= */ true)); mNavigationBar.onViewAttached();
mNavigationBar.onHomeLongClick(mNavigationBar.getView()); mNavigationBar.onHomeLongClick(mNavigationBar.getView());
verify(mUiEventLogger, times(1)).log(NAVBAR_ASSIST_LONGPRESS); verify(mUiEventLogger, times(1)).log(NAVBAR_ASSIST_LONGPRESS);
@@ -237,13 +269,14 @@ public class NavigationBarTest extends SysuiTestCase {
@Test @Test
public void testHomeLongPressWithCustomDuration() throws Exception { public void testHomeLongPressWithCustomDuration() throws Exception {
DeviceConfig.setProperties( mDeviceConfigProxyFake.setProperty(
new DeviceConfig.Properties.Builder(DeviceConfig.NAMESPACE_SYSTEMUI) DeviceConfig.NAMESPACE_SYSTEMUI,
.setLong(HOME_BUTTON_LONG_PRESS_DURATION_MS, 100) HOME_BUTTON_LONG_PRESS_DURATION_MS,
.build()); "100",
false);
when(mNavBarHelper.getLongPressHomeEnabled()).thenReturn(true); when(mNavBarHelper.getLongPressHomeEnabled()).thenReturn(true);
mNavigationBar.onViewAttachedToWindow(mNavigationBar mNavigationBar.init();
.createView(null, /* initialVisibility= */ true)); mNavigationBar.onViewAttached();
mNavigationBar.onHomeTouch(mNavigationBar.getView(), MotionEvent.obtain( mNavigationBar.onHomeTouch(mNavigationBar.getView(), MotionEvent.obtain(
/*downTime=*/SystemClock.uptimeMillis(), /*downTime=*/SystemClock.uptimeMillis(),
@@ -265,8 +298,8 @@ public class NavigationBarTest extends SysuiTestCase {
@Test @Test
public void testRegisteredWithDispatcher() { public void testRegisteredWithDispatcher() {
mNavigationBar.onViewAttachedToWindow(mNavigationBar mNavigationBar.init();
.createView(null, /* initialVisibility= */ true)); mNavigationBar.onViewAttached();
verify(mBroadcastDispatcher).registerReceiverWithHandler( verify(mBroadcastDispatcher).registerReceiverWithHandler(
any(BroadcastReceiver.class), any(BroadcastReceiver.class),
any(IntentFilter.class), any(IntentFilter.class),
@@ -286,8 +319,8 @@ public class NavigationBarTest extends SysuiTestCase {
doReturn(true).when(mockShadeWindowView).isAttachedToWindow(); doReturn(true).when(mockShadeWindowView).isAttachedToWindow();
doNothing().when(defaultNavBar).checkNavBarModes(); doNothing().when(defaultNavBar).checkNavBarModes();
doNothing().when(externalNavBar).checkNavBarModes(); doNothing().when(externalNavBar).checkNavBarModes();
defaultNavBar.createView(null, /* initialVisibility= */ true); defaultNavBar.init();
externalNavBar.createView(null, /* initialVisibility= */ true); externalNavBar.init();
defaultNavBar.setImeWindowStatus(DEFAULT_DISPLAY, null, IME_VISIBLE, defaultNavBar.setImeWindowStatus(DEFAULT_DISPLAY, null, IME_VISIBLE,
BACK_DISPOSITION_DEFAULT, true); BACK_DISPOSITION_DEFAULT, true);
@@ -321,7 +354,7 @@ public class NavigationBarTest extends SysuiTestCase {
doReturn(mockShadeWindowView).when(mCentralSurfaces).getNotificationShadeWindowView(); doReturn(mockShadeWindowView).when(mCentralSurfaces).getNotificationShadeWindowView();
doReturn(true).when(mockShadeWindowView).isAttachedToWindow(); doReturn(true).when(mockShadeWindowView).isAttachedToWindow();
doNothing().when(mNavigationBar).checkNavBarModes(); doNothing().when(mNavigationBar).checkNavBarModes();
mNavigationBar.createView(null, /* initialVisibility= */ true); mNavigationBar.init();
WindowInsets windowInsets = new WindowInsets.Builder().setVisible(ime(), false).build(); WindowInsets windowInsets = new WindowInsets.Builder().setVisible(ime(), false).build();
doReturn(windowInsets).when(mockShadeWindowView).getRootWindowInsets(); doReturn(windowInsets).when(mockShadeWindowView).getRootWindowInsets();
@@ -357,11 +390,11 @@ public class NavigationBarTest extends SysuiTestCase {
@Test @Test
public void testA11yEventAfterDetach() { public void testA11yEventAfterDetach() {
View v = mNavigationBar.createView(null, /* initialVisibility= */ true); mNavigationBar.init();
mNavigationBar.onViewAttachedToWindow(v); mNavigationBar.onViewAttached();
verify(mNavBarHelper).registerNavTaskStateUpdater(any( verify(mNavBarHelper).registerNavTaskStateUpdater(any(
NavBarHelper.NavbarTaskbarStateUpdater.class)); NavBarHelper.NavbarTaskbarStateUpdater.class));
mNavigationBar.onViewDetachedFromWindow(v); mNavigationBar.onViewDetached();
verify(mNavBarHelper).removeNavTaskStateUpdater(any( verify(mNavBarHelper).removeNavTaskStateUpdater(any(
NavBarHelper.NavbarTaskbarStateUpdater.class)); NavBarHelper.NavbarTaskbarStateUpdater.class));
@@ -371,23 +404,31 @@ public class NavigationBarTest extends SysuiTestCase {
@Test @Test
public void testCreateView_initiallyVisible_viewIsVisible() { public void testCreateView_initiallyVisible_viewIsVisible() {
mNavigationBar.createView(null, /* initialVisibility= */ true); when(mStatusBarKeyguardViewManager.isNavBarVisible()).thenReturn(true);
mNavigationBar.init();
mNavigationBar.onViewAttached();
assertThat(mNavigationBar.getView().getVisibility()).isEqualTo(View.VISIBLE); verify(mNavigationBarView).setVisibility(View.VISIBLE);
} }
@Test @Test
public void testCreateView_initiallyNotVisible_viewIsNotVisible() { public void testCreateView_initiallyNotVisible_viewIsNotVisible() {
mNavigationBar.createView(null, /* initialVisibility= */ false); when(mStatusBarKeyguardViewManager.isNavBarVisible()).thenReturn(false);
mNavigationBar.init();
mNavigationBar.onViewAttached();
assertThat(mNavigationBar.getView().getVisibility()).isEqualTo(View.INVISIBLE); verify(mNavigationBarView).setVisibility(View.INVISIBLE);
} }
private NavigationBar createNavBar(Context context) { private NavigationBar createNavBar(Context context) {
DeviceProvisionedController deviceProvisionedController = DeviceProvisionedController deviceProvisionedController =
mock(DeviceProvisionedController.class); mock(DeviceProvisionedController.class);
when(deviceProvisionedController.isDeviceProvisioned()).thenReturn(true); when(deviceProvisionedController.isDeviceProvisioned()).thenReturn(true);
return spy(new NavigationBar(context, return spy(new NavigationBar(
mNavigationBarView,
mNavigationBarFrame,
null,
context,
mWindowManager, mWindowManager,
() -> mAssistManager, () -> mAssistManager,
mock(AccessibilityManager.class), mock(AccessibilityManager.class),
@@ -396,6 +437,7 @@ public class NavigationBarTest extends SysuiTestCase {
mOverviewProxyService, mOverviewProxyService,
mNavigationModeController, mNavigationModeController,
mStatusBarStateController, mStatusBarStateController,
mStatusBarKeyguardViewManager,
mMockSysUiState, mMockSysUiState,
mBroadcastDispatcher, mBroadcastDispatcher,
mCommandQueue, mCommandQueue,
@@ -415,6 +457,8 @@ public class NavigationBarTest extends SysuiTestCase {
mAutoHideControllerFactory, mAutoHideControllerFactory,
Optional.of(mTelecomManager), Optional.of(mTelecomManager),
mInputMethodManager, mInputMethodManager,
mDeadZone,
mDeviceConfigProxyFake,
Optional.of(mock(BackAnimation.class)))); Optional.of(mock(BackAnimation.class))));
} }