Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev

Author: Fabrice Di Meglio

api/current.txt

@@ -24953,7 +24953,6 @@ package android.view {
     method public android.view.ViewParent getParentForAccessibility();
     method public float getPivotX();
     method public float getPivotY();
-    method public int getResolvedTextAlignment();
     method public android.content.res.Resources getResources();
     method public final int getRight();
     method protected float getRightFadingEdgeStrength();

core/java/android/view/View.java

@@ -16668,6 +16668,8 @@ public boolean isTextDirectionInherited() {
      * {@link #TEXT_ALIGNMENT_TEXT_END},
      * {@link #TEXT_ALIGNMENT_VIEW_START},
      * {@link #TEXT_ALIGNMENT_VIEW_END}
+     *
+     * @hide
      */
     @ViewDebug.ExportedProperty(category = "text", mapping = {
             @ViewDebug.IntToString(from = TEXT_ALIGNMENT_INHERIT, to = "INHERIT"),
@@ -16678,7 +16680,7 @@ public boolean isTextDirectionInherited() {
             @ViewDebug.IntToString(from = TEXT_ALIGNMENT_VIEW_START, to = "VIEW_START"),
             @ViewDebug.IntToString(from = TEXT_ALIGNMENT_VIEW_END, to = "VIEW_END")
     })
-    public int getTextAlignment() {
+    public int getRawTextAlignment() {
         return (mPrivateFlags2 & PFLAG2_TEXT_ALIGNMENT_MASK) >> PFLAG2_TEXT_ALIGNMENT_MASK_SHIFT;
     }
 
@@ -16698,7 +16700,7 @@ public int getTextAlignment() {
      * @attr ref android.R.styleable#View_textAlignment
      */
     public void setTextAlignment(int textAlignment) {
-        if (textAlignment != getTextAlignment()) {
+        if (textAlignment != getRawTextAlignment()) {
             // Reset the current and resolved text alignment
             mPrivateFlags2 &= ~PFLAG2_TEXT_ALIGNMENT_MASK;
             resetResolvedTextAlignment();
@@ -16737,7 +16739,7 @@ public void setTextAlignment(int textAlignment) {
             @ViewDebug.IntToString(from = TEXT_ALIGNMENT_VIEW_START, to = "VIEW_START"),
             @ViewDebug.IntToString(from = TEXT_ALIGNMENT_VIEW_END, to = "VIEW_END")
     })
-    public int getResolvedTextAlignment() {
+    public int getTextAlignment() {
         // If text alignment is not resolved, then resolve it
         if ((mPrivateFlags2 & PFLAG2_TEXT_ALIGNMENT_RESOLVED) != PFLAG2_TEXT_ALIGNMENT_RESOLVED) {
             resolveTextAlignment();
@@ -16756,14 +16758,14 @@ public void resolveTextAlignment() {
 
         if (hasRtlSupport()) {
             // Set resolved text alignment flag depending on text alignment flag
-            final int textAlignment = getTextAlignment();
+            final int textAlignment = getRawTextAlignment();
             switch (textAlignment) {
                 case TEXT_ALIGNMENT_INHERIT:
                     // Check if we can resolve the text alignment
                     if (canResolveTextAlignment() && mParent instanceof View) {
                         View view = (View) mParent;
 
-                        final int parentResolvedTextAlignment = view.getResolvedTextAlignment();
+                        final int parentResolvedTextAlignment = view.getTextAlignment();
                         switch (parentResolvedTextAlignment) {
                             case TEXT_ALIGNMENT_GRAVITY:
                             case TEXT_ALIGNMENT_TEXT_START:
@@ -16814,7 +16816,7 @@ public void resolveTextAlignment() {
      * @return true if text alignment resolution can be done otherwise return false.
      */
     private boolean canResolveTextAlignment() {
-        switch (getTextAlignment()) {
+        switch (getRawTextAlignment()) {
             case TEXT_DIRECTION_INHERIT:
                 return (mParent != null);
             default:
@@ -16832,6 +16834,13 @@ public void resetResolvedTextAlignment() {
         mPrivateFlags2 &= ~(PFLAG2_TEXT_ALIGNMENT_RESOLVED | PFLAG2_TEXT_ALIGNMENT_RESOLVED_MASK);
     }
 
+    /**
+     * @hide
+     */
+    public boolean isTextAlignmentInherited() {
+        return (getRawTextAlignment() == TEXT_ALIGNMENT_INHERIT);
+    }
+
     /**
      * Generate a value suitable for use in {@link #setId(int)}.
      * This value will not collide with ID values generated at build time by aapt for R.id.

core/java/android/view/ViewGroup.java

@@ -5274,7 +5274,7 @@ public void resetResolvedLayoutDirection() {
             if (child.isTextDirectionInherited()) {
                 child.resetResolvedTextDirection();
             }
-            if (child.getTextAlignment() == TEXT_ALIGNMENT_INHERIT) {
+            if (child.isTextAlignmentInherited()) {
                 child.resetResolvedTextAlignment();
             }
         }

core/java/android/widget/TextView.java

@@ -5646,7 +5646,7 @@ public void onRtlPropertiesChanged() {
 
     private Layout.Alignment getLayoutAlignment() {
         if (mLayoutAlignment == null) {
-            mResolvedTextAlignment = getResolvedTextAlignment();
+            mResolvedTextAlignment = getTextAlignment();
             switch (mResolvedTextAlignment) {
                 case TEXT_ALIGNMENT_GRAVITY:
                     switch (mGravity & Gravity.RELATIVE_HORIZONTAL_GRAVITY_MASK) {