Merge "Fix crash of resource not found (1/2)" into udc-qpr-dev
diff --git a/src/com/android/customization/module/CustomizationInjector.kt b/src/com/android/customization/module/CustomizationInjector.kt
index 5f8f9d3..8fd3768 100644
--- a/src/com/android/customization/module/CustomizationInjector.kt
+++ b/src/com/android/customization/module/CustomizationInjector.kt
@@ -16,6 +16,7 @@
package com.android.customization.module
import android.content.Context
+import android.content.res.Resources
import androidx.activity.ComponentActivity
import androidx.fragment.app.FragmentActivity
import com.android.customization.model.theme.OverlayManagerCompat
@@ -78,5 +79,5 @@
clockViewFactory: ClockViewFactory,
): ClockSettingsViewModel.Factory
- fun getClockDescriptionUtils(): ClockDescriptionUtils
+ fun getClockDescriptionUtils(resources: Resources): ClockDescriptionUtils
}
diff --git a/src/com/android/customization/module/ThemePickerInjector.kt b/src/com/android/customization/module/ThemePickerInjector.kt
index 902ef6e..a611d7a 100644
--- a/src/com/android/customization/module/ThemePickerInjector.kt
+++ b/src/com/android/customization/module/ThemePickerInjector.kt
@@ -19,6 +19,7 @@
import android.app.WallpaperManager
import android.content.Context
import android.content.Intent
+import android.content.res.Resources
import android.net.Uri
import android.os.Bundle
import android.text.TextUtils
@@ -553,7 +554,7 @@
.also { clockSettingsViewModelFactory = it }
}
- override fun getClockDescriptionUtils(): ClockDescriptionUtils {
+ override fun getClockDescriptionUtils(resources: Resources): ClockDescriptionUtils {
return clockDescriptionUtils
?: ThemePickerClockDescriptionUtils().also { clockDescriptionUtils = it }
}
diff --git a/src/com/android/customization/picker/clock/ui/viewmodel/ClockCarouselItemViewModel.kt b/src/com/android/customization/picker/clock/ui/viewmodel/ClockCarouselItemViewModel.kt
index ea2f776..9811426 100644
--- a/src/com/android/customization/picker/clock/ui/viewmodel/ClockCarouselItemViewModel.kt
+++ b/src/com/android/customization/picker/clock/ui/viewmodel/ClockCarouselItemViewModel.kt
@@ -26,9 +26,8 @@
fun getContentDescription(resources: Resources): String {
val clockContent =
(InjectorProvider.getInjector() as? CustomizationInjector)
- ?.getClockDescriptionUtils()
- ?.getDescriptionResId(clockId)
- ?.let { resources.getString(it) }
+ ?.getClockDescriptionUtils(resources)
+ ?.getDescription(clockId)
?: ""
return resources.getString(R.string.select_clock_action_description, clockContent)
}
diff --git a/src/com/android/customization/picker/clock/utils/ClockDescriptionUtils.kt b/src/com/android/customization/picker/clock/utils/ClockDescriptionUtils.kt
index 9a0b66f..28ea4a3 100644
--- a/src/com/android/customization/picker/clock/utils/ClockDescriptionUtils.kt
+++ b/src/com/android/customization/picker/clock/utils/ClockDescriptionUtils.kt
@@ -15,14 +15,12 @@
*/
package com.android.customization.picker.clock.utils
-import androidx.annotation.StringRes
-
/** Provides clock description for accessibility purposes. */
interface ClockDescriptionUtils {
/**
- * TODO (b/287507746) : Migrate description res ID to system UI or a shared library, instead of
- * preserving the clock description at the Wallpaper Picker side.
+ * TODO (b/287507746) : Migrate the clock description to system UI or a shared library, instead
+ * of preserving at the Wallpaper Picker side.
*/
- @StringRes fun getDescriptionResId(clockId: String): Int
+ fun getDescription(clockId: String): String
}
diff --git a/src/com/android/customization/picker/clock/utils/ThemePickerClockDescriptionUtils.kt b/src/com/android/customization/picker/clock/utils/ThemePickerClockDescriptionUtils.kt
index 43f19b3..a04ebff 100644
--- a/src/com/android/customization/picker/clock/utils/ThemePickerClockDescriptionUtils.kt
+++ b/src/com/android/customization/picker/clock/utils/ThemePickerClockDescriptionUtils.kt
@@ -15,12 +15,8 @@
*/
package com.android.customization.picker.clock.utils
-import androidx.annotation.StringRes
-import com.android.wallpaper.R
-
class ThemePickerClockDescriptionUtils : ClockDescriptionUtils {
- @StringRes
- override fun getDescriptionResId(clockId: String): Int {
- return R.string.clock_title
+ override fun getDescription(clockId: String): String {
+ return ""
}
}