diff options
| author | Xin Li <delphij@google.com> | 2024-01-17 22:14:34 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2024-01-17 22:14:34 -0800 |
| commit | fe9c8a0144f5184c5bf2785b2a968408e7ec8adb (patch) | |
| tree | 6c4a37b9fcf90666bd1d64b3e65de50c0e7388f2 | |
| parent | 0f162f782e2a024f1d9dbaa934a16fdadce2bf6b (diff) | |
| parent | 2b2dcca48723cfe7902503318d52aec007071efc (diff) | |
| download | CalendarProvider-fe9c8a0144f5184c5bf2785b2a968408e7ec8adb.tar.gz | |
Merge Android 24Q1 Release (ab/11220357)temp_319669529
Bug: 319669529
Merged-In: Ic0b75c2c57030f0a20d8fab1eb3835dc7b3a6a7c
Change-Id: I927d1b355f15046b9f608f7ef98a54443886bc0f
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | res/values-zh-rHK/strings.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3f52171..0f68870 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -22,8 +22,8 @@ <uses-permission android:name="android.permission.READ_CALENDAR" /> <uses-permission android:name="android.permission.WRITE_CALENDAR" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> - <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" /> - <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.cl" /> + <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" android:maxSdkVersion="34"/> + <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.cl" android:maxSdkVersion="34"/> <uses-permission android:name="android.permission.GET_ACCOUNTS" /> <uses-permission android:name="android.permission.GET_ACCOUNTS_PRIVILEGED" /> <uses-permission android:name="android.permission.USE_CREDENTIALS" /> diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 7f5ff5b..5c7247c 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -26,7 +26,7 @@ <string name="provider_label" msgid="1910026788169486138">"日曆"</string> <string name="debug_tool_delete_button" msgid="2843837310185088850">"立即刪除"</string> <string name="debug_tool_start_button" msgid="2827965939935983665">"開始"</string> - <string name="debug_tool_message" msgid="2315979068524074618">"您即將 1) 在 SD 卡或 USB 儲存空間中儲存任何應用程式均可讀取的日曆資料庫副本，並且 2) 以電郵傳送日曆資料庫。請緊記，待成功從裝置複製日曆資料庫或收到電郵後，請隨即刪除日曆資料庫。"</string> + <string name="debug_tool_message" msgid="2315979068524074618">"你即將 1) 在 SD 卡或 USB 儲存空間中儲存任何應用程式均可讀取的日曆資料庫副本，並且 2) 以電郵傳送日曆資料庫。請緊記，待成功從裝置複製日曆資料庫或收到電郵後，請隨即刪除日曆資料庫。"</string> <string name="debug_tool_email_sender_picker" msgid="2527150861906694072">"選擇要用來傳送檔案的程式"</string> <string name="debug_tool_email_subject" msgid="1450453531950410260">"內含「日曆」資料庫附件"</string> <string name="debug_tool_email_body" msgid="1271714905048793618">"附上我的「日曆」資料庫，其中包含我所有的預約和個人資料，請謹慎處理。"</string> |