Merge "Remove dead code from DateUtils."
This commit is contained in:
@@ -287,36 +287,6 @@ public class DateUtils
|
||||
return names[month];
|
||||
}
|
||||
|
||||
/**
|
||||
* Return a localized string for the month of the year, for
|
||||
* contexts where the month is not formatted together with
|
||||
* a day of the month.
|
||||
*
|
||||
* @param month One of {@link Calendar#JANUARY Calendar.JANUARY},
|
||||
* {@link Calendar#FEBRUARY Calendar.FEBRUARY}, etc.
|
||||
* @param abbrev One of {@link #LENGTH_LONG}, {@link #LENGTH_MEDIUM},
|
||||
* or {@link #LENGTH_SHORTEST}.
|
||||
* Undefined lengths will return {@link #LENGTH_MEDIUM}
|
||||
* but may return something different in the future.
|
||||
* @return Localized month of the year.
|
||||
* @hide Pending API council approval
|
||||
* @deprecated use {@link java.text.SimpleDateFormat} instead.
|
||||
*/
|
||||
@Deprecated
|
||||
public static String getStandaloneMonthString(int month, int abbrev) {
|
||||
LocaleData d = LocaleData.get(Locale.getDefault());
|
||||
String[] names;
|
||||
switch (abbrev) {
|
||||
case LENGTH_LONG: names = d.longStandAloneMonthNames; break;
|
||||
case LENGTH_MEDIUM: names = d.shortMonthNames; break;
|
||||
case LENGTH_SHORT: names = d.shortMonthNames; break;
|
||||
case LENGTH_SHORTER: names = d.shortMonthNames; break;
|
||||
case LENGTH_SHORTEST: names = d.tinyStandAloneMonthNames; break;
|
||||
default: names = d.shortMonthNames; break;
|
||||
}
|
||||
return names[month];
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a string describing the elapsed time since startTime.
|
||||
* @param startTime some time in the past.
|
||||
@@ -550,18 +520,6 @@ public class DateUtils
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Format a time so it appears like it would in the status bar clock.
|
||||
* @deprecated use {@link #DateFormat.getTimeFormat(Context)} instead.
|
||||
* @hide
|
||||
*/
|
||||
public static final CharSequence timeString(long millis) {
|
||||
synchronized (sLock) {
|
||||
initFormatStringsLocked();
|
||||
return sStatusTimeFormat.format(millis);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Return given duration in a human-friendly format. For example, "4
|
||||
* minutes" or "1 second". Returns only largest meaningful unit of time,
|
||||
@@ -675,18 +633,6 @@ public class DateUtils
|
||||
return f.format(thenDate);
|
||||
}
|
||||
|
||||
/**
|
||||
* @hide
|
||||
* @deprecated use {@link android.text.format.Time}
|
||||
*/
|
||||
public static Calendar newCalendar(boolean zulu)
|
||||
{
|
||||
if (zulu)
|
||||
return Calendar.getInstance(TimeZone.getTimeZone("GMT"));
|
||||
|
||||
return Calendar.getInstance();
|
||||
}
|
||||
|
||||
/**
|
||||
* @return true if the supplied when is today else false
|
||||
*/
|
||||
@@ -704,23 +650,6 @@ public class DateUtils
|
||||
&& (thenMonthDay == time.monthDay);
|
||||
}
|
||||
|
||||
/**
|
||||
* @hide
|
||||
* @deprecated use {@link android.text.format.Time}
|
||||
* Return true if this date string is local time
|
||||
*/
|
||||
public static boolean isUTC(String s)
|
||||
{
|
||||
if (s.length() == 16 && s.charAt(15) == 'Z') {
|
||||
return true;
|
||||
}
|
||||
if (s.length() == 9 && s.charAt(8) == 'Z') {
|
||||
// XXX not sure if this case possible/valid
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return a string containing the date and time in RFC2445 format.
|
||||
* Ensures that the time is written in UTC. The Calendar class doesn't
|
||||
@@ -814,17 +743,6 @@ public class DateUtils
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* @hide
|
||||
* @deprecated use {@link android.text.format.Time}
|
||||
*/
|
||||
public static void assign(Calendar lval, Calendar rval)
|
||||
{
|
||||
// there should be a faster way.
|
||||
lval.clear();
|
||||
lval.setTimeInMillis(rval.getTimeInMillis());
|
||||
}
|
||||
|
||||
/**
|
||||
* Formats a date or a time range according to the local conventions.
|
||||
* <p>
|
||||
|
||||
Reference in New Issue
Block a user