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

Don\'t remove background when resizing

Browse Source 
am: 971d8e6

* commit '971d8e6399d556302b52a92dd29abf44830a587c':
  Don't remove background when resizing

Change-Id: I145e0843c11bfbcd61952e24d5fb0fd81f42c2a1
This commit is contained in:
Jorim Jaggi
2016-04-12 18:54:02 +00:00
committed by android-build-merger
parent 1fca99a0c6 971d8e6399
commit 90fde3948d
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/com/android/internal/policy/DecorView.java
View File

@@ -210,7 +210,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
private Drawable mResizingBackgroundDrawable; private Drawable mResizingBackgroundDrawable;
private Drawable mCaptionBackgroundDrawable; private Drawable mCaptionBackgroundDrawable;
private Drawable mUserCaptionBackgroundDrawable; private Drawable mUserCaptionBackgroundDrawable;
private Drawable mOriginalBackgroundDrawable;
private float mAvailableWidth; private float mAvailableWidth;
@@ -891,11 +890,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
mBackgroundPadding.setEmpty(); mBackgroundPadding.setEmpty();
} }
drawableChanged(); 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(); updateElevation();
updateColorViews(null /* insets */, false); updateColorViews(null /* insets */, false);
mOriginalBackgroundDrawable = getBackground();
setBackgroundDrawable(null);
} }
mResizeMode = resizeMode; mResizeMode = resizeMode;
getViewRootImpl().requestInvalidateRootRenderNode(); getViewRootImpl().requestInvalidateRootRenderNode();
@@ -1974,10 +1965,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
updateColorViews(null /* insets */, false); updateColorViews(null /* insets */, false);
mResizeMode = RESIZE_MODE_INVALID; mResizeMode = RESIZE_MODE_INVALID;
getViewRootImpl().requestInvalidateRootRenderNode(); getViewRootImpl().requestInvalidateRootRenderNode();
if (mOriginalBackgroundDrawable != null) {
setBackgroundDrawable(mOriginalBackgroundDrawable);
mOriginalBackgroundDrawable = null;
}
} }
@Override @Override