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

Merge "Simplify generics, and make Builder concrete." into lmp-dev

Browse Source
This commit is contained in:
Fergus Henderson
2014-08-01 11:27:33 +00:00
committed by Android (Google) Code Review
parent a0995ab821 2a236a6466
commit 732af43eb1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -31746,7 +31746,7 @@ package android.text.style {
field public static final int WEEKDAY_WEDNESDAY = 4; // 0x4
}
public static abstract class TtsSpan.Builder {
public static class TtsSpan.Builder {
ctor public TtsSpan.Builder(java.lang.String);
method public android.text.style.TtsSpan build();
method public C setIntArgument(java.lang.String, int);

4
core/java/android/text/style/TtsSpan.java
View File

@@ -518,7 +518,7 @@ public class TtsSpan implements ParcelableSpan {
* This class uses generics so methods from this class can return instances
* of its child classes, resulting in a fluent API (CRTP pattern).
*/
public static abstract class Builder<C extends Builder<C>> {
public static class Builder<C extends Builder<?>> {
// Holds the type of this class.
private final String mType;
@@ -580,7 +580,7 @@ public class TtsSpan implements ParcelableSpan {
* this builder like {@link TtsSpan.TextBuilder} and
* {@link TtsSpan.CardinalBuilder} are likely more useful.
*/
public static class SemioticClassBuilder<C extends SemioticClassBuilder<C>>
public static class SemioticClassBuilder<C extends SemioticClassBuilder<?>>
extends Builder<C> {
public SemioticClassBuilder(String type) {