Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 87937ae8: Merge change I66057b1f into eclair

Browse Source 
Merge commit '87937ae89e77c804b1b3c8fcc3d4225fa99390b7' into eclair-plus-aosp

* commit '87937ae89e77c804b1b3c8fcc3d4225fa99390b7':
  Whoops, these shouldn't be public.
This commit is contained in:
Dianne Hackborn
2009-09-29 12:22:14 -07:00
committed by Android Git Automerger
parent a4f2ac7e0e 87937ae89e
commit 2ed31083a2
2 changed files with 4 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
api/current.xml
View File

@@ -59234,46 +59234,6 @@
<parameter name="end" type="int"> <parameter name="end" type="int">
</parameter> </parameter>
</method> </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" <method name="reset"
return="void" return="void"
abstract="false" abstract="false"

8
graphics/java/android/graphics/Paint.java
View File

@@ -1102,8 +1102,8 @@ public class Paint {
return res; return res;
} }
public native int native_breakText(char[] text, int index, int count, private native int native_breakText(char[] text, int index, int count,
float maxWidth, float[] measuredWidth); float maxWidth, float[] measuredWidth);
/** /**
* Measure the text, stopping early if the measured width exceeds maxWidth. * Measure the text, stopping early if the measured width exceeds maxWidth.
@@ -1174,8 +1174,8 @@ public class Paint {
return res; return res;
} }
public native int native_breakText(String text, boolean measureForwards, private native int native_breakText(String text, boolean measureForwards,
float maxWidth, float[] measuredWidth); float maxWidth, float[] measuredWidth);
/** /**
* Return the advance widths for the characters in the string. * Return the advance widths for the characters in the string.