Merge change I61b20d96 into donut

* changes:
  Cherry-pick into donut:   DO NOT MERGE

6 files changed, 81 insertions, 14 deletions

diff --git a/core/java/android/content/res/StringBlock.java b/core/java/android/content/res/StringBlock.java
index e684cb8018df..8fb82be33880 100644
--- a/core/java/android/content/res/StringBlock.java
+++ b/core/java/android/content/res/StringBlock.java
@@ -202,7 +202,7 @@ final class StringBlock {
                     sub = subtag(tag, ";size=");
                     if (sub != null) {
                         int size = Integer.parseInt(sub);
-                        buffer.setSpan(new AbsoluteSizeSpan(size),
+                        buffer.setSpan(new AbsoluteSizeSpan(size, true),
                                        style[i+1], style[i+2]+1,
                                        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
                     }
@@ -310,7 +310,7 @@ final class StringBlock {
      * the ascent if possible, or the descent if shrinking the ascent further
      * will make the text unreadable.
      */
-    private static class Height implements LineHeightSpan {
+    private static class Height implements LineHeightSpan.WithDensity {
         private int mSize;
         private static float sProportion = 0;
 
@@ -321,9 +321,21 @@ final class StringBlock {
         public void chooseHeight(CharSequence text, int start, int end,
                                  int spanstartv, int v,
                                  Paint.FontMetricsInt fm) {
-            if (fm.bottom - fm.top < mSize) {
-                fm.top = fm.bottom - mSize;
-                fm.ascent = fm.ascent - mSize;
+            // Should not get called, at least not by StaticLayout.
+            chooseHeight(text, start, end, spanstartv, v, fm, null);
+        }
+
+        public void chooseHeight(CharSequence text, int start, int end,
+                                 int spanstartv, int v,
+                                 Paint.FontMetricsInt fm, TextPaint paint) {
+            int size = mSize;
+            if (paint != null) {
+                size *= paint.density;
+            }
+
+            if (fm.bottom - fm.top < size) {
+                fm.top = fm.bottom - size;
+                fm.ascent = fm.ascent - size;
             } else {
                 if (sProportion == 0) {
                     /*
@@ -343,27 +355,27 @@ final class StringBlock {
 
                 int need = (int) Math.ceil(-fm.top * sProportion);
 
-                if (mSize - fm.descent >= need) {
+                if (size - fm.descent >= need) {
                     /*
                      * It is safe to shrink the ascent this much.
                      */
 
-                    fm.top = fm.bottom - mSize;
-                    fm.ascent = fm.descent - mSize;
-                } else if (mSize >= need) {
+                    fm.top = fm.bottom - size;
+                    fm.ascent = fm.descent - size;
+                } else if (size >= need) {
                     /*
                      * We can't show all the descent, but we can at least
                      * show all the ascent.
                      */
 
                     fm.top = fm.ascent = -need;
-                    fm.bottom = fm.descent = fm.top + mSize;
+                    fm.bottom = fm.descent = fm.top + size;
                 } else {
                     /*
                      * Show as much of the ascent as we can, and no descent.
                      */
 
-                    fm.top = fm.ascent = -mSize;
+                    fm.top = fm.ascent = -size;
                     fm.bottom = fm.descent = 0;
                 }
             }
diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java
index c133cf2b30a0..f0a5ffd67127 100644
--- a/core/java/android/text/StaticLayout.java
+++ b/core/java/android/text/StaticLayout.java
@@ -968,7 +968,13 @@ extends Layout
             fm.bottom = bottom;
 
             for (int i = 0; i < chooseht.length; i++) {
-                chooseht[i].chooseHeight(text, start, end, choosehtv[i], v, fm);
+                if (chooseht[i] instanceof LineHeightSpan.WithDensity) {
+                    ((LineHeightSpan.WithDensity) chooseht[i]).
+                        chooseHeight(text, start, end, choosehtv[i], v, fm, paint);
+
+                } else {
+                    chooseht[i].chooseHeight(text, start, end, choosehtv[i], v, fm);
+                }
             }
 
             above = fm.ascent;
diff --git a/core/java/android/text/TextPaint.java b/core/java/android/text/TextPaint.java
index f13820d3a885..36c69ef9e545 100644
--- a/core/java/android/text/TextPaint.java
+++ b/core/java/android/text/TextPaint.java
@@ -27,6 +27,10 @@ public class TextPaint extends Paint {
     public int baselineShift;
     public int linkColor;
     public int[] drawableState;
+    /**
+     * @hide Not in the donut API
+     */
+    public float density = 1.0f;
 
     public TextPaint() {
         super();
@@ -51,5 +55,6 @@ public class TextPaint extends Paint {
         baselineShift = tp.baselineShift;
         linkColor = tp.linkColor;
         drawableState = tp.drawableState;
+        density = tp.density;
     }
 }
diff --git a/core/java/android/text/style/AbsoluteSizeSpan.java b/core/java/android/text/style/AbsoluteSizeSpan.java
index 484f8ce410a2..deedf4058e0d 100644
--- a/core/java/android/text/style/AbsoluteSizeSpan.java
+++ b/core/java/android/text/style/AbsoluteSizeSpan.java
@@ -24,13 +24,30 @@ import android.text.TextUtils;
 public class AbsoluteSizeSpan extends MetricAffectingSpan implements ParcelableSpan {
 
     private final int mSize;
+    private boolean mDip;
 
+    /**
+     * Set the text size to <code>size</code> physical pixels.
+     */
     public AbsoluteSizeSpan(int size) {
         mSize = size;
     }
 
+    /**
+     * Set the text size to <code>size</code> physical pixels,
+     * or to <code>size</code> device-independent pixels if
+     * <code>dip</code> is true.
+     *
+     * @hide Not in the donut API
+     */
+    public AbsoluteSizeSpan(int size, boolean dip) {
+        mSize = size;
+        mDip = dip;
+    }
+
     public AbsoluteSizeSpan(Parcel src) {
         mSize = src.readInt();
+        mDip = src.readInt() != 0;
     }
     
     public int getSpanTypeId() {
@@ -43,19 +60,35 @@ public class AbsoluteSizeSpan extends MetricAffectingSpan implements ParcelableS
 
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeInt(mSize);
+        dest.writeInt(mDip ? 1 : 0);
     }
 
     public int getSize() {
         return mSize;
     }
 
+    /**
+     * @hide Not in the donut API
+     */
+    public boolean getDip() {
+        return mDip;
+    }
+
     @Override
     public void updateDrawState(TextPaint ds) {
-        ds.setTextSize(mSize);
+        if (mDip) {
+            ds.setTextSize(mSize * ds.density);
+        } else {
+            ds.setTextSize(mSize);
+        }
     }
 
     @Override
     public void updateMeasureState(TextPaint ds) {
-        ds.setTextSize(mSize);
+        if (mDip) {
+            ds.setTextSize(mSize * ds.density);
+        } else {
+            ds.setTextSize(mSize);
+        }
     }
 }
diff --git a/core/java/android/text/style/LineHeightSpan.java b/core/java/android/text/style/LineHeightSpan.java
index c0ef97c483e9..8b723e136f4f 100644
--- a/core/java/android/text/style/LineHeightSpan.java
+++ b/core/java/android/text/style/LineHeightSpan.java
@@ -19,6 +19,7 @@ package android.text.style;
 import android.graphics.Paint;
 import android.graphics.Canvas;
 import android.text.Layout;
+import android.text.TextPaint;
 
 public interface LineHeightSpan
 extends ParagraphStyle, WrapTogetherSpan
@@ -26,4 +27,13 @@ extends ParagraphStyle, WrapTogetherSpan
     public void chooseHeight(CharSequence text, int start, int end,
                              int spanstartv, int v,
                              Paint.FontMetricsInt fm);
+
+    /**
+     * @hide Not in the donut API
+     */
+    public interface WithDensity extends LineHeightSpan {
+        public void chooseHeight(CharSequence text, int start, int end,
+                                 int spanstartv, int v,
+                                 Paint.FontMetricsInt fm, TextPaint paint);
+    }
 }
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 826803016744..870fcacbfb05 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -327,6 +327,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
         mText = "";
 
         mTextPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
+        mTextPaint.density = getResources().getDisplayMetrics().density;
         mTextPaint.setCompatibilityScaling(
                 getResources().getCompatibilityInfo().applicationScale);