Merge "Follow the minikin namespace changes"

2016-06-17 03:59:51 +00:00
parent 16a630d945 ae1aa85d0c
commit 99a8e2faac
17 changed files with 141 additions and 128 deletions
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -6761,6 +6761,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
                                 BoringLayout.Metrics boring,
                                 BoringLayout.Metrics hintBoring,
                                 int ellipsisWidth, boolean bringIntoView) {
+        android.util.Log.e("TextView", "makeNewLayout", new Exception());
        stopMarquee();

        // Update "old" cached values