summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2010-09-13 12:52:37 -0700
committerRomain Guy <romainguy@google.com>2010-09-13 12:52:37 -0700
commit58ef7fbf16864164efe98bf613b15c64deb1afc0 (patch)
treee49d5f8e7289d6ba0037def1a99535f653037134
parentba15633a2267fb167f1496852be5dd394686d2c5 (diff)
downloadframeworks_base-58ef7fbf16864164efe98bf613b15c64deb1afc0.zip
frameworks_base-58ef7fbf16864164efe98bf613b15c64deb1afc0.tar.gz
frameworks_base-58ef7fbf16864164efe98bf613b15c64deb1afc0.tar.bz2
Forces windows to draw the first time they show.
Change-Id: I239572ee49bc60f30d957f548104e75844859a93
-rw-r--r--core/java/android/view/ViewRoot.java10
-rw-r--r--libs/hwui/FontRenderer.cpp2
2 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java
index 62d30ee..7b20b8b 100644
--- a/core/java/android/view/ViewRoot.java
+++ b/core/java/android/view/ViewRoot.java
@@ -1256,6 +1256,11 @@ public final class ViewRoot extends Handler implements ViewParent, View.AttachIn
dirty.setEmpty();
return;
}
+
+ if (fullRedrawNeeded) {
+ mAttachInfo.mIgnoreDirtyState = true;
+ dirty.union(0, 0, (int) (mWidth * appScale + 0.5f), (int) (mHeight * appScale + 0.5f));
+ }
if (mHwRenderer != null && mHwRenderer.isEnabled()) {
if (!dirty.isEmpty()) {
@@ -1270,11 +1275,6 @@ public final class ViewRoot extends Handler implements ViewParent, View.AttachIn
return;
}
- if (fullRedrawNeeded) {
- mAttachInfo.mIgnoreDirtyState = true;
- dirty.union(0, 0, (int) (mWidth * appScale + 0.5f), (int) (mHeight * appScale + 0.5f));
- }
-
if (DEBUG_ORIENTATION || DEBUG_DRAW) {
Log.v(TAG, "Draw " + mView + "/"
+ mWindowAttributes.getTitle()
diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp
index 6bcaef6..2959814 100644
--- a/libs/hwui/FontRenderer.cpp
+++ b/libs/hwui/FontRenderer.cpp
@@ -166,7 +166,7 @@ void Font::measureUTF(SkPaint* paint, const char* text, uint32_t start, uint32_t
renderUTF(paint, text, start, len, numGlyphs, 0, 0, MEASURE, NULL, 0, 0, bounds);
}
-#define SkAutoKern_AdjustF(prev, next) (((next) - (prev) + 32) >> 6 << 16)
+#define SkAutoKern_AdjustF(prev, next) (((next) - (prev) + 32) >> 6 << 16)
void Font::renderUTF(SkPaint* paint, const char* text, uint32_t start, uint32_t len,
int numGlyphs, int x, int y, RenderMode mode, uint8_t *bitmap,