Merge "Fix the build" into jb-mr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
57d863c3c2
@ -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.
|
||||||
*/
|
*/
|
||||||
|
Reference in New Issue
Block a user