Fix bug #6427629 Clean up layout direction APIs

Fabrice Di Meglio · Fabrice Di Meglio · commit e56ffdc7b31b · 2012-09-23T14:51:16.000-07:00
- rename getResolvedLayoutDirection() to getLayoutDirection()

Change-Id: I3afe56c0db0751952f5056c23893cb7455531d29
diff --git a/api/current.txt b/api/current.txt
@@ -24898,7 +24898,6 @@ package android.view {
     method public android.view.ViewParent getParentForAccessibility();
     method public float getPivotX();
     method public float getPivotY();
-    method public int getResolvedLayoutDirection();
     method public int getResolvedTextAlignment();
     method public int getResolvedTextDirection();
     method public android.content.res.Resources getResources();
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
@@ -3926,7 +3926,7 @@ protected void initializeScrollbars(TypedArray a) {
         }
 
         // Apply layout direction to the new Drawables if needed
-        final int layoutDirection = getResolvedLayoutDirection();
+        final int layoutDirection = getLayoutDirection();
         if (track != null) {
             track.setLayoutDirection(layoutDirection);
         }
@@ -5778,7 +5778,7 @@ public boolean isHapticFeedbackEnabled() {
         @ViewDebug.IntToString(from = LAYOUT_DIRECTION_INHERIT, to = "INHERIT"),
         @ViewDebug.IntToString(from = LAYOUT_DIRECTION_LOCALE,  to = "LOCALE")
     })
