Merge "Only ripple rotate btn if attached to window" into pi-dev

am: 412a362c74

Change-Id: Ic50d17e4cca85c35899961a9cc3c250478d264f1
This commit is contained in:
Mike Digman
2018-04-26 09:20:34 -07:00
committed by android-build-merger

View File

@@ -521,7 +521,7 @@ public class NavigationBarFragment extends Fragment implements Callbacks {
// Clear any pending suggestion flag as it has either been nullified or is being shown
mPendingRotationSuggestion = false;
getView().removeCallbacks(mCancelPendingRotationProposal);
if (getView() != null) getView().removeCallbacks(mCancelPendingRotationProposal);
// Handle the visibility change and animation
if (visible) { // Appear and change (cannot force)
@@ -1141,6 +1141,7 @@ public class NavigationBarFragment extends Fragment implements Callbacks {
private final Runnable mRipple = new Runnable() {
@Override
public void run() { // Cause the ripple to fire via false presses
if (!mRoot.isAttachedToWindow()) return;
mRoot.setPressed(true);
mRoot.setPressed(false);
}