Bug 1321633 - Apply gradient based on text direction with first strong strategy, r=sebastian
MozReview-Commit-ID: 5GMlUcp290f
--- a/mobile/android/base/java/org/mozilla/gecko/widget/FadedSingleColorTextView.java
+++ b/mobile/android/base/java/org/mozilla/gecko/widget/FadedSingleColorTextView.java
@@ -4,54 +4,63 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko.widget;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.LinearGradient;
import android.graphics.Shader;
-import android.support.v4.view.ViewCompat;
+import android.support.v4.text.BidiFormatter;
import android.util.AttributeSet;
import android.view.View;
/**
* Fades the end of the text by gecko:fadeWidth amount,
* if the text is too long and requires an ellipsis.
*
* This implementation is an improvement over Android's built-in fadingEdge
* and the fastest of Fennec's implementations. However, it only works for
* text of one color. It works by applying a linear gradient directly to the text.
*/
public class FadedSingleColorTextView extends FadedTextView {
// Shader for the fading edge.
private FadedTextGradient mTextGradient;
+ private boolean mIsTextDirectionRtl;
public FadedSingleColorTextView(Context context, AttributeSet attrs) {
super(context, attrs);
}
private void updateGradientShader() {
final int color = getCurrentTextColor();
final int width = getAvailableWidth();
final boolean needsNewGradient = (mTextGradient == null ||
mTextGradient.getColor() != color ||
mTextGradient.getWidth() != width);
final boolean needsEllipsis = needsEllipsis();
if (needsEllipsis && needsNewGradient) {
- final boolean isRTL = ViewCompat.getLayoutDirection(this) == ViewCompat.LAYOUT_DIRECTION_RTL;
- mTextGradient = new FadedTextGradient(width, fadeWidth, color, isRTL);
+ mTextGradient = new FadedTextGradient(width, fadeWidth, color, mIsTextDirectionRtl);
}
getPaint().setShader(needsEllipsis ? mTextGradient : null);
}
@Override
+ public void setText(CharSequence text, BufferType type) {
+ super.setText(text, type);
+ mIsTextDirectionRtl = BidiFormatter.getInstance().isRtl((String) text);
+ if (mIsTextDirectionRtl) {
+ setTextDirection(TEXT_DIRECTION_RTL);
+ }
+ }
+
+ @Override
public void onDraw(Canvas canvas) {
updateGradientShader();
super.onDraw(canvas);
}
private static class FadedTextGradient extends LinearGradient {
private final int mWidth;
private final int mColor;