diff options
| author | Niels Egberts <nielse@google.com> | 2014-07-31 21:33:37 +0100 |
|---|---|---|
| committer | Niels Egberts <nielse@google.com> | 2014-08-01 11:46:16 +0100 |
| commit | 2a236a64664f7f04753733d857fec641c7c9db59 (patch) | |
| tree | 60c0a2a1b5c0221d83c940d4924d0c70a6f0d8c0 | |
| parent | 38a7170449f0c8974f01c3513dee2c5e4e99b476 (diff) | |
| download | frameworks_base-2a236a64664f7f04753733d857fec641c7c9db59.zip frameworks_base-2a236a64664f7f04753733d857fec641c7c9db59.tar.gz frameworks_base-2a236a64664f7f04753733d857fec641c7c9db59.tar.bz2 | |
Simplify generics, and make Builder concrete.
Change-Id: I3e14966527c254d2c15dddefc2ef60cdde30421f
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/text/style/TtsSpan.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index c5027ae..05bdc9f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -31748,7 +31748,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); diff --git a/core/java/android/text/style/TtsSpan.java b/core/java/android/text/style/TtsSpan.java index f3a48a6..cb447fd 100644 --- a/core/java/android/text/style/TtsSpan.java +++ b/core/java/android/text/style/TtsSpan.java @@ -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) { |