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

Merge "App compat"

Browse Source
This commit is contained in:
John Reck
2014-03-13 22:06:23 +00:00
committed by Android (Google) Code Review
parent 3b98789a0e 40503f9f8c
commit 19caf39612
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/view/View.java
View File

@@ -13953,7 +13953,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @return A new or reused DisplayList object.
*/
private DisplayList getDisplayList(DisplayList displayList, boolean isLayer) {
if (!canHaveDisplayList()) {
final HardwareRenderer renderer = getHardwareRenderer();
if (renderer == null || !canHaveDisplayList()) {
return null;
}
@@ -14032,13 +14033,21 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
}
}
} finally {
displayList.end(getHardwareRenderer(), canvas);
displayList.end(renderer, canvas);
displayList.setCaching(caching);
if (isLayer) {
displayList.setLeftTopRightBottom(0, 0, width, height);
} else {
setDisplayListProperties(displayList);
}
if (renderer != getHardwareRenderer()) {
Log.w(VIEW_LOG_TAG, "View was detached during a draw() call!");
// TODO: Should this be elevated to a crash?
// For now have it behaves the same as it previously did, it
// will result in the DisplayListData being destroyed later
// than it could be but oh well...
}
}
} else if (!isLayer) {
mPrivateFlags |= PFLAG_DRAWN | PFLAG_DRAWING_CACHE_VALID;