diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-05-21 20:03:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-05-21 20:03:30 +0000 |
| commit | 7dd92023dccd9dd45f4ed51971d16b5c29a7c507 (patch) | |
| tree | 9eca23703a39637659ab7c6ddb24b98d73b98027 | |
| parent | 715fe1d09d9272b31ca72403f9854af2890b2086 (diff) | |
| parent | 97426b76c47df9f9df0635848a4dc959bf3c1a69 (diff) | |
| download | datetimepicker-simpleperf-release.tar.gz | |
Merge "Snap for 5590161 from 7dc8a3975b6d2f5f714dfef46efdc209af683757 to simpleperf-release" into simpleperf-releasesimpleperf-release
| -rw-r--r-- | res/values-ca/strings.xml | 2 | ||||
| -rw-r--r-- | res/values-en-rXC/strings.xml | 22 | ||||
| -rw-r--r-- | res/values-my/strings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/datetimepicker/Utils.java | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 4669c84..9fe6f5c 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -22,7 +22,7 @@ <string name="minute_picker_description" msgid="6024811202872705251">"Control circular dels minuts"</string> <string name="select_hours" msgid="7651068754188418859">"Selecciona les hores"</string> <string name="select_minutes" msgid="8327182090226828481">"Selecciona els minuts"</string> - <string name="day_picker_description" msgid="3968620852217927702">"Quadrícula mensual de dies"</string> + <string name="day_picker_description" msgid="3968620852217927702">"Graella mensual de dies"</string> <string name="year_picker_description" msgid="6963340404644587098">"Llista anual"</string> <string name="select_day" msgid="3973338219107019769">"Selecciona un mes i un dia"</string> <string name="select_year" msgid="2603330600102539372">"Selecciona un any"</string> diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml index 68fcba4..f18af2d 100644 --- a/res/values-en-rXC/strings.xml +++ b/res/values-en-rXC/strings.xml @@ -17,15 +17,15 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="done_label" msgid="7007948707597430919">"Done"</string> - <string name="hour_picker_description" msgid="7586639618712934060">"Hours circular slider"</string> - <string name="minute_picker_description" msgid="6024811202872705251">"Minutes circular slider"</string> - <string name="select_hours" msgid="7651068754188418859">"Select hours"</string> - <string name="select_minutes" msgid="8327182090226828481">"Select minutes"</string> - <string name="day_picker_description" msgid="3968620852217927702">"Month grid of days"</string> - <string name="year_picker_description" msgid="6963340404644587098">"Year list"</string> - <string name="select_day" msgid="3973338219107019769">"Select month and day"</string> - <string name="select_year" msgid="2603330600102539372">"Select year"</string> - <string name="item_is_selected" msgid="2674929164900463786">"<xliff:g id="ITEM">%1$s</xliff:g> selected"</string> - <string name="deleted_key" msgid="6908431551612331381">"<xliff:g id="KEY">%1$s</xliff:g> deleted"</string> + <string name="done_label" msgid="7007948707597430919">"Done"</string> + <string name="hour_picker_description" msgid="7586639618712934060">"Hours circular slider"</string> + <string name="minute_picker_description" msgid="6024811202872705251">"Minutes circular slider"</string> + <string name="select_hours" msgid="7651068754188418859">"Select hours"</string> + <string name="select_minutes" msgid="8327182090226828481">"Select minutes"</string> + <string name="day_picker_description" msgid="3968620852217927702">"Month grid of days"</string> + <string name="year_picker_description" msgid="6963340404644587098">"Year list"</string> + <string name="select_day" msgid="3973338219107019769">"Select month and day"</string> + <string name="select_year" msgid="2603330600102539372">"Select year"</string> + <string name="item_is_selected" msgid="2674929164900463786">"<xliff:g id="ITEM">%1$s</xliff:g> selected"</string> + <string name="deleted_key" msgid="6908431551612331381">"<xliff:g id="KEY">%1$s</xliff:g> deleted"</string> </resources> diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml index 063860a..3a56056 100644 --- a/res/values-my/strings.xml +++ b/res/values-my/strings.xml @@ -21,7 +21,7 @@ <string name="hour_picker_description" msgid="7586639618712934060">"နာရီ ရွေးစရာ စက်ဝိုင်း"</string> <string name="minute_picker_description" msgid="6024811202872705251">"မိနစ် ရွေးစရာ စက်ဝိုင်း"</string> <string name="select_hours" msgid="7651068754188418859">"နာရီများ ရွေးပါ"</string> - <string name="select_minutes" msgid="8327182090226828481">"မိနစ် ရွေးပါ"</string> + <string name="select_minutes" msgid="8327182090226828481">"မိနစ်များ ရွေးပါ"</string> <string name="day_picker_description" msgid="3968620852217927702">"လအလိုက် နေ့များ အကွက်"</string> <string name="year_picker_description" msgid="6963340404644587098">"ခုနှစ် စာရင်း"</string> <string name="select_day" msgid="3973338219107019769">"လ နှင့် နေ့ ရွေးပါ"</string> diff --git a/src/com/android/datetimepicker/Utils.java b/src/com/android/datetimepicker/Utils.java index 6c0adbe..cf3df7c 100644 --- a/src/com/android/datetimepicker/Utils.java +++ b/src/com/android/datetimepicker/Utils.java @@ -77,7 +77,7 @@ public class Utils { case Calendar.NOVEMBER: return 30; case Calendar.FEBRUARY: - return (year % 4 == 0) ? 29 : 28; + return (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0)) ? 29 : 28; default: throw new IllegalArgumentException("Invalid Month"); } |