Merge "Code cleaning"

api/current.txt

@@ -23046,7 +23046,6 @@ package android.view {
     method public boolean willNotDraw();
     field public static android.util.Property ALPHA;
     field protected static int DEFAULT_TEXT_DIRECTION;
-    field protected static float DEFAULT_TEXT_DIRECTION_CHAR_COUNT_THRESHOLD;
     field public static final int DRAWING_CACHE_QUALITY_AUTO = 0; // 0x0
     field public static final int DRAWING_CACHE_QUALITY_HIGH = 1048576; // 0x100000
     field public static final int DRAWING_CACHE_QUALITY_LOW = 524288; // 0x80000

core/java/android/view/View.java

@@ -2594,11 +2594,6 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit
      */
     protected static int DEFAULT_TEXT_DIRECTION = TEXT_DIRECTION_INHERIT;
 
-    /**
-     * Default threshold for "char count" heuristic.
-     */
-    protected static float DEFAULT_TEXT_DIRECTION_CHAR_COUNT_THRESHOLD = 0.6f;
-
     /**
      * The text direction that has been defined by {@link #setTextDirection(int)}.
      *

graphics/java/android/graphics/Paint.java

@@ -1594,7 +1594,7 @@ public class Paint {
     }
 
     /**
-     * Return the glypth Ids for the characters in the string.
+     * Return the glyph Ids for the characters in the string.
      *
      * @param text   The text to measure
      * @param start  The index of the first char to to measure
@@ -1613,7 +1613,7 @@ public class Paint {
      *
      * Used only for BiDi / RTL Tests
      */
-    public int getTextGlypths(String text, int start, int end, int contextStart, int contextEnd,
+    public int getTextGlyphs(String text, int start, int end, int contextStart, int contextEnd,
             int flags, char[] glyphs) {
         if (text == null) {
             throw new IllegalArgumentException("text cannot be null");