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

1 files changed, 1 insertions, 19 deletions

diff --git a/api/current.txt b/api/current.txt
index 7eabad8..eea4a5e 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -24830,9 +24830,6 @@ package android.view {
     method public void buildDrawingCache(boolean);
     method public void buildLayer();
     method public boolean callOnClick();
-    method public boolean canResolveLayoutDirection();
-    method public boolean canResolveTextAlignment();
-    method public boolean canResolveTextDirection();
     method public boolean canScrollHorizontally(int);
     method public boolean canScrollVertically(int);
     method public void cancelLongPress();
@@ -25033,7 +25030,6 @@ package android.view {
     method public boolean isHovered();
     method public boolean isInEditMode();
     method public boolean isInTouchMode();
-    method protected static boolean isLayoutDirectionRtl(java.util.Locale);
     method public boolean isLayoutRequested();
     method public boolean isLayoutRtl();
     method public boolean isLongClickable();
@@ -25089,14 +25085,8 @@ package android.view {
     method protected void onOverScrolled(int, int, boolean, boolean);
     method public void onPaddingChanged(int);
     method public void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
-    method public void onResolveDrawables(int);
-    method public void onResolvedLayoutDirectionChanged();
-    method public void onResolvedLayoutDirectionReset();
-    method public void onResolvedTextAlignmentChanged();
-    method public void onResolvedTextAlignmentReset();
-    method public void onResolvedTextDirectionChanged();
-    method public void onResolvedTextDirectionReset();
     method protected void onRestoreInstanceState(android.os.Parcelable);
+    method public void onRtlPropertiesChanged();
     method protected android.os.Parcelable onSaveInstanceState();
     method public void onScreenStateChanged(int);
     method protected void onScrollChanged(int, int, int, int);
@@ -25138,16 +25128,8 @@ package android.view {
     method public void requestLayout();
     method public boolean requestRectangleOnScreen(android.graphics.Rect);
     method public boolean requestRectangleOnScreen(android.graphics.Rect, boolean);
-    method public void resetResolvedLayoutDirection();
-    method public void resetResolvedTextAlignment();
-    method public void resetResolvedTextDirection();
-    method public void resolveDrawables();
-    method public void resolveLayoutDirection();
-    method public void resolvePadding();
     method public static int resolveSize(int, int);
     method public static int resolveSizeAndState(int, int, int);
-    method public void resolveTextAlignment();
-    method public void resolveTextDirection();
     method public void restoreHierarchyState(android.util.SparseArray<android.os.Parcelable>);
     method public void saveHierarchyState(android.util.SparseArray<android.os.Parcelable>);
     method public void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long);