Merge "Snap for 5735642 from 0f3297fadccd81ea9f6f76e45757c378938b25a7 to sdk-release" into sdk-release
diff --git a/Android.bp b/Android.bp
index 355ec48..4888508 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,4 +22,6 @@
"android-support-v7-preference",
"android-support-v7-recyclerview",
],
+
+ aaptflags: ["--legacy"],
}
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cf42713..487361e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -22,13 +22,14 @@
<original-package android:name="com.android.alarmclock" />
<original-package android:name="com.android.deskclock" />
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
+ <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="25" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<!-- WRITE_SETTINGS is required to record the upcoming alarm prior to L -->
<uses-permission
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index d5bdaba..8c3f66f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -30,7 +30,7 @@
<string name="remove_sound" msgid="2064643204455734239">"削除"</string>
<string name="confirm_remove_custom_ringtone" msgid="1724111242265208553">"この音を使用するアラームとタイマーでは、代わりにデフォルトの音が使用されます。"</string>
<string name="your_sounds" msgid="1672779351352629681">"マイサウンド"</string>
- <string name="device_sounds" msgid="1584894148222639823">"端末のサウンド"</string>
+ <string name="device_sounds" msgid="1584894148222639823">"デバイスのサウンド"</string>
<string name="custom_ringtone_lost_permissions" msgid="3406310054255354331">"音声コンテンツにアクセスできません。"</string>
<string name="default_timer_ringtone_title" msgid="1370799536406862317">"タイマー完了"</string>
<string name="alarm_tomorrow" msgid="131356848787643420">"明日"</string>
@@ -183,7 +183,7 @@
<string name="silent_default_alarm_ringtone" msgid="6012855475009670997">"アラーム音のデフォルト設定はマナーモードです"</string>
<string name="change_setting_action" msgid="1224356633832430160">"変更"</string>
<string name="app_notifications_blocked" msgid="7249150789023936889">"時計の通知はブロックされています"</string>
- <string name="alarms_blocked_by_dnd" msgid="6089433757505898969">"端末は [サイレント] に設定されています"</string>
+ <string name="alarms_blocked_by_dnd" msgid="6089433757505898969">"デバイスは [サイレント] に設定されています"</string>
<string name="volume_button_setting_title" msgid="6937131248843413357">"音量ボタン"</string>
<string-array name="volume_button_setting_entries">
<item msgid="7972756698723318690">"スヌーズ"</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ac80b4e..443d182 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -81,7 +81,7 @@
unattended for a number of minutes. It tells the user that
the alarm has been silenced.-->
<string name="alarm_missed_title">Missed alarm</string>
- <string name="alarm_missed_text"><xliff:g id="alarm_time">%s</xliff:g> - <xliff:g id="alarm_label">%s</xliff:g></string>
+ <string name="alarm_missed_text"><xliff:g id="alarm_time">%1$s</xliff:g> - <xliff:g id="alarm_label">%2$s</xliff:g></string>
<!-- The text shown after user snoozed an alerting alarm. The text will be shown
together with the number of minutes in two separate lines. For example:
@@ -588,8 +588,8 @@
<!-- Describes the purpose of the notification button to reset all running timers. [CHAR LIMIT=31] -->
<string name="timer_reset_all">Reset all timers</string>
- <string name="hours_minutes_seconds"><xliff:g id="hours" example="2">%d</xliff:g>:<xliff:g id="minutes" example="3">%02d</xliff:g>:<xliff:g id="seconds" example="44">%02d</xliff:g></string>
- <string name="minutes_seconds"><xliff:g id="minutes" example="3">%d</xliff:g>:<xliff:g id="seconds" example="44">%02d</xliff:g></string>
+ <string name="hours_minutes_seconds"><xliff:g id="hours" example="2">%1$d</xliff:g>:<xliff:g id="minutes" example="3">%2$02d</xliff:g>:<xliff:g id="seconds" example="44">%3$02d</xliff:g></string>
+ <string name="minutes_seconds"><xliff:g id="minutes" example="3">%1$d</xliff:g>:<xliff:g id="seconds" example="44">%2$02d</xliff:g></string>
<string name="seconds"><xliff:g id="seconds" example="44">%d</xliff:g></string>
<!-- Jocular content that user may append when sharing the lap times -->