-    public int getLayoutDirection() {
+    private int getRawLayoutDirection() {
         return (mPrivateFlags2 & PFLAG2_LAYOUT_DIRECTION_MASK) >> PFLAG2_LAYOUT_DIRECTION_MASK_SHIFT;
     }
 
@@ -5795,7 +5795,7 @@ public int getLayoutDirection() {
      */
     @RemotableViewMethod
     public void setLayoutDirection(int layoutDirection) {
-        if (getLayoutDirection() != layoutDirection) {
+        if (getRawLayoutDirection() != layoutDirection) {
             // Reset the current layout direction and the resolved one
             mPrivateFlags2 &= ~PFLAG2_LAYOUT_DIRECTION_MASK;
             resetRtlProperties();
@@ -5820,7 +5820,7 @@ public void setLayoutDirection(int layoutDirection) {
         @ViewDebug.IntToString(from = LAYOUT_DIRECTION_LTR, to = "RESOLVED_DIRECTION_LTR"),
         @ViewDebug.IntToString(from = LAYOUT_DIRECTION_RTL, to = "RESOLVED_DIRECTION_RTL")
     })
-    public int getResolvedLayoutDirection() {
+    public int getLayoutDirection() {
         final int targetSdkVersion = getContext().getApplicationInfo().targetSdkVersion;
         if (targetSdkVersion < JELLY_BEAN_MR1) {
             mPrivateFlags2 |= PFLAG2_LAYOUT_DIRECTION_RESOLVED;
@@ -5842,7 +5842,7 @@ public int getResolvedLayoutDirection() {
      */
     @ViewDebug.ExportedProperty(category = "layout")
     public boolean isLayoutRtl() {
-        return (getResolvedLayoutDirection() == LAYOUT_DIRECTION_RTL);
+        return (getLayoutDirection() == LAYOUT_DIRECTION_RTL);
     }
 
     /**
@@ -9935,7 +9935,7 @@ public void setLayoutParams(ViewGroup.LayoutParams params) {
      */
     private void resolveLayoutParams() {
         if (mLayoutParams != null) {
-            mLayoutParams.onResolveLayoutDirection(getResolvedLayoutDirection());
+            mLayoutParams.onResolveLayoutDirection(getLayoutDirection());
         }
     }
 
@@ -11560,7 +11560,8 @@ public void resolveLayoutDirection() {
 
         if (hasRtlSupport()) {
             // Set resolved depending on layout direction
-            switch (getLayoutDirection()) {
+            switch ((mPrivateFlags2 & PFLAG2_LAYOUT_DIRECTION_MASK) >>
+                    PFLAG2_LAYOUT_DIRECTION_MASK_SHIFT) {
                 case LAYOUT_DIRECTION_INHERIT:
                     // We cannot resolve yet. LTR is by default and let the resolution happen again
                     // later to get the correct resolved value
@@ -11572,7 +11573,7 @@ public void resolveLayoutDirection() {
                     // resolution happen again later
                     if (!viewGroup.canResolveLayoutDirection()) return;
 
-                    if (viewGroup.getResolvedLayoutDirection() == LAYOUT_DIRECTION_RTL) {
+                    if (viewGroup.getLayoutDirection() == LAYOUT_DIRECTION_RTL) {
                         mPrivateFlags2 |= PFLAG2_LAYOUT_DIRECTION_RESOLVED_RTL;
                     }
                     break;
@@ -11602,7 +11603,8 @@ public void resolveLayoutDirection() {
      * @hide
      */
     public boolean canResolveLayoutDirection() {
-        switch (getLayoutDirection()) {
+        switch ((mPrivateFlags2 & PFLAG2_LAYOUT_DIRECTION_MASK) >>
+                PFLAG2_LAYOUT_DIRECTION_MASK_SHIFT) {
             case LAYOUT_DIRECTION_INHERIT:
                 return (mParent != null) && (mParent instanceof ViewGroup);
             default:
@@ -11620,6 +11622,13 @@ public void resetResolvedLayoutDirection() {
         mPrivateFlags2 &= ~PFLAG2_LAYOUT_DIRECTION_RESOLVED_MASK;
     }
 
+    /**
+     * @hide
+     */
+    public boolean isLayoutDirectionInherited() {
+        return (getRawLayoutDirection() == LAYOUT_DIRECTION_INHERIT);
+    }
+
     /**
      * Return if padding has been resolved
      *
@@ -11659,7 +11668,7 @@ public void resolvePadding() {
             // If start / end padding are defined, they will be resolved (hence overriding) to
             // left / right or right / left depending on the resolved layout direction.
             // If start / end padding are not defined, use the left / right ones.
-            int resolvedLayoutDirection = getResolvedLayoutDirection();
+            int resolvedLayoutDirection = getLayoutDirection();
             // Set user padding to initial values ...
             mUserPaddingLeft = (mUserPaddingLeftInitial == UNDEFINED_PADDING) ?
                     0 : mUserPaddingLeftInitial;
@@ -14101,9 +14110,9 @@ public void unscheduleDrawable(Drawable who) {
      */
     public void resolveDrawables() {
         if (mBackground != null) {
-            mBackground.setLayoutDirection(getResolvedLayoutDirection());
+            mBackground.setLayoutDirection(getLayoutDirection());
         }
-        onResolveDrawables(getResolvedLayoutDirection());
+        onResolveDrawables(getLayoutDirection());
     }
 
     /**
@@ -14390,7 +14399,7 @@ public void setBackgroundDrawable(Drawable background) {
                 padding = new Rect();
                 sThreadLocal.set(padding);
             }
-            background.setLayoutDirection(getResolvedLayoutDirection());
+            background.setLayoutDirection(getLayoutDirection());
             if (background.getPadding(padding)) {
                 resetResolvedPadding();
                 switch (background.getLayoutDirection()) {
@@ -14587,7 +14596,7 @@ public void setPaddingRelative(int start, int top, int end, int bottom) {
         mUserPaddingStart = start;
         mUserPaddingEnd = end;
 
-        switch(getResolvedLayoutDirection()) {
+        switch(getLayoutDirection()) {
             case LAYOUT_DIRECTION_RTL:
                 mUserPaddingLeftInitial = end;
                 mUserPaddingRightInitial = start;
@@ -14646,7 +14655,7 @@ public int getPaddingStart() {
         if (!isPaddingResolved()) {
             resolvePadding();
         }
-        return (getResolvedLayoutDirection() == LAYOUT_DIRECTION_RTL) ?
+        return (getLayoutDirection() == LAYOUT_DIRECTION_RTL) ?
                 mPaddingRight : mPaddingLeft;
     }
 
@@ -14675,7 +14684,7 @@ public int getPaddingEnd() {
         if (!isPaddingResolved()) {
             resolvePadding();
         }
-        return (getResolvedLayoutDirection() == LAYOUT_DIRECTION_RTL) ?
+        return (getLayoutDirection() == LAYOUT_DIRECTION_RTL) ?
                 mPaddingLeft : mPaddingRight;
     }
 
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
@@ -3392,7 +3392,7 @@ private void addViewInner(View child, int index, LayoutParams params,
             childHasTransientStateChanged(child, true);
         }
 
-        if (child.getLayoutDirection() == View.LAYOUT_DIRECTION_INHERIT) {
+        if (child.isLayoutDirectionInherited()) {
             child.resetResolvedLayoutDirection();
             child.resolveRtlProperties();
         }
@@ -5268,7 +5268,7 @@ public void resetResolvedLayoutDirection() {
         int count = getChildCount();
         for (int i = 0; i < count; i++) {
             final View child = getChildAt(i);
-            if (child.getLayoutDirection() == LAYOUT_DIRECTION_INHERIT) {
+            if (child.isLayoutDirectionInherited()) {
                 child.resetResolvedLayoutDirection();
             }
             if (child.getTextDirection() == TEXT_DIRECTION_INHERIT) {
@@ -6155,7 +6155,7 @@ private void init(ViewGroup root, View view) {
             view.getDrawingRect(viewLocation);
             root.offsetDescendantRectToMyCoords(view, viewLocation);
             mView = view;
-            mLayoutDirection = root.getResolvedLayoutDirection();
+            mLayoutDirection = root.getLayoutDirection();
         }
 
         private void clear() {
diff --git a/core/java/android/widget/AbsSeekBar.java b/core/java/android/widget/AbsSeekBar.java
@@ -108,7 +108,7 @@ public void setThumb(Drawable thumb) {
         if (thumb != null) {
             thumb.setCallback(this);
             if (canResolveLayoutDirection()) {
-                thumb.setLayoutDirection(getResolvedLayoutDirection());
+                thumb.setLayoutDirection(getLayoutDirection());
             }
 
             // Assuming the thumb drawable is symmetric, set the thumb offset
diff --git a/core/java/android/widget/AutoCompleteTextView.java b/core/java/android/widget/AutoCompleteTextView.java
@@ -16,7 +16,6 @@
 
 package android.widget;
 
-import android.app.SearchManager.OnDismissListener;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.database.DataSetObserver;
@@ -1094,7 +1093,7 @@ public void showDropDown() {
             mPopup.setInputMethodMode(ListPopupWindow.INPUT_METHOD_NEEDED);
             mPopup.setListItemExpandMax(EXPAND_MAX);
         }
-        mPopup.setLayoutDirection(getResolvedLayoutDirection());
+        mPopup.setLayoutDirection(getLayoutDirection());
         mPopup.show();
         mPopup.getListView().setOverScrollMode(View.OVER_SCROLL_ALWAYS);
     }
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
@@ -88,9 +88,6 @@
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView.OnItemClickListener;
-import android.widget.Editor.InputContentType;
-import android.widget.Editor.InputMethodState;
-import android.widget.Editor.SelectionModifierCursorController;
 import android.widget.TextView.Drawables;
 import android.widget.TextView.OnEditorActionListener;
 
@@ -292,7 +289,7 @@ public void setError(CharSequence error, Drawable icon) {
         mErrorWasChanged = true;
         final Drawables dr = mTextView.mDrawables;
         if (dr != null) {
-            switch (mTextView.getResolvedLayoutDirection()) {
+            switch (mTextView.getLayoutDirection()) {
                 default:
                 case View.LAYOUT_DIRECTION_LTR:
                     mTextView.setCompoundDrawables(dr.mDrawableLeft, dr.mDrawableTop, icon,
diff --git a/core/java/android/widget/FrameLayout.java b/core/java/android/widget/FrameLayout.java
@@ -411,7 +411,7 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
                     gravity = DEFAULT_CHILD_GRAVITY;
                 }
 
-                final int layoutDirection = getResolvedLayoutDirection();
+                final int layoutDirection = getLayoutDirection();
                 final int absoluteGravity = Gravity.getAbsoluteGravity(gravity, layoutDirection);
                 final int verticalGravity = gravity & Gravity.VERTICAL_GRAVITY_MASK;
 
@@ -483,7 +483,7 @@ public void draw(Canvas canvas) {
                     selfBounds.set(mPaddingLeft, mPaddingTop, w - mPaddingRight, h - mPaddingBottom);
                 }
 
-                final int layoutDirection = getResolvedLayoutDirection();
+                final int layoutDirection = getLayoutDirection();
                 Gravity.apply(mForegroundGravity, foreground.getIntrinsicWidth(),
                         foreground.getIntrinsicHeight(), selfBounds, overlayBounds,
                         layoutDirection);
diff --git a/core/java/android/widget/GridView.java b/core/java/android/widget/GridView.java
@@ -1425,7 +1425,7 @@ private void setupChild(View child, int position, int y, boolean flow, int child
         int childLeft;
         final int childTop = flow ? y : y - h;
 
-        final int layoutDirection = getResolvedLayoutDirection();
+        final int layoutDirection = getLayoutDirection();
         final int absoluteGravity = Gravity.getAbsoluteGravity(mGravity, layoutDirection);
         switch (absoluteGravity & Gravity.HORIZONTAL_GRAVITY_MASK) {
             case Gravity.LEFT:
diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java
@@ -680,7 +680,7 @@ private void updateDrawable(Drawable d) {
                 d.setState(getDrawableState());
             }
             d.setLevel(mLevel);
-            d.setLayoutDirection(getResolvedLayoutDirection());
+            d.setLayoutDirection(getLayoutDirection());
             mDrawableWidth = d.getIntrinsicWidth();
             mDrawableHeight = d.getIntrinsicHeight();
             applyColorMod();
diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java
@@ -1495,7 +1495,7 @@ void layoutVertical() {
                 if (gravity < 0) {
                     gravity = minorGravity;
                 }
-                final int layoutDirection = getResolvedLayoutDirection();
+                final int layoutDirection = getLayoutDirection();
                 final int absoluteGravity = Gravity.getAbsoluteGravity(gravity, layoutDirection);
                 switch (absoluteGravity & Gravity.HORIZONTAL_GRAVITY_MASK) {
                     case Gravity.CENTER_HORIZONTAL:
@@ -1559,7 +1559,7 @@ void layoutHorizontal() {
         final int[] maxAscent = mMaxAscent;
         final int[] maxDescent = mMaxDescent;
 
-        final int layoutDirection = getResolvedLayoutDirection();
+        final int layoutDirection = getLayoutDirection();
         switch (Gravity.getAbsoluteGravity(majorGravity, layoutDirection)) {
             case Gravity.RIGHT:
                 // mTotalLength contains the padding already
diff --git a/core/java/android/widget/ProgressBar.java b/core/java/android/widget/ProgressBar.java
@@ -479,7 +479,7 @@ public void setIndeterminateDrawable(Drawable d) {
         }
         mIndeterminateDrawable = d;
         if (mIndeterminateDrawable != null && canResolveLayoutDirection()) {
-            mIndeterminateDrawable.setLayoutDirection(getResolvedLayoutDirection());
+            mIndeterminateDrawable.setLayoutDirection(getLayoutDirection());
         }
         if (mIndeterminate) {
             mCurrentDrawable = d;
@@ -521,7 +521,7 @@ public void setProgressDrawable(Drawable d) {
         if (d != null) {
             d.setCallback(this);
             if (canResolveLayoutDirection()) {
-                d.setLayoutDirection(getResolvedLayoutDirection());
+                d.setLayoutDirection(getLayoutDirection());
             }
 
             // Make sure the ProgressBar is always tall enough
@@ -672,7 +672,7 @@ private synchronized void doRefreshProgress(int id, int progress, boolean fromUs
             if (d instanceof LayerDrawable) {
                 progressDrawable = ((LayerDrawable) d).findDrawableByLayerId(id);
                 if (progressDrawable != null && canResolveLayoutDirection()) {
-                    progressDrawable.setLayoutDirection(getResolvedLayoutDirection());
+                    progressDrawable.setLayoutDirection(getLayoutDirection());
                 }
             }
 
diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java
@@ -483,7 +483,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
             }
         }
 
-        final int layoutDirection = getResolvedLayoutDirection();
+        final int layoutDirection = getLayoutDirection();
 
         if (isWrapContentWidth) {
             // Width already has left padding in it since it was calculated by looking at
@@ -578,7 +578,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     }
 
     private void alignBaseline(View child, LayoutParams params) {
-        final int layoutDirection = getResolvedLayoutDirection();
+        final int layoutDirection = getLayoutDirection();
         int[] rules = params.getRules(layoutDirection);
         int anchorBaseline = getRelatedViewBaseline(rules, ALIGN_BASELINE);
 
@@ -727,7 +727,7 @@ private int getChildMeasureSpec(int childStart, int childEnd,
     private boolean positionChildHorizontal(View child, LayoutParams params, int myWidth,
             boolean wrapContent) {
 
-        final int layoutDirection = getResolvedLayoutDirection();
+        final int layoutDirection = getLayoutDirection();
         int[] rules = params.getRules(layoutDirection);
         params.onResolveLayoutDirection(layoutDirection);
 
@@ -792,7 +792,7 @@ private boolean positionChildVertical(View child, LayoutParams params, int myHei
     }
 
     private void applyHorizontalSizeRules(LayoutParams childParams, int myWidth) {
-        final int layoutDirection = getResolvedLayoutDirection();
+        final int layoutDirection = getLayoutDirection();
         int[] rules = childParams.getRules(layoutDirection);
         RelativeLayout.LayoutParams anchorParams;
 
@@ -983,7 +983,7 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
             if (child.getVisibility() != GONE) {
                 RelativeLayout.LayoutParams st =
                         (RelativeLayout.LayoutParams) child.getLayoutParams();
-                st.onResolveLayoutDirection(getResolvedLayoutDirection());
+                st.onResolveLayoutDirection(getLayoutDirection());
                 child.layout(st.mLeft, st.mTop, st.mRight, st.mBottom);
             }
         }
diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java
@@ -1355,7 +1355,7 @@ public void onNothingSelected(AdapterView<?> parent) {
 
     @Override
     public void onRtlPropertiesChanged() {
-        mQueryTextView.setLayoutDirection(getResolvedLayoutDirection());
+        mQueryTextView.setLayoutDirection(getLayoutDirection());
     }
 
     /**
diff --git a/core/java/android/widget/Spinner.java b/core/java/android/widget/Spinner.java
@@ -492,7 +492,7 @@ void layout(int delta, boolean animate) {
         View sel = makeAndAddView(mSelectedPosition);
         int width = sel.getMeasuredWidth();
         int selectedOffset = childrenLeft;
-        final int layoutDirection = getResolvedLayoutDirection();
+        final int layoutDirection = getLayoutDirection();
         final int absoluteGravity = Gravity.getAbsoluteGravity(mGravity, layoutDirection);
         switch (absoluteGravity & Gravity.HORIZONTAL_GRAVITY_MASK) {
             case Gravity.CENTER_HORIZONTAL:
diff --git a/core/java/android/widget/TableRow.java b/core/java/android/widget/TableRow.java
@@ -226,7 +226,7 @@ void measureChildBeforeLayout(View child, int childIndex,
                 final int childWidth = child.getMeasuredWidth();
                 lp.mOffset[LayoutParams.LOCATION_NEXT] = columnWidth - childWidth;
 
-                final int layoutDirection = getResolvedLayoutDirection();
+                final int layoutDirection = getLayoutDirection();
                 final int absoluteGravity = Gravity.getAbsoluteGravity(gravity, layoutDirection);
                 switch (absoluteGravity & Gravity.HORIZONTAL_GRAVITY_MASK) {
                     case Gravity.LEFT:
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
diff --git a/core/java/com/android/internal/view/menu/IconMenuItemView.java b/core/java/com/android/internal/view/menu/IconMenuItemView.java
diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java
diff --git a/core/java/com/android/internal/widget/multiwaveview/GlowPadView.java b/core/java/com/android/internal/widget/multiwaveview/GlowPadView.java
diff --git a/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java b/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java

Original file line number	Diff line number	Diff line change
`@@ -3392,7 +3392,7 @@ private void addViewInner(View child, int index, LayoutParams params,`
`3392`	`3392`	`childHasTransientStateChanged(child, true);`
`3393`	`3393`	`}`
`3394`	`3394`
`3395`		`- if (child.getLayoutDirection() == View.LAYOUT_DIRECTION_INHERIT) {`
	`3395`	`+ if (child.isLayoutDirectionInherited()) {`
`3396`	`3396`	`child.resetResolvedLayoutDirection();`
`3397`	`3397`	`child.resolveRtlProperties();`
`3398`	`3398`	`}`
`@@ -5268,7 +5268,7 @@ public void resetResolvedLayoutDirection() {`
`5268`	`5268`	`int count = getChildCount();`
`5269`	`5269`	`for (int i = 0; i < count; i++) {`
`5270`	`5270`	`final View child = getChildAt(i);`
`5271`		`- if (child.getLayoutDirection() == LAYOUT_DIRECTION_INHERIT) {`
	`5271`	`+ if (child.isLayoutDirectionInherited()) {`
`5272`	`5272`	`child.resetResolvedLayoutDirection();`
`5273`	`5273`	`}`
`5274`	`5274`	`if (child.getTextDirection() == TEXT_DIRECTION_INHERIT) {`
`@@ -6155,7 +6155,7 @@ private void init(ViewGroup root, View view) {`
`6155`	`6155`	`view.getDrawingRect(viewLocation);`
`6156`	`6156`	`root.offsetDescendantRectToMyCoords(view, viewLocation);`
`6157`	`6157`	`mView = view;`
`6158`		`- mLayoutDirection = root.getResolvedLayoutDirection();`
	`6158`	`+ mLayoutDirection = root.getLayoutDirection();`
`6159`	`6159`	`}`
`6160`	`6160`
`6161`	`6161`	`private void clear() {`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public void setThumb(Drawable thumb) {`
`108`	`108`	`if (thumb != null) {`
`109`	`109`	`thumb.setCallback(this);`
`110`	`110`	`if (canResolveLayoutDirection()) {`
`111`		`- thumb.setLayoutDirection(getResolvedLayoutDirection());`
	`111`	`+ thumb.setLayoutDirection(getLayoutDirection());`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`// Assuming the thumb drawable is symmetric, set the thumb offset`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`
`17`	`17`	`package android.widget;`
`18`	`18`
`19`		`-import android.app.SearchManager.OnDismissListener;`
`20`	`19`	`import android.content.Context;`
`21`	`20`	`import android.content.res.TypedArray;`
`22`	`21`	`import android.database.DataSetObserver;`
`@@ -1094,7 +1093,7 @@ public void showDropDown() {`
`1094`	`1093`	`mPopup.setInputMethodMode(ListPopupWindow.INPUT_METHOD_NEEDED);`
`1095`	`1094`	`mPopup.setListItemExpandMax(EXPAND_MAX);`
`1096`	`1095`	`}`
`1097`		`- mPopup.setLayoutDirection(getResolvedLayoutDirection());`
	`1096`	`+ mPopup.setLayoutDirection(getLayoutDirection());`
`1098`	`1097`	`mPopup.show();`
`1099`	`1098`	`mPopup.getListView().setOverScrollMode(View.OVER_SCROLL_ALWAYS);`
`1100`	`1099`	`}`
Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto`
`411`	`411`	`gravity = DEFAULT_CHILD_GRAVITY;`
`412`	`412`	`}`
`413`	`413`
`414`		`- final int layoutDirection = getResolvedLayoutDirection();`
	`414`	`+ final int layoutDirection = getLayoutDirection();`
`415`	`415`	`final int absoluteGravity = Gravity.getAbsoluteGravity(gravity, layoutDirection);`
`416`	`416`	`final int verticalGravity = gravity & Gravity.VERTICAL_GRAVITY_MASK;`
`417`	`417`
`@@ -483,7 +483,7 @@ public void draw(Canvas canvas) {`
`483`	`483`	`selfBounds.set(mPaddingLeft, mPaddingTop, w - mPaddingRight, h - mPaddingBottom);`
`484`	`484`	`}`
`485`	`485`
`486`		`- final int layoutDirection = getResolvedLayoutDirection();`
	`486`	`+ final int layoutDirection = getLayoutDirection();`
`487`	`487`	`Gravity.apply(mForegroundGravity, foreground.getIntrinsicWidth(),`
`488`	`488`	`foreground.getIntrinsicHeight(), selfBounds, overlayBounds,`
`489`	`489`	`layoutDirection);`
Original file line number	Diff line number	Diff line change
`@@ -680,7 +680,7 @@ private void updateDrawable(Drawable d) {`
`680`	`680`	`d.setState(getDrawableState());`
`681`	`681`	`}`
`682`	`682`	`d.setLevel(mLevel);`
`683`		`- d.setLayoutDirection(getResolvedLayoutDirection());`
	`683`	`+ d.setLayoutDirection(getLayoutDirection());`
`684`	`684`	`mDrawableWidth = d.getIntrinsicWidth();`
`685`	`685`	`mDrawableHeight = d.getIntrinsicHeight();`
`686`	`686`	`applyColorMod();`