diff options
| author | John Reck <jreck@google.com> | 2014-12-09 23:12:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-09 23:12:42 +0000 |
| commit | 4f1942d999c60fd91cb826651b6d978d47a74321 (patch) | |
| tree | 4ba55bba29606543e959f5cf648f341805080e9a /libs | |
| parent | 3ef5033cdacbc44702d0b6ba687e81383348e2fd (diff) | |
| parent | dad7d84c04c5954b63ea8bb58c52b2291f44b4df (diff) | |
| download | frameworks_base-4f1942d999c60fd91cb826651b6d978d47a74321.zip frameworks_base-4f1942d999c60fd91cb826651b6d978d47a74321.tar.gz frameworks_base-4f1942d999c60fd91cb826651b6d978d47a74321.tar.bz2 | |
Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/DisplayListOp.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/hwui/DisplayListOp.h b/libs/hwui/DisplayListOp.h index d78c1cb..96e76d0 100644 --- a/libs/hwui/DisplayListOp.h +++ b/libs/hwui/DisplayListOp.h @@ -720,7 +720,8 @@ public: } virtual void output(int level, uint32_t logFlags) const { - OP_LOG("Draw bitmap %p at %f %f", mBitmap, mLocalBounds.left, mLocalBounds.top); + OP_LOG("Draw bitmap %p at %f %f%s", mBitmap, mLocalBounds.left, mLocalBounds.top, + mEntry ? " using AssetAtlas" : ""); } virtual const char* name() { return "DrawBitmap"; } @@ -954,7 +955,8 @@ public: } virtual void output(int level, uint32_t logFlags) const { - OP_LOG("Draw patch " RECT_STRING, RECT_ARGS(mLocalBounds)); + OP_LOG("Draw patch " RECT_STRING "%s", RECT_ARGS(mLocalBounds), + mEntry ? " with AssetAtlas" : ""); } virtual const char* name() { return "DrawPatch"; } |