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

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

Snap for 13158768 from 6164e9d5 to 25Q2-release 

Change-Id: Icbaf2567b3be4412d8a108817046169ef53a9435
parents 4ad883d1 6164e9d5

res/layout/customization_option_entry_themed_icons.xml

+1 −14
Original line number Diff line number Diff line
@@ -33,21 +33,8 @@ 
        android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toStartOf="@+id/option_entry_switch"

        app:layout_constraintBottom_toTopOf="@+id/option_entry_description"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintVertical_chainStyle="packed" />



    <TextView

        android:id="@+id/option_entry_description"

        style="@style/CustomizationOptionEntrySubtitleTextStyle"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"

        android:text="@string/beta_title"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toStartOf="@+id/option_entry_switch"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toBottomOf="@+id/option_entry_title" />

        app:layout_constraintBottom_toBottomOf="parent" />



    <com.google.android.material.materialswitch.MaterialSwitch

        android:id="@+id/option_entry_switch"

res/values-es-rUS/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ 
    <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"Mostrar las notificaciones en la pantalla de bloqueo"</string>

    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"Notific. en pantalla de bloqueo"</string>

    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"Administra cómo aparecen las notificaciones y qué mostrar"</string>

    <string name="more_settings_section_title" msgid="6854797937797818510">"Más opciones de pant. de bloqueo"</string>

    <string name="more_settings_section_title" msgid="6854797937797818510">"Más opciones de pantalla de bloqueo"</string>

    <string name="more_settings_section_description" msgid="1860115709122398325">"Privacidad, Está sonando y más"</string>

    <string name="more_colors" msgid="3191071655353004591">"Más colores"</string>

    <string name="content_description_dynamic_color_option" msgid="2191721655642529886">"Tema dinámico principal"</string>

res/values-fa/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ 
    <string name="show_notifications_on_lock_screen" msgid="4157744243084646720">"نمایش اعلان‌ها در صفحه قفل"</string>

    <string name="lock_screen_notifications_section_title" msgid="906673283764252102">"اعلان‌ها در صفحه قفل"</string>

    <string name="lock_screen_notifications_section_description" msgid="3321937285144466046">"مدیریت کردن نحوه نشان داده شدن اعلان‌ها و آنچه نشان داده می‌شود"</string>

    <string name="more_settings_section_title" msgid="6854797937797818510">"تنظیمات دیگر صفحه قفل"</string>

    <string name="more_settings_section_title" msgid="6854797937797818510">"تنظیمات بیشتر صفحه قفل"</string>

    <string name="more_settings_section_description" msgid="1860115709122398325">"«حریم خصوصی»، «درحال پخش»، و موارد دیگر"</string>

    <string name="more_colors" msgid="3191071655353004591">"رنگ‌های بیشتر"</string>

    <string name="content_description_dynamic_color_option" msgid="2191721655642529886">"زمینه پویای اصلی"</string>

src/com/android/customization/picker/clock/ui/view/ThemePickerClockViewFactory.kt

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ constructor( 
    private fun initClockController(clockId: String): ClockController? {

        val isWallpaperDark = isLockscreenWallpaperDark()

        return registry.createExampleClock(clockId)?.also { controller ->

            controller.initialize(isWallpaperDark, 0f, 0f, {})

            controller.initialize(isWallpaperDark, 0f, 0f, null)



            // Initialize large clock

            controller.largeClock.events.onFontSettingChanged(

tests/robotests/src/com/android/customization/picker/clock/ui/FakeClockViewFactory.kt

+2 −2
Original line number Diff line number Diff line 
package com.android.customization.picker.clock.ui



import android.graphics.RectF

import android.view.View

import androidx.lifecycle.LifecycleOwner

import com.android.customization.picker.clock.data.repository.FakeClockPickerRepository

import com.android.customization.picker.clock.ui.view.ClockViewFactory

import com.android.systemui.plugins.clocks.ClockConfig

import com.android.systemui.plugins.clocks.ClockController

import com.android.systemui.plugins.clocks.ClockEventListener

import com.android.systemui.plugins.clocks.ClockEvents

import com.android.systemui.plugins.clocks.ClockFaceController

import com.android.systemui.plugins.clocks.ClockFontAxisSetting
@@ -34,7 +34,7 @@ class FakeClockViewFactory @Inject constructor() : ClockViewFactory { 
            isDarkTheme: Boolean,

            dozeFraction: Float,

            foldFraction: Float,

            onBoundsChanged: (RectF) -> Unit,

            clockListener: ClockEventListener?,

        ) = TODO("Not yet implemented")



        override fun dump(pw: PrintWriter) = TODO("Not yet implemented")