diff options
author | Romain Guy <romainguy@google.com> | 2011-07-08 11:57:29 -0700 |
---|---|---|
committer | Romain Guy <romainguy@google.com> | 2011-07-08 11:57:29 -0700 |
commit | b2479153b743df9e54f7e17c7132a5ecd87fa453 (patch) | |
tree | 9c57ccc10e57d9743dfa0bbc92b41ba0a060c85b | |
parent | cfacbeadffb5dccbf0434d9c05b19430a5237c3b (diff) | |
download | frameworks_base-b2479153b743df9e54f7e17c7132a5ecd87fa453.zip frameworks_base-b2479153b743df9e54f7e17c7132a5ecd87fa453.tar.gz frameworks_base-b2479153b743df9e54f7e17c7132a5ecd87fa453.tar.bz2 |
Correctly position layers.
Change-Id: I1678b1c5bdab140b44e56556c50ab8329255f18a
-rw-r--r-- | core/java/android/view/ViewGroup.java | 3 | ||||
-rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 41412de..e6fdb17 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -46,7 +46,6 @@ import com.android.internal.util.Predicate; import java.util.ArrayList; import java.util.HashSet; -import java.util.Locale; /** * <p> @@ -5019,7 +5018,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager */ @Override protected void resolveTextDirection() { - int resolvedTextDirection = TEXT_DIRECTION_UNDEFINED; + int resolvedTextDirection; switch(mTextDirection) { default: case TEXT_DIRECTION_INHERIT: diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 06e3b29..a349121 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -673,11 +673,11 @@ void OpenGLRenderer::composeLayerRect(Layer* layer, const Rect& rect, bool swap) float x = rect.left; float y = rect.top; - bool simpleTransform = mSnapshot->transform->isPureTranslate(); - - if (simpleTransform && + bool simpleTransform = mSnapshot->transform->isPureTranslate() && layer->getWidth() == (uint32_t) rect.getWidth() && - layer->getHeight() == (uint32_t) rect.getHeight()) { + layer->getHeight() == (uint32_t) rect.getHeight(); + + if (simpleTransform) { // When we're swapping, the layer is already in screen coordinates if (!swap) { x = (int) floorf(rect.left + mSnapshot->transform->getTranslateX() + 0.5f); |