Improve RTL APIs
- follow changed / reset pattern
Change-Id: I1c5e9b39196029bd78add2ab13b984da124822ca
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 740ea12..1e6bca5 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -9598,10 +9598,19 @@
// Set to resolved
mPrivateFlags2 |= LAYOUT_DIRECTION_RESOLVED;
+ onResolvedLayoutDirectionChanged();
}
/**
- * Force padding depending on layout direction.
+ * Called when layout direction has been resolved.
+ *
+ * The default implementation does nothing.
+ */
+ public void onResolvedLayoutDirectionChanged() {
+ }
+
+ /**
+ * Resolve padding depending on layout direction.
*/
public void resolvePadding() {
// If the user specified the absolute padding (either with android:padding or
@@ -9645,7 +9654,7 @@
mUserPaddingBottom = (mUserPaddingBottom >= 0) ? mUserPaddingBottom : mPaddingBottom;
recomputePadding();
- onResolvePadding(resolvedLayoutDirection);
+ onPaddingChanged(resolvedLayoutDirection);
}
/**
@@ -9656,7 +9665,7 @@
* @param layoutDirection the direction of the layout
*
*/
- public void onResolvePadding(int layoutDirection) {
+ public void onPaddingChanged(int layoutDirection) {
}
/**
@@ -9674,20 +9683,29 @@
}
/**
- * Reset the resolved layout direction.
- *
- * Subclasses need to override this method to clear cached information that depends on the
- * resolved layout direction, or to inform child views that inherit their layout direction.
- * Overrides must also call the superclass implementation at the start of their implementation.
+ * Reset the resolved layout direction. Will call {@link View#onResolvedLayoutDirectionReset}
+ * when reset is done.
*/
public void resetResolvedLayoutDirection() {
// Reset the current View resolution
mPrivateFlags2 &= ~LAYOUT_DIRECTION_RESOLVED;
+ onResolvedLayoutDirectionReset();
// Reset also the text direction
resetResolvedTextDirection();
}
/**
+ * Called during reset of resolved layout direction.
+ *
+ * Subclasses need to override this method to clear cached information that depends on the
+ * resolved layout direction, or to inform child views that inherit their layout direction.
+ *
+ * The default implementation does nothing.
+ */
+ public void onResolvedLayoutDirectionReset() {
+ }
+
+ /**
* Check if a Locale uses an RTL script.
*
* @param locale Locale to check
@@ -14137,8 +14155,8 @@
}
/**
- * Resolve the text direction. Will call {@link View#onResolveTextDirection()} when resolution
- * is done.
+ * Resolve the text direction. Will call {@link View#onResolvedTextDirectionChanged} when
+ * resolution is done.
*/
public void resolveTextDirection() {
if (mResolvedTextDirection != TEXT_DIRECTION_INHERIT) {
@@ -14152,24 +14170,26 @@
} else {
mResolvedTextDirection = TEXT_DIRECTION_FIRST_STRONG;
}
- onResolveTextDirection();
+ onResolvedTextDirectionChanged();
}
/**
* Called when text direction has been resolved. Subclasses that care about text direction
- * resolution should override this method. The default implementation does nothing.
+ * resolution should override this method.
+ *
+ * The default implementation does nothing.
*/
- public void onResolveTextDirection() {
+ public void onResolvedTextDirectionChanged() {
}
/**
* Reset resolved text direction. Text direction can be resolved with a call to
- * getResolvedTextDirection(). Will call {@link View#onResetResolvedTextDirection()} when
+ * getResolvedTextDirection(). Will call {@link View#onResolvedTextDirectionReset} when
* reset is done.
*/
public void resetResolvedTextDirection() {
mResolvedTextDirection = TEXT_DIRECTION_INHERIT;
- onResetResolvedTextDirection();
+ onResolvedTextDirectionReset();
}
/**
@@ -14177,7 +14197,7 @@
* override this method and do a reset of the text direction of their children. The default
* implementation does nothing.
*/
- public void onResetResolvedTextDirection() {
+ public void onResolvedTextDirectionReset() {
}
//