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

Commit 54f49d8f authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android Git Automerger
Browse files

am 443e3f0b: am 57d863c3: Merge "Fix the build" into jb-mr1-dev

* commit '443e3f0b':
  Fix the build
parents 63e08090 443e3f0b
Loading
Loading
Loading
Loading
+4 −3
Original line number Original line Diff line number Diff line
@@ -149,7 +149,6 @@ public class NumberPicker extends LinearLayout {
     * strings like "01". Keeping a static formatter etc. is the most efficient
     * strings like "01". Keeping a static formatter etc. is the most efficient
     * way to do this; it avoids creating temporary objects on every call to
     * way to do this; it avoids creating temporary objects on every call to
     * format().
     * format().
     *
     */
     */
    private static class TwoDigitFormatter implements NumberPicker.Formatter {
    private static class TwoDigitFormatter implements NumberPicker.Formatter {
        final StringBuilder mBuilder = new StringBuilder();
        final StringBuilder mBuilder = new StringBuilder();
@@ -191,11 +190,13 @@ public class NumberPicker extends LinearLayout {


    private static final TwoDigitFormatter sTwoDigitFormatter = new TwoDigitFormatter();
    private static final TwoDigitFormatter sTwoDigitFormatter = new TwoDigitFormatter();


    static final Formatter getTwoDigitFormatter() {
    /**
     * @hide
     */
    public static final Formatter getTwoDigitFormatter() {
        return sTwoDigitFormatter;
        return sTwoDigitFormatter;
    }
    }



    /**
    /**
     * The increment button.
     * The increment button.
     */
     */