Merge "Snap for 5590969 from 7dc8a3975b6d2f5f714dfef46efdc209af683757 to sdk-release" into sdk-releaseplatform-tools-29.0.5platform-tools-29.0.4platform-tools-29.0.3platform-tools-29.0.2platform-tools-29.0.1sdk-release

5 files changed, 18 insertions, 18 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-iw/strings.xml b/res/values-iw/strings.xml
index e3ab29b..33df6af 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -20,12 +20,12 @@
     <string name="done_label" msgid="7007948707597430919">"בוצע"</string>
     <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_hours" msgid="7651068754188418859">"בחר שעות"</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>
-    <string name="select_year" msgid="2603330600102539372">"יש לבחור שנה"</string>
+    <string name="select_day" msgid="3973338219107019769">"בחר חודש ויום"</string>
+    <string name="select_year" msgid="2603330600102539372">"בחר שנה"</string>
     <string name="item_is_selected" msgid="2674929164900463786">"בחרת <xliff:g id="ITEM">%1$s</xliff:g>"</string>
     <string name="deleted_key" msgid="6908431551612331381">"<xliff:g id="KEY">%1$s</xliff:g> נמחק"</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");
         }