Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2794b88b authored by Fergus Henderson's avatar Fergus Henderson Committed by Android Git Automerger
Browse files

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

* commit 'e55aaa30a15cf554466b58664b6405d76316d4eb':
  Simplify generics, and make Builder concrete.
parents 58edf49c 732af43e

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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);

























core/java/android/text/style/TtsSpan.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -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) {