Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f33e9681 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13129673 from 2ab3298b to 25Q2-release

Change-Id: I74d654173acdaa2f1be5b6fe8588cf09a8f1e08a
parents 2a7c9435 2ab3298b
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@

<resources xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="app_name" msgid="1647136562008520313">"Tapeta a styl"</string>
    <string name="app_name" msgid="1647136562008520313">"Tapety a styl"</string>
    <string name="theme_title" msgid="2144932106319405101">"Styl"</string>
    <string name="clock_title" msgid="2126046720254613991">"Hodiny"</string>
    <string name="clock_description" msgid="3563839327378948">"Výběr vlastních hodin"</string>
+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@
    <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Benachrichtigungen auf dem Sperrbildschirm einblenden"</string>
    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Benachr. auf Sperrbildschirm"</string>
    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Legt fest, welche Benachrichtigungen angezeigt werden und wie"</string>
    <string name="more_settings_section_title" msgid="6854797937797818510">"Mehr Sperrbildschirm-Einst."</string>
    <string name="more_settings_section_title" msgid="6854797937797818510">"Sperrbildschirm-Einstellungen"</string>
    <string name="more_settings_section_description" msgid="1860115709122398325">"Datenschutz, Now Playing und mehr"</string>
    <string name="more_colors" msgid="3191071655353004591">"Weitere Farben"</string>
    <string name="content_description_dynamic_color_option" msgid="2191721655642529886">"Primäres dynamisches Design"</string>
+5 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import com.android.wallpaper.picker.customization.ui.binder.ColorUpdateBinder
import com.android.wallpaper.picker.customization.ui.binder.CustomizationOptionsBinder
import com.android.wallpaper.picker.customization.ui.binder.DefaultCustomizationOptionsBinder
import com.android.wallpaper.picker.customization.ui.util.CustomizationOptionUtil.CustomizationOption
import com.android.wallpaper.picker.customization.ui.util.ViewAlphaAnimator.animateToAlpha
import com.android.wallpaper.picker.customization.ui.viewmodel.ColorUpdateViewModel
import com.android.wallpaper.picker.customization.ui.viewmodel.CustomizationOptionsViewModel
import com.android.wallpaper.picker.customization.ui.viewmodel.CustomizationPickerViewModel2
@@ -476,6 +477,10 @@ constructor(private val defaultCustomizationOptionsBinder: DefaultCustomizationO
                            clockViewFactory.updateFontAxes(clock.clockId, axisList)
                        }
                }

                launch {
                    viewModel.lockPreviewAnimateToAlpha.collect { clockHostView.animateToAlpha(it) }
                }
            }
        }
    }