From 86608fc6b4bcf2b594d3ba054d758656b29d2538 Mon Sep 17 00:00:00 2001 From: Joshua Trask Date: Fri, 27 Sep 2024 14:16:08 +0000 Subject: Add other null check in decorateActionFactoryWithRefinement The nullability for `getEditButtonRunnable()` was addressed in ag/28555982 but a similar fix is still needed for the copy button. Bug: 353397828 Flag: EXEMPT bugfix Test: manual (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:148852fb8d8a0d182b7918852c62d73a43d4855e) Merged-In: I193eaeba55abded5f4726976dc0839d44215726c Change-Id: I193eaeba55abded5f4726976dc0839d44215726c --- java/src/com/android/intentresolver/ChooserActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java index 3db821c1..4fc8fd9d 100644 --- a/java/src/com/android/intentresolver/ChooserActivity.java +++ b/java/src/com/android/intentresolver/ChooserActivity.java @@ -2174,6 +2174,7 @@ public class ChooserActivity extends Hilt_ChooserActivity implements @Override @Nullable public Runnable getCopyButtonRunnable() { + if (originalFactory.getCopyButtonRunnable() == null) return null; return () -> { if (!mRefinementManager.maybeHandleSelection( RefinementType.COPY_ACTION, -- cgit v1.2.3-59-g8ed1b From a3ba3d88d2872f8412e816f13920225c5c9fd182 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 1 Oct 2024 23:54:33 -0700 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Bug: 369418613 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:31625fb93279e79cf0f81fa9d25caa19a84f0b56) Merged-In: I7c747cdd264d3b12efecc08af77f6368c234c3ff Change-Id: I7c747cdd264d3b12efecc08af77f6368c234c3ff --- java/res/values-ar/strings.xml | 2 +- java/res/values-hi/strings.xml | 2 +- java/res/values-iw/strings.xml | 2 +- java/res/values-sv/strings.xml | 2 +- java/res/values-vi/strings.xml | 2 +- java/res/values-zh-rCN/strings.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/java/res/values-ar/strings.xml b/java/res/values-ar/strings.xml index 88faf86c..49769c57 100644 --- a/java/res/values-ar/strings.xml +++ b/java/res/values-ar/strings.xml @@ -76,7 +76,7 @@ "صورة مصغّرة لمعاينة ملف" "ما مِن أشخاص مقترحين للمشاركة معهم" "‏لم يتم منح هذا التطبيق إذن تسجيل، ولكن يمكنه تسجيل الصوت من خلال جهاز USB هذا." - "مساحة شخصية" + "المساحة الشخصية" "مساحة العمل" "المساحة الخاصّة" "عرض المحتوى الشخصي" diff --git a/java/res/values-hi/strings.xml b/java/res/values-hi/strings.xml index 0cc9b219..3f6db1be 100644 --- a/java/res/values-hi/strings.xml +++ b/java/res/values-hi/strings.xml @@ -76,7 +76,7 @@ "फ़ाइल के थंबनेल की झलक" "शेयर करने के लिए, किसी व्यक्ति का सुझाव नहीं दिया गया है" "इस ऐप्लिकेशन को रिकॉर्ड करने की अनुमति नहीं दी गई है. हालांकि, ऐप्लिकेशन इस यूएसबी डिवाइस से ऐसा कर सकता है." - "निजी प्रोफ़ाइल" + "निजी" "वर्क प्रोफ़ाइल" "प्राइवेट" "निजी व्यू" diff --git a/java/res/values-iw/strings.xml b/java/res/values-iw/strings.xml index e7521e77..bed01ff0 100644 --- a/java/res/values-iw/strings.xml +++ b/java/res/values-iw/strings.xml @@ -78,7 +78,7 @@ "‏לאפליקציה זו לא ניתנה הרשאת הקלטה, אבל אפשר להקליט אודיו באמצעות התקן ה-USB הזה." "אישי" "עבודה" - "פרטי" + "מרחב פרטי" "תצוגה אישית" "תצוגת עבודה" "תצוגה פרטית" diff --git a/java/res/values-sv/strings.xml b/java/res/values-sv/strings.xml index a21af078..d48cc781 100644 --- a/java/res/values-sv/strings.xml +++ b/java/res/values-sv/strings.xml @@ -76,7 +76,7 @@ "Miniatyr av förhandsgranskning av fil" "Inga rekommenderade personer att dela med" "Appen har inte fått inspelningsbehörighet men kan spela in ljud via denna USB-enhet." - "Privat" + "Personlig" "Jobb" "Privat" "Personlig vy" diff --git a/java/res/values-vi/strings.xml b/java/res/values-vi/strings.xml index eb789f5e..4c84256e 100644 --- a/java/res/values-vi/strings.xml +++ b/java/res/values-vi/strings.xml @@ -89,7 +89,7 @@ "Bạn không thể mở nội dung này bằng ứng dụng cá nhân" "Không chia sẻ được nội dung này bằng ứng dụng riêng tư" "Không mở được nội dung này bằng ứng dụng riêng tư" - "Các ứng dụng công việc đã bị tạm dừng" + "Các ứng dụng trong hồ sơ Công việc đã bị tạm dừng" "Tiếp tục" "Không có ứng dụng công việc" "Không có ứng dụng cá nhân" diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml index a2401ce7..c2fa444f 100644 --- a/java/res/values-zh-rCN/strings.xml +++ b/java/res/values-zh-rCN/strings.xml @@ -67,7 +67,7 @@ "{count,plural, =1{正在分享带有链接的视频}other{正在分享带有链接的 # 个视频}}" "{count,plural, =1{正在分享带有文本的文件}other{正在分享带有文本的 # 个文件}}" "{count,plural, =1{正在分享带有链接的文件}other{正在分享带有链接的 # 个文件}}" - "分享影集" + "分享相册" "{count,plural, =1{仅限图片}other{仅限图片}}" "{count,plural, =1{仅限视频}other{仅限视频}}" "{count,plural, =1{仅限文件}other{仅限文件}}" -- cgit v1.2.3-59-g8ed1b