diff options
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | AndroidManifest.xml | 1 | ||||
-rw-r--r-- | res/values-am/strings.xml | 2 | ||||
-rw-r--r-- | res/values-de/strings.xml | 2 | ||||
-rw-r--r-- | res/values-it/strings.xml | 2 | ||||
-rw-r--r-- | res/values-iw/strings.xml | 3 | ||||
-rw-r--r-- | res/values-or/strings.xml | 2 | ||||
-rw-r--r-- | res/values-pt-rPT/strings.xml | 2 | ||||
-rw-r--r-- | res/values-ro/strings.xml | 4 | ||||
-rw-r--r-- | res/values/strings.xml | 9 | ||||
-rw-r--r-- | src/com/android/car/calendar/AllDayEventsItem.java | 12 |
11 files changed, 25 insertions, 16 deletions
@@ -22,7 +22,7 @@ android_app { srcs: ["src/**/*.java"], resource_dirs: ["res"], sdk_version: "current", - target_sdk_version: "29", + target_sdk_version: "current", min_sdk_version: "28", optimize: { enabled: false, diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 56ce764..f3504fb 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -29,6 +29,7 @@ android:supportsRtl="true"> <activity android:name=".CarCalendarActivity" + android:exported="true" android:launchMode="singleTask"> <intent-filter> <action android:name="android.intent.action.MAIN"/> diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index 4cd220d..75606d2 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -18,7 +18,7 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_name" msgid="1756632159204796305">"ቀን መቁጠሪያ"</string> <string name="no_dialler" msgid="1448265958659890310">"መደወያ አይገኝም"</string> - <string name="no_events" msgid="2454460886004475314">"መርሐግብር የተያዘላቸው ክስተቶች የሉም። ነጻ ነዎት!"</string> + <string name="no_events" msgid="2454460886004475314">"መርሐግብር የተያዘላቸው ክስተቶች የሉም። ነፃ ነዎት!"</string> <string name="no_calendars" msgid="5059614627806215716">"ቀን መቁጠሪያ ሊጀመር ይችላል፣ ወይም ቅንብሮችዎን በአጃቢ መተግበሪያ ውስጥ መፈተሽ ሊኖርብዎት ይችላል"</string> <string name="all_day_event" msgid="5817490740700803034">"ሙሉ ቀን"</string> <!-- no translation found for phone_number (3879925006862072135) --> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 8d89d35..24451bf 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -19,7 +19,7 @@ <string name="app_name" msgid="1756632159204796305">"Kalender"</string> <string name="no_dialler" msgid="1448265958659890310">"Kein Telefon verfügbar"</string> <string name="no_events" msgid="2454460886004475314">"Keine Einträge. Du hast keine Termine."</string> - <string name="no_calendars" msgid="5059614627806215716">"Möglicherweise wird Google Kalender gerade gestartet oder du musst deine Einstellungen in der Companion App prüfen"</string> + <string name="no_calendars" msgid="5059614627806215716">"Möglicherweise wird Google Kalender gerade gestartet oder du musst deine Einstellungen in der Companion-App prüfen"</string> <string name="all_day_event" msgid="5817490740700803034">"Ganztägig"</string> <!-- no translation found for phone_number (3879925006862072135) --> <skip /> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index e21316d..8bca97b 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -25,7 +25,7 @@ <skip /> <string name="phone_number_with_pin" msgid="6760582665093825412">"PIN del numero <xliff:g id="NUMBER">%1$s</xliff:g>: <xliff:g id="PIN_0">%2$s</xliff:g>"</string> <plurals name="all_day_title" formatted="false" msgid="7938279592034934265"> - <item quantity="one">%d eventi che durano tutto il giorno</item> <item quantity="other">%d eventi che durano tutto il giorno</item> + <item quantity="one">%d evento che dura tutto il giorno</item> </plurals> </resources> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 7fcf4fc..acc6fde 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -25,9 +25,8 @@ <skip /> <string name="phone_number_with_pin" msgid="6760582665093825412">"<xliff:g id="NUMBER">%1$s</xliff:g> קוד אימות: <xliff:g id="PIN_0">%2$s</xliff:g>"</string> <plurals name="all_day_title" formatted="false" msgid="7938279592034934265"> + <item quantity="one">%d אירועים הנמשכים יום שלם</item> <item quantity="two">%d אירועים הנמשכים יום שלם</item> - <item quantity="many">%d אירועים הנמשכים יום שלם</item> <item quantity="other">%d אירועים הנמשכים יום שלם</item> - <item quantity="one">אירוע אחד הנמשך יום שלם</item> </plurals> </resources> diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml index 265a424..f097e91 100644 --- a/res/values-or/strings.xml +++ b/res/values-or/strings.xml @@ -16,7 +16,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="1756632159204796305">"କ୍ୟାଲେଣ୍ଡର୍"</string> + <string name="app_name" msgid="1756632159204796305">"କ୍ୟାଲେଣ୍ଡର"</string> <string name="no_dialler" msgid="1448265958659890310">"କୌଣସି ଡାଏଲର୍ ଉପଲବ୍ଧ ନାହିଁ"</string> <string name="no_events" msgid="2454460886004475314">"କୌଣସି ସିଡୁଲ୍ କରାଯାଇଥିବା ଇଭେଣ୍ଟ ନାହିଁ। ଆପଣ ଖାଲି ଅଛନ୍ତି!"</string> <string name="no_calendars" msgid="5059614627806215716">"କ୍ୟାଲେଣ୍ଡର୍ ଆରମ୍ଭ ହୋଇପାରେ କିମ୍ବା ଆପଣ କମ୍ପାନିୟନ୍ ଆପରେ ଆପଣଙ୍କ ସେଟିଂସ୍ ଯାଞ୍ଚ କରିବା ଆବଶ୍ୟକ କରିପାରନ୍ତି"</string> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 32888c0..5ce55d2 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -25,7 +25,7 @@ <skip /> <string name="phone_number_with_pin" msgid="6760582665093825412">"<xliff:g id="NUMBER">%1$s</xliff:g> PIN: <xliff:g id="PIN_0">%2$s</xliff:g>"</string> <plurals name="all_day_title" formatted="false" msgid="7938279592034934265"> - <item quantity="one">%d evento de todo o dia</item> <item quantity="other">%d eventos de todo o dia</item> + <item quantity="one">%d evento de todo o dia</item> </plurals> </resources> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index fb28113..5d835bd 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -18,8 +18,8 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_name" msgid="1756632159204796305">"Calendar"</string> <string name="no_dialler" msgid="1448265958659890310">"Nicio tastatură telefon"</string> - <string name="no_events" msgid="2454460886004475314">"Niciun eveniment planificat. Sunteți liber(ă)!"</string> - <string name="no_calendars" msgid="5059614627806215716">"Calendarul ar putea să pornească sau ar putea fi necesar să verificați setările din aplicația parteneră"</string> + <string name="no_events" msgid="2454460886004475314">"Niciun eveniment planificat. Ești liber(ă)!"</string> + <string name="no_calendars" msgid="5059614627806215716">"Calendarul ar putea să pornească sau ar putea fi necesar să verifici setările din aplicația parteneră"</string> <string name="all_day_event" msgid="5817490740700803034">"Toată ziua"</string> <!-- no translation found for phone_number (3879925006862072135) --> <skip /> diff --git a/res/values/strings.xml b/res/values/strings.xml index a78bc08..493f549 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -42,8 +42,9 @@ </string> <!-- The title for the all-day events section. Only shown for more than one item. [CHAR LIMIT=120] --> - <plurals name="all_day_title"> - <item quantity="one">%d all day event</item> - <item quantity="other">%d all day events</item> - </plurals> + <string name="all_day_title"> {count, plural, + =1 {# all day event} + other {# all day events} + } + </string> </resources>
\ No newline at end of file diff --git a/src/com/android/car/calendar/AllDayEventsItem.java b/src/com/android/car/calendar/AllDayEventsItem.java index 92c00ca..d42d78c 100644 --- a/src/com/android/car/calendar/AllDayEventsItem.java +++ b/src/com/android/car/calendar/AllDayEventsItem.java @@ -19,6 +19,7 @@ package com.android.car.calendar; import static com.google.common.base.Preconditions.checkNotNull; import android.content.res.Resources; +import android.icu.text.MessageFormat; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -28,7 +29,10 @@ import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; +import java.util.HashMap; import java.util.List; +import java.util.Locale; +import java.util.Map; class AllDayEventsItem implements CalendarItem { @@ -78,8 +82,12 @@ class AllDayEventsItem implements CalendarItem { hideEventSection(); int size = eventCalendarItems.size(); - mTitleTextView.setText( - mResources.getQuantityString(R.plurals.all_day_title, size, size)); + MessageFormat msgFmt = new MessageFormat(mResources.getString( + R.string.all_day_title), Locale.getDefault()); + Map<String, Object> strArgs = new HashMap<>(); + strArgs.put("count", size); + String title = msgFmt.format(strArgs); + mTitleTextView.setText(title); for (EventCalendarItem eventCalendarItem : eventCalendarItems) { EventCalendarItem.EventViewHolder holder = |