diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java | 15 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java | 22 |
2 files changed, 13 insertions, 24 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java index 6c1a4faa03a4..7b6efd82f519 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java @@ -178,7 +178,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback // Send the assistant availability upon connection if (isConnected) { - mNavigationBarView.setAssistantAvailable(mAssistantAvailable); + sendAssistantAvailability(mAssistantAvailable); } } @@ -235,7 +235,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback boolean available = mAssistManager .getAssistInfoForUser(UserHandle.USER_CURRENT) != null; if (mAssistantAvailable != available) { - mNavigationBarView.setAssistantAvailable(available); + sendAssistantAvailability(available); mAssistantAvailable = available; } } @@ -900,6 +900,17 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback mNavigationBarView.setAccessibilityButtonState(showAccessibilityButton, targetSelection); } + private void sendAssistantAvailability(boolean available) { + if (mOverviewProxyService.getProxy() != null) { + try { + mOverviewProxyService.getProxy().onAssistantAvailable(available + && QuickStepContract.isGesturalMode(getContext())); + } catch (RemoteException e) { + Log.w(TAG, "Unable to send assistant availability data to launcher"); + } + } + } + // ----- Methods that DisplayNavigationBarController talks to ----- /** Applies auto dimming animation on navigation bar when touched. */ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java index a45d86ef0dfe..411378f1bf07 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -145,7 +145,6 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav private NotificationPanelView mPanelView; private NavBarTintController mTintController; - private boolean mAssistantAvailable; /** * Helper that is responsible for showing the right toast when a disallowed activity operation @@ -759,23 +758,6 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav mEdgeBackGestureHandler.onOverlaysChanged(); } - public void setAssistantAvailable(boolean available) { - mAssistantAvailable = available; - updateAssistantAvailability(); - } - - // TODO(b/112934365): move this back to NavigationBarFragment when prototype is removed - private void updateAssistantAvailability() { - boolean available = mAssistantAvailable && QuickStepContract.isGesturalMode(getContext()); - if (mOverviewProxyService.getProxy() != null) { - try { - mOverviewProxyService.getProxy().onAssistantAvailable(available); - } catch (RemoteException e) { - Log.w(TAG, "Unable to send assistant availability data to launcher"); - } - } - } - public void setMenuVisibility(final boolean show) { mContextualButtonGroup.setButtonVisiblity(R.id.menu, show); } @@ -898,10 +880,6 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav public void showPinningEnterExitToast(boolean entering) { if (entering) { mScreenPinningNotify.showPinningStartToast(); - - // TODO(b/112934365): remove after prototype finished, only needed to escape from pin - getBackButton().setVisibility(VISIBLE); - getHomeButton().setVisibility(VISIBLE); } else { mScreenPinningNotify.showPinningExitToast(); } |