From 5bf313784847485480c49f1f7914cb6ebea8f1a1 Mon Sep 17 00:00:00 2001 From: Ashwini Oruganti Date: Mon, 23 Mar 2020 13:20:17 -0700 Subject: Add an exported flag in manifest With b/150232615, we will need an explicit value set for the exported flag when intent filters are present, as the default behavior is changing for S+. This change explicitly adds the value reflecting the previous default to the manifest. These changes were made using an automated tool, the xml file may be reformatted slightly creating a larger diff. The only "real" change is the addition of "android:exported" to activities, services, and receivers that have one or more intent-filters. Bug: 150232615 Test: TH Exempt-From-Owner-Approval: mechanical refactoring Change-Id: I6950753c1f1fe6de0e265cca7fef0a04478d3428 --- AndroidManifest.xml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1e78c72e..c9c5a04b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -80,7 +80,8 @@ + android:theme="@style/CalendarTheme.WithActionBar" + android:exported="true"> @@ -117,7 +118,8 @@ + android:configChanges="orientation|keyboardHidden" + android:exported="true"> @@ -138,7 +140,8 @@ android:theme="@android:style/Theme.Holo.Dialog" android:excludeFromRecents="true" android:label="@string/quick_response_dialog_title" /> - + @@ -160,7 +163,8 @@ - + @@ -180,7 +184,8 @@ - + @@ -188,7 +193,8 @@ - + -- cgit v1.2.3 From 5bb52db23412f18235376a07c6771b6c5a3059d9 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Mon, 27 Apr 2020 20:28:55 -0700 Subject: Remove MODULE_LICENSE_APACHE2 from apps/Calendar Repositories containing third-party code need a METADATA and a license_type. Repositories containing only first-party code no longer need a MODULE_LICENSE_* file. Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ib410317d77b89e6131434eddbc4dc600cd8905fa --- MODULE_LICENSE_APACHE2 | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 MODULE_LICENSE_APACHE2 diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2 deleted file mode 100644 index e69de29b..00000000 -- cgit v1.2.3 From 37508bc4820a9d8d668fc2636d36145635c310e6 Mon Sep 17 00:00:00 2001 From: Raman Tenneti Date: Tue, 7 Jul 2020 17:05:28 -0700 Subject: AOSP/Calendar - Added a null pointer check for widgetManager based on https://b.corp.google.com/issues/158480522#comment3 (line#540). I wasn't able to duplicate the problem as there are no reproducible instructions. BUG: 158480522 Test: manual - Ran the following tests on Pixel phone. Tested the calendar UI. $ make -j 40 $ make CalendarTests -j $ ls -l out/target/product/bonito/product/app/Calendar/Calendar.apk out/target/product/bonito/testcases/CalendarTests/arm64/CalendarTests.apk -rw-r----- 1 rtenneti primarygroup 2478692 Jul 7 16:03 out/target/product/bonito/product/app/Calendar/Calendar.apk -rw-r----- 1 rtenneti primarygroup 78231 Jul 7 16:28 out/target/product/bonito/testcases/CalendarTests/arm64/CalendarTests.apk $ adb install -r -d -t out/target/product/bonito/product/app/Calendar/Calendar.apk $ adb install -r -d -t out/target/product/bonito/testcases/CalendarTests/arm64/CalendarTests.apk $ adb shell am instrument -w com.android.calendar.tests com.android.calendar.FormatDateRangeTest:. com.android.calendar.UtilsTests:.................. com.android.calendar.WeekNumberTest:. com.android.calendar.widget.CalendarAppWidgetServiceTest:.. Test results for InstrumentationTestRunner=...................... Time: 0.123 OK (22 tests) Change-Id: I65931f9b4c8dc6c4644e491125965c2aeaeca702 --- src/com/android/calendar/widget/CalendarAppWidgetService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/android/calendar/widget/CalendarAppWidgetService.java b/src/com/android/calendar/widget/CalendarAppWidgetService.java index 6329463b..ec702c7c 100644 --- a/src/com/android/calendar/widget/CalendarAppWidgetService.java +++ b/src/com/android/calendar/widget/CalendarAppWidgetService.java @@ -542,6 +542,9 @@ public class CalendarAppWidgetService extends RemoteViewsService { } AppWidgetManager widgetManager = AppWidgetManager.getInstance(mContext); + if (widgetManager == null) { + return; + } if (mAppWidgetId == -1) { int[] ids = widgetManager.getAppWidgetIds(CalendarAppWidgetProvider .getComponentName(mContext)); -- cgit v1.2.3 From 23da4d3f5ed1c317d7274a3e6ea0b6b5e841324e Mon Sep 17 00:00:00 2001 From: Luca Stefani Date: Mon, 13 Jul 2020 19:03:08 +0200 Subject: Fix multiple substitutions in positional format - DO NOT MERGE ANYWHERE Change-Id: I655e6ba0efe576b659510e1e4858a062799cb384 --- res/values-af/strings.xml | 2 +- res/values-am/strings.xml | 2 +- res/values-ar/strings.xml | 2 +- res/values-az/strings.xml | 2 +- res/values-bg/strings.xml | 2 +- res/values-bn/strings.xml | 2 +- res/values-ca/strings.xml | 2 +- res/values-cs/strings.xml | 2 +- res/values-da/strings.xml | 2 +- res/values-de/strings.xml | 2 +- res/values-el/strings.xml | 2 +- res/values-en-rAU/strings.xml | 2 +- res/values-en-rGB/strings.xml | 2 +- res/values-en-rIN/strings.xml | 2 +- res/values-es-rUS/strings.xml | 2 +- res/values-es/strings.xml | 2 +- res/values-et/strings.xml | 2 +- res/values-eu/strings.xml | 2 +- res/values-fa/strings.xml | 2 +- res/values-fi/strings.xml | 2 +- res/values-fr-rCA/strings.xml | 2 +- res/values-fr/strings.xml | 2 +- res/values-gl/strings.xml | 2 +- res/values-gu/strings.xml | 2 +- res/values-hi/strings.xml | 2 +- res/values-hr/strings.xml | 2 +- res/values-hu/strings.xml | 2 +- res/values-hy/strings.xml | 2 +- res/values-in/strings.xml | 2 +- res/values-is/strings.xml | 2 +- res/values-it/strings.xml | 2 +- res/values-iw/strings.xml | 2 +- res/values-ja/strings.xml | 2 +- res/values-ka/strings.xml | 2 +- res/values-km/strings.xml | 2 +- res/values-kn/strings.xml | 2 +- res/values-ko/strings.xml | 2 +- res/values-lo/strings.xml | 2 +- res/values-lt/strings.xml | 2 +- res/values-lv/strings.xml | 2 +- res/values-ml/strings.xml | 2 +- res/values-mn/strings.xml | 2 +- res/values-mr/strings.xml | 2 +- res/values-ms/strings.xml | 2 +- res/values-my/strings.xml | 2 +- res/values-nb/strings.xml | 2 +- res/values-ne/strings.xml | 2 +- res/values-nl/strings.xml | 2 +- res/values-pl/strings.xml | 2 +- res/values-pt-rPT/strings.xml | 2 +- res/values-pt/strings.xml | 2 +- res/values-ro/strings.xml | 2 +- res/values-ru/strings.xml | 2 +- res/values-si/strings.xml | 2 +- res/values-sk/strings.xml | 2 +- res/values-sl/strings.xml | 2 +- res/values-sr/strings.xml | 2 +- res/values-sv/strings.xml | 2 +- res/values-sw/strings.xml | 2 +- res/values-ta/strings.xml | 2 +- res/values-te/strings.xml | 2 +- res/values-th/strings.xml | 2 +- res/values-tl/strings.xml | 2 +- res/values-tr/strings.xml | 2 +- res/values-uk/strings.xml | 2 +- res/values-ur/strings.xml | 2 +- res/values-vi/strings.xml | 2 +- res/values-zh-rCN/strings.xml | 2 +- res/values-zh-rHK/strings.xml | 2 +- res/values-zh-rTW/strings.xml | 2 +- res/values-zu/strings.xml | 2 +- 71 files changed, 71 insertions(+), 71 deletions(-) diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 71e67dff..289cab8a 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -26,7 +26,7 @@ "Môre" "Vandag om %s" "Môre om %s" - "%s, %s" + "%1$s, %2$s" "Herhaling" "(Titelloos)" diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index 9fd2cec8..cfaf11b3 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -26,7 +26,7 @@ "ነገ" "ዛሬ %s ላይ" "ነገ %s ላይ" - "%s፣ %s" + "%1$s፣ %2$s" "ድግግሞሽ" "(አርእስት አልባ)" diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 2321d1e5..acedba19 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -26,7 +26,7 @@ "غدًا" "اليوم في %s" "غدًا في %s" - "%s، %s" + "%1$s، %2$s" "التكرار" "(بلا عنوان)" diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml index b5e30aff..cda13784 100644 --- a/res/values-az/strings.xml +++ b/res/values-az/strings.xml @@ -26,7 +26,7 @@ "Sabah" "Bu gün saat %s" "Sabah saat %s" - "%s, %s" + "%1$s, %2$s" "Təkrarlama" "(Başlıq yoxdur)" diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index cf0f4bee..6b8a5d51 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -26,7 +26,7 @@ "Утре" "Днес от %s" "Утре от %s" - "%s, %s" + "%1$s, %2$s" "Повторение" "(Без заглавие)" diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml index 344bfdbc..e2208d73 100644 --- a/res/values-bn/strings.xml +++ b/res/values-bn/strings.xml @@ -26,7 +26,7 @@ "আগামীকাল" "আজ %s" "আগামীকাল %s" - "%s, %s" + "%1$s, %2$s" "পুনরাবৃত্তি" "(কোনো শীর্ষক নেই)" diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 210e5005..eae6b377 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -26,7 +26,7 @@ "Demà" "Avui a les %s" "Demà a les %s" - "%s, %s" + "%1$s, %2$s" "Repetició" "(Sense títol)" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 5542d9d8..267cb83c 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -26,7 +26,7 @@ "Zítra" "Dnes v %s" "Zítra v %s" - "%s, %s" + "%1$s, %2$s" "Opakování" "(bez názvu)" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index ba318a17..5f941bbc 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -26,7 +26,7 @@ "I morgen" "I dag kl. %s" "I morgen kl. %s" - "%s, %s" + "%1$s, %2$s" "Gentagelse" "(Ingen titel)" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 9cea23c6..190d737a 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -26,7 +26,7 @@ "Morgen" "Heute, %s" "Morgen, %s" - "%s, %s" + "%1$s, %2$s" "Wiederholung" "(Kein Titel)" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index cba6b50c..0bc0b3dd 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -26,7 +26,7 @@ "Αύριο" "Σήμερα στις %s" "Αύριο στις %s" - "%s, %s" + "%1$s, %2$s" "Επανάληψη" "(Χωρίς τίτλο)" diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index 36fe6354..7020f08d 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -26,7 +26,7 @@ "Tomorrow" "Today at %s" "Tomorrow at %s" - "%s, %s" + "%1$s, %2$s" "Repetition" "(No title)" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 36fe6354..7020f08d 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -26,7 +26,7 @@ "Tomorrow" "Today at %s" "Tomorrow at %s" - "%s, %s" + "%1$s, %2$s" "Repetition" "(No title)" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index 36fe6354..7020f08d 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -26,7 +26,7 @@ "Tomorrow" "Today at %s" "Tomorrow at %s" - "%s, %s" + "%1$s, %2$s" "Repetition" "(No title)" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 59a8de73..26a9c611 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -26,7 +26,7 @@ "Mañana" "Hoy a la hora %s" "Mañana a la hora %s" - "%s, %s" + "%1$s, %2$s" "Repetición" "(Sin título)" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 1e2cd63d..859f72a6 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -26,7 +26,7 @@ "Mañana" "Hoy a las %s" "Mañana a las %s" - "%s, %s" + "%1$s, %2$s" "Repetición" "(Sin título)" diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index 4ed97790..78be8767 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -26,7 +26,7 @@ "Homme" "Täna kell %s" "Homme kell %s" - "%s, %s" + "%1$s, %2$s" "Kordamine" "(Pealkiri puudub)" diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index 94b1a10d..b1098e26 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -26,7 +26,7 @@ "Bihar" "Gaur (%s)" "Bihar (%s)" - "%s (%s)" + "%1$s (%2$s)" "Errepikapena" "(Ez dauka izenik)" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 079de963..07a84e97 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -26,7 +26,7 @@ "فردا" "امروز در %s" "فردا در %s" - "%s، %s" + "%1$s، %2$s" "تکرار" "(بدون عنوان)" diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index b26fc25c..42c38fcf 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -26,7 +26,7 @@ "Huomenna" "Tänään klo %s" "Huomenna klo %s" - "%s, %s" + "%1$s, %2$s" "Toisto" "(Ei otsikkoa)" diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 13fd5932..5b96c694 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -26,7 +26,7 @@ "Demain" "Aujourd\'hui, %s" "Demain, %s" - "%s, %s" + "%1$s, %2$s" "Répétition" "(Sans titre)" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 4e7c8cf9..33465978 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -26,7 +26,7 @@ "Demain" "Aujourd\'hui, %s" "Demain, %s" - "%s, %s" + "%1$s, %2$s" "Fréquence" "(Sans titre)" diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index f817b62b..61ac2e51 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -26,7 +26,7 @@ "Mañá" "Hoxe ás %s" "Mañá ás %s" - "%s, %s" + "%1$s, %2$s" "Repetición" "(Sen título)" diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml index 699f5427..3959102c 100644 --- a/res/values-gu/strings.xml +++ b/res/values-gu/strings.xml @@ -26,7 +26,7 @@ "આવતીકાલે" "%s વાગ્યે આજે" "%s વાગ્યે આવતીકાલે" - "%s, %s" + "%1$s, %2$s" "પુનરાવર્તન" "(શીર્ષક નહીં)" diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index bfc7dc56..4e1b81bb 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -26,7 +26,7 @@ "आने वाला कल" "आज %s पर" "कल %s पर" - "%s, %s" + "%1$s, %2$s" "दोहराव" "(कोई शीर्षक नहीं)" diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 619048f2..fb5e508a 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -26,7 +26,7 @@ "Sutra" "Danas u %s" "Sutra u %s" - "%s, %s" + "%1$s, %2$s" "Ponavljanje" "(bez naslova)" diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 1f792009..73d71149 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -26,7 +26,7 @@ "Holnap" "Ma %s" "Holnap %s" - "%s, %s" + "%1$s, %2$s" "Ismétlés" "(Nincs cím)" diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml index 333c87cb..ac7fe5b0 100644 --- a/res/values-hy/strings.xml +++ b/res/values-hy/strings.xml @@ -26,7 +26,7 @@ "Վաղը" "Այսօր՝ %s" "Վաղը՝ %s" - "%s, %s" + "%1$s, %2$s" "Կրկնություն" "(Անվերնագիր)" diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 4696dc1b..fae4e3a0 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -26,7 +26,7 @@ "Besok" "Hari ini pukul %s" "Besok pukul %s" - "%s, %s" + "%1$s, %2$s" "Perulangan" "(Tanpa judul)" diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml index 23d6b17d..8b852360 100644 --- a/res/values-is/strings.xml +++ b/res/values-is/strings.xml @@ -26,7 +26,7 @@ "Á morgun" "Í dag klukkan %s" "Á morgun klukkan %s" - "%s kl. %s" + "%1$s kl. %2$s" "Endurtekning" "(Enginn titill)" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 27922139..c03269e4 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -26,7 +26,7 @@ "Domani" "Oggi alle %s" "Domani alle %s" - "%s, %s" + "%1$s, %2$s" "Ripetizione" "(Senza titolo)" diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index d2f7361b..d1535e17 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -26,7 +26,7 @@ "מחר" "היום ב-%s" "מחר ב-%s" - "%s, %s" + "%1$s, %2$s" "חזרה" "(אין כותרת)" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 5f0a9359..49cbe30d 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -26,7 +26,7 @@ "明日" "今日の%s" "明日の%s" - "%sの%s" + "%1$sの%2$s" "繰り返し" "（タイトルなし）" diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml index 55bc5cf5..c1ae45e3 100644 --- a/res/values-ka/strings.xml +++ b/res/values-ka/strings.xml @@ -26,7 +26,7 @@ "ხვალ" "დღეს %s" "ხვალ %s-ზე" - "%s, %s" + "%1$s, %2$s" "გამეორება" "(სათაურის გარეშე)" diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml index 2ad98362..0c7dd0de 100644 --- a/res/values-km/strings.xml +++ b/res/values-km/strings.xml @@ -26,7 +26,7 @@ "ថ្ងៃស្អែក" "ថ្ងៃនេះ​នៅ %s" "ថ្ងៃស្អែក​នៅ %s" - "%s, %s" + "%1$s, %2$s" "កាល​ធ្វើ​ឡើងវិញ" "(គ្មាន​ចំណងជើង)" diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml index efc596d9..89e40d40 100644 --- a/res/values-kn/strings.xml +++ b/res/values-kn/strings.xml @@ -26,7 +26,7 @@ "ನಾಳೆ" "%s ಕ್ಕೆ ಇಂದು" "%s ಕ್ಕೆ ನಾಳೆ" - "%s, %s" + "%1$s, %2$s" "ಪುನರಾವರ್ತಿಸುವಿಕೆ" "(ಯಾವುದೇ ಶೀರ್ಷಿಕೆಯಿಲ್ಲ)" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 3bcbf208..b0102249 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -26,7 +26,7 @@ "내일" "오늘 %s" "내일 %s" - "%s, %s" + "%1$s, %2$s" "반복" "(제목 없음)" diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml index ff953603..58939113 100644 --- a/res/values-lo/strings.xml +++ b/res/values-lo/strings.xml @@ -26,7 +26,7 @@ "ມື້ອື່ນ" "ມື້ນີ້ໃນເວລາ %s" "ມື້ອື່ນໃນເວລາ %s" - "%s, %s" + "%1$s, %2$s" "ການເກີດຊ້ຳ" "(ບໍ່ມີຫົວຂໍ້)" diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index f89ff186..fffcc343 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -26,7 +26,7 @@ "Rytoj" "Šiandien %s" "Rytoj %s" - "%s, %s" + "%1$s, %2$s" "Pasikartojimas" "(Nėra pavadinimo)" diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 4a912a41..e19bec1e 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -26,7 +26,7 @@ "Rīt" "Šodien plkst. %s" "Rīt plkst. %s" - "%s, %s" + "%1$s, %2$s" "Atkārtošana" "(Nav nosaukuma)" diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml index 4eace224..b3439804 100644 --- a/res/values-ml/strings.xml +++ b/res/values-ml/strings.xml @@ -26,7 +26,7 @@ "നാളെ" "ഇന്ന് %s മണിയ്‌ക്ക്" "നാളെ %s മണിയ്‌ക്ക്" - "%s, %s" + "%1$s, %2$s" "ആവർത്തിക്കുക" "(ശീർഷകമൊന്നുമില്ല)" diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml index bc895674..a4315adf 100644 --- a/res/values-mn/strings.xml +++ b/res/values-mn/strings.xml @@ -26,7 +26,7 @@ "Маргааш" "Өнөөдөр %s-д" "Маргааш %s-д" - "%s, %s" + "%1$s, %2$s" "Давталт" "(Гарчиггүй)" diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml index d19e16a1..bf78361d 100644 --- a/res/values-mr/strings.xml +++ b/res/values-mr/strings.xml @@ -26,7 +26,7 @@ "उद्या" "आज %s वाजता" "उद्या %s वाजता" - "%s, %s" + "%1$s, %2$s" "पुनरावृत्ती" "(शीर्षक नाही)" diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 2d8933ed..9d432e0c 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -26,7 +26,7 @@ "Esok" "Hari ini pada %s" "Esok pada %s" - "%s, %s" + "%1$s, %2$s" "Ulangan" "(Tiada tajuk)" diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml index 28ce87f7..a910b125 100644 --- a/res/values-my/strings.xml +++ b/res/values-my/strings.xml @@ -26,7 +26,7 @@ "နက်ဖြန်" "ယနေ့ %s တွင်" "နက်ဖြန် %sတွင်" - "%s၊ %s" + "%1$s၊ %2$s" "ထပ်ဖြစ်မှု" "(ခေါင်းစဉ်မဲ့)" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 1f172d1d..c9bba7a8 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -26,7 +26,7 @@ "I morgen" "I dag kl. %s" "I morgen kl. %s" - "%s kl. %s" + "%1$s kl. %2$s" "Gjentas" "(Ingen tittel)" diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index 89e45ac6..80f69d28 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -26,7 +26,7 @@ "भोलि" "आज %sमा" "भोलि%sमा" - "%s, %s" + "%1$s, %2$s" "दोहोरिने कार्य" "(शीर्षक छैन)" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 0d0dc7a4..ed3fd6cb 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -26,7 +26,7 @@ "Morgen" "Vandaag om %s" "Morgen om %s" - "%s, %s" + "%1$s, %2$s" "Herhaling" "(Geen titel)" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 16482abc..1de1e4bf 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -26,7 +26,7 @@ "Jutro" "Dzisiaj o %s" "Jutro o %s" - "%s, %s" + "%1$s, %2$s" "Powtarzanie" "(Bez tytułu)" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index da20ff4e..06fa3d2b 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -26,7 +26,7 @@ "Amanhã" "Hoje às %s" "Amanhã às %s" - "%s, %s" + "%1$s, %2$s" "Repetição" "(Sem título)" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index b5148019..c37fbf35 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -26,7 +26,7 @@ "Amanhã" "Hoje, às %s" "Amanhã, às %s" - "%s, %s" + "%1$s, %2$s" "Repetições" "(Sem título)" diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index a9d47cf2..7a3a0012 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -26,7 +26,7 @@ "Mâine" "Astăzi la %s" "Mâine la %s" - "%s, %s" + "%1$s, %2$s" "Repetiţie" "(Fără titlu)" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index faa18a6a..f094cd45 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -26,7 +26,7 @@ "Завтра" "Сегодня, %s" "Завтра, %s" - "%s, %s" + "%1$s, %2$s" "Повторять" "(Нет заголовка)" diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml index 8e9b3e5c..8ba8fc24 100644 --- a/res/values-si/strings.xml +++ b/res/values-si/strings.xml @@ -26,7 +26,7 @@ "හෙට" "අද %s ට" "හෙට %s ට" - "%s, %s" + "%1$s, %2$s" "පුනරාවර්තනය" "(නමක් නොමැත)" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 4f595bdc..81ab29fc 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -26,7 +26,7 @@ "Zajtra" "Dnes o %s" "Zajtra o %s" - "%s, %s" + "%1$s, %2$s" "Opakovanie" "(Bez názvu)" diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 38902741..2fe07c6a 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -26,7 +26,7 @@ "Jutri" "Danes ob %s" "Jutri ob %s" - "%s, %s" + "%1$s, %2$s" "Ponovitev" "(Brez naslova)" diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 0f6b71f7..f02cf8e4 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -26,7 +26,7 @@ "Сутра" "Данас у %s" "Сутра у %s" - "%s, %s" + "%1$s, %2$s" "Понављање" "(Без наслова)" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index fbb03927..bcfdd049 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -26,7 +26,7 @@ "Imorgon" "Idag kl. %s" "Imorgon kl. %s" - "%s, %s" + "%1$s, %2$s" "Upprepning" "(Ingen titel)" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 34fef9b6..f9d4f3f5 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -26,7 +26,7 @@ "Kesho" "Leo saa %s" "Kesho saa %s" - "%s, %s" + "%1$s, %2$s" "Kurudia" "(Hakuna kichwa)" diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml index 587f5832..53434205 100644 --- a/res/values-ta/strings.xml +++ b/res/values-ta/strings.xml @@ -26,7 +26,7 @@ "நாளை" "இன்று %s மணிக்கு" "நாளை %s க்கு" - "%s, %s" + "%1$s, %2$s" "நினைவுபடுத்துதல்" "(தலைப்பு இல்லை)" diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml index 648ba852..16eb5af3 100644 --- a/res/values-te/strings.xml +++ b/res/values-te/strings.xml @@ -26,7 +26,7 @@ "రేపు" "ఈ రోజు %sకి" "రేపు %sకి" - "%s, %s" + "%1$s, %2$s" "పునరావృతం" "(శీర్షిక లేదు)" diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index fd29e4b7..a00209c0 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -26,7 +26,7 @@ "วันพรุ่งนี้" "วันนี้เวลา %s" "พรุ่งนี้เวลา %s" - "%s, %s" + "%1$s, %2$s" "การเกิดซ้ำ" "(ไม่มีชื่อ)" diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index b04dec41..ed67ef1b 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -26,7 +26,7 @@ "Bukas" "Ngayong %s" "Bukas ng %s" - "%s, %s" + "%1$s, %2$s" "Pag-uulit" "(Walang pamagat)" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 37e7301a..ff5a12a9 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -26,7 +26,7 @@ "Yarın" "Bugün şu saatler arasında: %s" "Yarın şu saatler arasında: %s" - "%s, %s" + "%1$s, %2$s" "Tekrar" "(Başlıksız)" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 0ae6041b..f10b7018 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -26,7 +26,7 @@ "Завтра" "Сьогодні о %s" "Завтра о %s" - "%s, %s" + "%1$s, %2$s" "Повторювання" "(Без назви)" diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml index a0092ca4..9a9b573b 100644 --- a/res/values-ur/strings.xml +++ b/res/values-ur/strings.xml @@ -27,7 +27,7 @@ "آئندہ کل" "آج بوقت %s" "آئندہ کل بوقت %s" - "%s، %s" + "%1$s، %2$s" "(کوئی عنوان نہیں)" diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 6d46910a..cb28e280 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -26,7 +26,7 @@ "Ngày mai" "Hôm nay lúc %s" "Ngày mai lúc %s" - "%s, %s" + "%1$s, %2$s" "Lặp lại" "(Không có tiêu đề)" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 009fa192..53ecb921 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -26,7 +26,7 @@ "明天" "今天 %s" "明天 %s" - "%s，%s" + "%1$s，%2$s" "重复" "（无标题）" diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 745f1fd4..9c8ecccb 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -26,7 +26,7 @@ "明天" "今天 %s" "明天 %s" - "%s %s" + "%1$s %2$s" "重複頻率" "(無標題)" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index fceb09ff..7a05c7f2 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -26,7 +26,7 @@ "明天" "今天，%s" "明天，%s" - "%s，%s" + "%1$s，%2$s" "顯示頻率" "(無標題)" diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 57d112d8..6274fbe8 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -26,7 +26,7 @@ "Kusasa" "Namuhla ngo-%s" "Kusasa ngo-%s" - "%s, %s" + "%1$s, %2$s" "Impinda" "(Asikho isihloko)" -- cgit v1.2.3 From f7adee7b185cb30bb5cd6856ae8e03ebce6e35ec Mon Sep 17 00:00:00 2001 From: Raman Tenneti Date: Mon, 27 Jul 2020 16:27:22 -0700 Subject: AOSP/Calendar - Update language to comply with Android's inclusive language guidance See https://source.android.com/setup/contribute/respectful-code for reference BUG=161896447 Test: manual - Ran the following tests on Pixel phone. Tested the calendar UI. $ make -j 40 $ make Calendar -j $ make CalendarTests -j $ ls -l out/target/product/bonito/product/app/Calendar/Calendar.apk out/target/product/bonito/testcases/CalendarTests/arm64/CalendarTests.apk $ adb install -r -d -g out/target/product/bonito/product/app/Calendar/Calendar.apk $ adb install -r -d -g out/target/product/bonito/testcases/CalendarTests/arm64/CalendarTests.apk $ adb shell am instrument -w com.android.calendar.tests Time: 0.127 OK (22 tests) Change-Id: I120568d69f9b2cbf63c1846e4113b32e8cd3a35c --- res/layout-sw600dp-w960dp-h527dp-land/all_in_one.xml | 2 +- src/com/android/calendar/EventInfoFragment.java | 4 ++-- src/com/android/calendar/StickyHeaderListView.java | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/res/layout-sw600dp-w960dp-h527dp-land/all_in_one.xml b/res/layout-sw600dp-w960dp-h527dp-land/all_in_one.xml index 7f64a7b2..5e315825 100644 --- a/res/layout-sw600dp-w960dp-h527dp-land/all_in_one.xml +++ b/res/layout-sw600dp-w960dp-h527dp-land/all_in_one.xml @@ -55,7 +55,7 @@ android:textSize="18sp" /> - + Date: Tue, 20 Apr 2021 14:07:07 -0700 Subject: [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Calendar Added SPDX-license-identifier-Apache-2.0 to: Android.mk tests/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I17cbdab4a5eaa0906fe9ad7a57e82885bba1e541 --- Android.mk | 3 +++ tests/Android.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Android.mk b/Android.mk index 82d5d54a..dce26a46 100644 --- a/Android.mk +++ b/Android.mk @@ -34,6 +34,9 @@ LOCAL_SDK_VERSION := current LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) LOCAL_PACKAGE_NAME := Calendar +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE LOCAL_PROGUARD_FLAG_FILES := proguard.flags diff --git a/tests/Android.mk b/tests/Android.mk index bacb8c04..2d74b1ee 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -12,6 +12,9 @@ LOCAL_STATIC_JAVA_LIBRARIES := android.test.runner LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CalendarTests +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE LOCAL_INSTRUMENTATION_FOR := Calendar -- cgit v1.2.3