Don\'t remove background when resizing am: 971d8e6

am: 90fde39

* commit '90fde3948d6cdd5b2bc615b60319cf39bf74423f':
  Don't remove background when resizing

Change-Id: I764fe74e93f6ef69872129e30570694cf45a0c77
This commit is contained in:
Jorim Jaggi
2016-04-12 19:00:57 +00:00
committed by android-build-merger

View File

@@ -210,7 +210,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
private Drawable mResizingBackgroundDrawable;
private Drawable mCaptionBackgroundDrawable;
private Drawable mUserCaptionBackgroundDrawable;
private Drawable mOriginalBackgroundDrawable;
private float mAvailableWidth;
@@ -891,11 +890,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
mBackgroundPadding.setEmpty();
}
drawableChanged();
// Make sure we don't reset to the old drawable when finishing resizing.
if (mResizeMode != RESIZE_MODE_INVALID) {
mOriginalBackgroundDrawable = null;
}
}
}
@@ -1960,9 +1954,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
updateElevation();
updateColorViews(null /* insets */, false);
mOriginalBackgroundDrawable = getBackground();
setBackgroundDrawable(null);
}
mResizeMode = resizeMode;
getViewRootImpl().requestInvalidateRootRenderNode();
@@ -1974,10 +1965,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
updateColorViews(null /* insets */, false);
mResizeMode = RESIZE_MODE_INVALID;
getViewRootImpl().requestInvalidateRootRenderNode();
if (mOriginalBackgroundDrawable != null) {
setBackgroundDrawable(mOriginalBackgroundDrawable);
mOriginalBackgroundDrawable = null;
}
}
@Override