Loading core/java/android/view/ViewGroup.java +1 −2 Original line number Diff line number Diff line Loading @@ -46,7 +46,6 @@ import com.android.internal.util.Predicate; import java.util.ArrayList; import java.util.HashSet; import java.util.Locale; /** * <p> Loading Loading @@ -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: Loading libs/hwui/OpenGLRenderer.cpp +4 −4 Original line number Diff line number Diff line Loading @@ -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); Loading Loading
core/java/android/view/ViewGroup.java +1 −2 Original line number Diff line number Diff line Loading @@ -46,7 +46,6 @@ import com.android.internal.util.Predicate; import java.util.ArrayList; import java.util.HashSet; import java.util.Locale; /** * <p> Loading Loading @@ -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: Loading
libs/hwui/OpenGLRenderer.cpp +4 −4 Original line number Diff line number Diff line Loading @@ -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); Loading