diff options
| author | Dianne Hackborn <hackbod@google.com> | 2009-09-29 12:22:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-29 12:22:14 -0700 |
| commit | 2ed31083a29095deea09c8e974a4dee0b85b3a3f (patch) | |
| tree | 69eade2faedffb20958de74e92e692e5418c888f | |
| parent | a4f2ac7e0e2cc4cfcf19c7ac536fe0dd0306354c (diff) | |
| parent | 87937ae89e77c804b1b3c8fcc3d4225fa99390b7 (diff) | |
| download | frameworks_base-2ed31083a29095deea09c8e974a4dee0b85b3a3f.zip frameworks_base-2ed31083a29095deea09c8e974a4dee0b85b3a3f.tar.gz frameworks_base-2ed31083a29095deea09c8e974a4dee0b85b3a3f.tar.bz2 | |
am 87937ae8: Merge change I66057b1f into eclair
Merge commit '87937ae89e77c804b1b3c8fcc3d4225fa99390b7' into eclair-plus-aosp
* commit '87937ae89e77c804b1b3c8fcc3d4225fa99390b7':
Whoops, these shouldn't be public.
| -rw-r--r-- | api/current.xml | 40 | ||||
| -rw-r--r-- | graphics/java/android/graphics/Paint.java | 8 |
2 files changed, 4 insertions, 44 deletions
diff --git a/api/current.xml b/api/current.xml index 74f04ab..7dd8b73 100644 --- a/api/current.xml +++ b/api/current.xml @@ -59234,46 +59234,6 @@ <parameter name="end" type="int"> </parameter> </method> -<method name="native_breakText" - return="int" - abstract="false" - native="true" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="text" type="char[]"> -</parameter> -<parameter name="index" type="int"> -</parameter> -<parameter name="count" type="int"> -</parameter> -<parameter name="maxWidth" type="float"> -</parameter> -<parameter name="measuredWidth" type="float[]"> -</parameter> -</method> -<method name="native_breakText" - return="int" - abstract="false" - native="true" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="text" type="java.lang.String"> -</parameter> -<parameter name="measureForwards" type="boolean"> -</parameter> -<parameter name="maxWidth" type="float"> -</parameter> -<parameter name="measuredWidth" type="float[]"> -</parameter> -</method> <method name="reset" return="void" abstract="false" diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java index 3d6d273..3e3f87b 100644 --- a/graphics/java/android/graphics/Paint.java +++ b/graphics/java/android/graphics/Paint.java @@ -1102,8 +1102,8 @@ public class Paint { return res; } - public native int native_breakText(char[] text, int index, int count, - float maxWidth, float[] measuredWidth); + private native int native_breakText(char[] text, int index, int count, + float maxWidth, float[] measuredWidth); /** * Measure the text, stopping early if the measured width exceeds maxWidth. @@ -1174,8 +1174,8 @@ public class Paint { return res; } - public native int native_breakText(String text, boolean measureForwards, - float maxWidth, float[] measuredWidth); + private native int native_breakText(String text, boolean measureForwards, + float maxWidth, float[] measuredWidth); /** * Return the advance widths for the characters in the string. |