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

Merge "Clean up left over prototype code in Navigation Bar" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-23 20:12:16 +00:00
committed by Android (Google) Code Review
parent b4a49aa45b cf71ead51f
commit 6db82f8965
2 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java
View File

@@ -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;
}
}
@@ -903,6 +903,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. */

22
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
View File

@@ -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();
}