Merge "Import translations. DO NOT MERGE ANYWHERE" into main
diff --git a/res/layout/clock_host_view.xml b/res/layout/clock_host_view.xml
index 3f768e2..33cca01 100644
--- a/res/layout/clock_host_view.xml
+++ b/res/layout/clock_host_view.xml
@@ -19,4 +19,5 @@
android:importantForAccessibility="noHideDescendants"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_gravity="center" />
\ No newline at end of file
+ android:layout_gravity="center"
+ android:clipChildren="false"/>
\ No newline at end of file
diff --git a/src/com/android/customization/module/logging/ThemesUserEventLoggerImpl.kt b/src/com/android/customization/module/logging/ThemesUserEventLoggerImpl.kt
index b28086b..0a639fb 100644
--- a/src/com/android/customization/module/logging/ThemesUserEventLoggerImpl.kt
+++ b/src/com/android/customization/module/logging/ThemesUserEventLoggerImpl.kt
@@ -56,7 +56,6 @@
import com.android.wallpaper.module.logging.UserEventLogger.EffectStatus
import com.android.wallpaper.module.logging.UserEventLogger.SetWallpaperEntryPoint
import com.android.wallpaper.module.logging.UserEventLogger.WallpaperDestination
-import com.android.wallpaper.util.ActivityUtils
import com.android.wallpaper.util.LaunchSourceUtils
import javax.inject.Inject
import javax.inject.Singleton
@@ -124,7 +123,7 @@
effect: String,
@EffectStatus status: Int,
timeElapsedMillis: Long,
- resultCode: Int
+ resultCode: Int,
) {
SysUiStatsLogger(WALLPAPER_EFFECT_APPLIED)
.setAppSessionId(appSessionId.getId())
@@ -146,7 +145,7 @@
override fun logEffectForegroundDownload(
effect: String,
@EffectStatus status: Int,
- timeElapsedMillis: Long
+ timeElapsedMillis: Long,
) {
SysUiStatsLogger(WALLPAPER_EFFECT_FG_DOWNLOAD)
.setAppSessionId(appSessionId.getId())
@@ -164,11 +163,7 @@
SysUiStatsLogger(WALLPAPER_EXPLORE).setAppSessionId(appSessionId.getId()).log()
}
- override fun logThemeColorApplied(
- @ColorSource source: Int,
- style: Int,
- seedColor: Int,
- ) {
+ override fun logThemeColorApplied(@ColorSource source: Int, style: Int, seedColor: Int) {
SysUiStatsLogger(THEME_COLOR_APPLIED)
.setAppSessionId(appSessionId.getId())
.setColorSource(source)
@@ -251,10 +246,9 @@
LaunchSourceUtils.LAUNCH_SOURCE_TIPS -> LAUNCHED_TIPS
LaunchSourceUtils.LAUNCH_SOURCE_DEEP_LINK -> LAUNCHED_DEEP_LINK
LaunchSourceUtils.LAUNCH_SOURCE_KEYGUARD -> LAUNCHED_KEYGUARD
+ LaunchSourceUtils.LAUNCH_SOURCE_SETTINGS_SEARCH -> LAUNCHED_SETTINGS_SEARCH
else -> LAUNCHED_PREFERENCE_UNSPECIFIED
}
- } else if (ActivityUtils.isLaunchedFromSettingsSearch(this)) {
- LAUNCHED_SETTINGS_SEARCH
} else if (action != null && action == WallpaperManager.ACTION_CROP_AND_SET_WALLPAPER) {
LAUNCHED_CROP_AND_SET_ACTION
} else if (categories != null && categories.contains(Intent.CATEGORY_LAUNCHER)) {
diff --git a/src/com/android/customization/picker/clock/ui/view/ClockHostView2.kt b/src/com/android/customization/picker/clock/ui/view/ClockHostView2.kt
index d5b317e..be2e53d 100644
--- a/src/com/android/customization/picker/clock/ui/view/ClockHostView2.kt
+++ b/src/com/android/customization/picker/clock/ui/view/ClockHostView2.kt
@@ -63,8 +63,7 @@
private fun updatePivotAndScale() {
when (clockSize) {
ClockSize.DYNAMIC -> {
- pivotX = (width / 2).toFloat()
- pivotY = (height / 2).toFloat()
+ resetPivot()
}
ClockSize.SMALL -> {
pivotX = getCenteredHostViewPivotX(this)