Merge "Fix bug # 7172247 API REVIEW: android.view.ViewGroup.MarginLayoutParams" into jb-mr1-dev
diff --git a/api/current.txt b/api/current.txt
index 1014ec0..ab45790 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -25679,7 +25679,6 @@
method public int getLayoutDirection();
method public int getMarginEnd();
method public int getMarginStart();
- method protected boolean isLayoutRtl();
method public boolean isMarginRelative();
method public void setLayoutDirection(int);
method public void setMarginEnd(int);
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index f1d0cc0..db1c00a 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -5904,7 +5904,10 @@
}
}
- protected boolean isLayoutRtl() {
+ /**
+ * @hide
+ */
+ public boolean isLayoutRtl() {
return (layoutDirection == View.LAYOUT_DIRECTION_RTL);
}