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

Merge "Update onboarding based on swipe up state" into pi-dev

Browse Source
This commit is contained in:
Winson Chung
2018-03-27 16:43:14 +00:00
committed by Android (Google) Code Review
parent a9975804a2 f9e302704a
commit 5995d21a93
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,7 +171,7 @@ public class NavigationBarFragment extends Fragment implements Callbacks {
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.onOverviewProxyConnectionChanged(isConnected); mNavigationBarView.updateStates();
updateScreenPinningGestures(); updateScreenPinningGestures();
WindowManagerWrapper.getInstance() WindowManagerWrapper.getInstance()
.setNavBarVirtualKeyHapticFeedbackEnabled(!isConnected); .setNavBarVirtualKeyHapticFeedbackEnabled(!isConnected);
@@ -188,6 +188,7 @@ public class NavigationBarFragment extends Fragment implements Callbacks {
@Override @Override
public void onInteractionFlagsChanged(@InteractionType int flags) { public void onInteractionFlagsChanged(@InteractionType int flags) {
mNavigationBarView.updateStates(); mNavigationBarView.updateStates();
updateScreenPinningGestures();
} }
}; };

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

@@ -681,6 +681,7 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav
updateSlippery(); updateSlippery();
reloadNavIcons(); reloadNavIcons();
updateNavButtonIcons(); updateNavButtonIcons();
setUpSwipeUpOnboarding(isQuickStepSwipeUpEnabled());
} }
private void updateSlippery() { private void updateSlippery() {
@@ -816,11 +817,6 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav
} }
} }
public void onOverviewProxyConnectionChanged(boolean isConnected) {
updateStates();
setUpSwipeUpOnboarding(isQuickStepSwipeUpEnabled());
}
@Override @Override
protected void onDraw(Canvas canvas) { protected void onDraw(Canvas canvas) {
mGestureHelper.onDraw(canvas); mGestureHelper.onDraw(canvas);
@@ -1045,7 +1041,7 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav
onPluginDisconnected(null); // Create default gesture helper onPluginDisconnected(null); // Create default gesture helper
Dependency.get(PluginManager.class).addPluginListener(this, Dependency.get(PluginManager.class).addPluginListener(this,
NavGesture.class, false /* Only one */); NavGesture.class, false /* Only one */);
setUpSwipeUpOnboarding(mOverviewProxyService.getProxy() != null); setUpSwipeUpOnboarding(isQuickStepSwipeUpEnabled());
} }
@Override @Override