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

Commit e496c66c authored by Santiago Etchebehere's avatar Santiago Etchebehere
Browse files

Merging from ub-launcher3-master @ build 6609171 

Bug:154410862
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-master_rvc-d1-dev_6609171.html

Change-Id: I50d4610dadb8661314411dcf547b25fed475c90e
parents 616b7223 500804ec

res/layout/theme_option.xml

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
            android:layout_width="@dimen/theme_option_icon_sample_width"

            android:layout_height="@dimen/theme_option_icon_sample_height"

            android:layout_alignParentTop="true"

            android:layout_alignParentLeft="true"

            android:layout_alignParentStart="true"

            android:tint="?android:colorForeground"/>

        <ImageView

            android:id="@+id/theme_option_shape"
@@ -54,7 +54,7 @@ 
            android:layout_height="@dimen/theme_option_shape_sample_height"

            android:layout_alignBottom="@+id/theme_option_icon"

            android:layout_toEndOf="@id/theme_option_icon"

            android:layout_marginLeft="@dimen/theme_option_sample_margin"/>

            android:layout_marginStart="@dimen/theme_option_sample_margin"/>

        <TextView

            android:id="@+id/theme_option_font"

            android:layout_width="@dimen/theme_option_font_sample_width"

res/layout/theme_preview_color_icons.xml

+11 −15
Original line number Diff line number Diff line
@@ -129,18 +129,18 @@ 
        </LinearLayout>



        <!-- Icons of CheckBox/RadioButton/Switch. -->

        <LinearLayout

        <RelativeLayout

            android:id="@+id/button_icons"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintTop_toBottomOf="@id/qs_icons"

            app:layout_constraintBottom_toBottomOf="parent">

            <FrameLayout

                android:layout_width="@dimen/preview_theme_icon_size"

                android:layout_height="@dimen/preview_theme_icon_size">

                android:layout_height="@dimen/preview_theme_icon_size"

                android:layout_alignParentStart="true">

                <CheckBox

                    android:id="@+id/preview_check_selected"

                    android:layout_width="wrap_content"
@@ -149,13 +149,11 @@ 
                    android:checked="true"

                    android:enabled="false"/>

            </FrameLayout>

            <Space

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="1" />



            <FrameLayout

                android:layout_width="@dimen/preview_theme_icon_size"

                android:layout_height="@dimen/preview_theme_icon_size">

                android:layout_height="@dimen/preview_theme_icon_size"

                android:layout_centerHorizontal="true">

                <RadioButton

                    android:id="@+id/preview_radio_selected"

                    android:layout_width="wrap_content"
@@ -164,13 +162,11 @@ 
                    android:checked="true"

                    android:enabled="false"/>

            </FrameLayout>

            <Space

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="1" />



            <FrameLayout

                android:layout_width="@dimen/preview_theme_icon_size"

                android:layout_height="@dimen/preview_theme_icon_size">

                android:layout_width="wrap_content"

                android:layout_height="@dimen/preview_theme_icon_size"

                android:layout_alignParentEnd="true">

                <Switch

                    android:id="@+id/preview_toggle_selected"

                    android:layout_width="wrap_content"
@@ -179,7 +175,7 @@ 
                    android:checked="true"

                    android:enabled="false"/>

            </FrameLayout>

        </LinearLayout>

        </RelativeLayout>



    </androidx.constraintlayout.widget.ConstraintLayout>

</androidx.cardview.widget.CardView>

res/values-af/strings.xml

+18 −6
Original line number Diff line number Diff line
@@ -21,14 +21,14 @@ 
    <string name="theme_title" msgid="2144932106319405101">"Styl"</string>

    <string name="clock_title" msgid="2126046720254613991">"Horlosie"</string>

    <string name="grid_title" msgid="2825094404523390773">"Rooster"</string>

    <string name="wallpaper_title" msgid="6952635398953194544">"Muurpapier"</string>

    <string name="apply_theme_btn" msgid="6293081192321303991">"Pas toe"</string>

    <string name="edit_custom_theme_lbl" msgid="5211377705710775224">"Tik om te wysig"</string>

    <string name="keep_my_wallpaper" msgid="8012385376769568517">"Hou huidige muurpapier"</string>

    <string name="apply_btn" msgid="7965877231041987336">"Pas toe"</string>

    <string name="accessibility_preview_pager" msgid="3548503287402185430">"Bladsy <xliff:g id="ID_1">%1$d</xliff:g> van <xliff:g id="ID_2">%2$d</xliff:g>"</string>

    <string name="next_page_content_description" msgid="5290226604542300962">"Volgende"</string>

    <string name="previous_page_content_description" msgid="6025726405430262788">"Vorige"</string>

    <!-- no translation found for theme_preview_card_content_description (5989222908619535533) -->

    <skip />

    <!-- no translation found for grid_preview_card_content_description (8449383777584714842) -->

    <skip />

    <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>, tans toegepas"</string>

    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, word tans toegepas en voorbeskou"</string>

    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, word tans voorbeskou"</string>
@@ -41,12 +41,20 @@ 
    <string name="preview_name_wallpaper" msgid="1738652462949531828">"Muurpapier"</string>

    <string name="font_card_title" msgid="2343292653502548685">"ABC • abc • 123"</string>

    <string name="font_card_body" msgid="6790525594503904468">"Voeg jou gunstelinglettertipes op elke skerm by"</string>

    <!-- no translation found for grid_options_title (7071930966989877023) -->

    <skip />

    <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g> x <xliff:g id="ID_2">%2$d</xliff:g>"</string>

    <string name="applied_theme_msg" msgid="7348498271552054431">"Styl is toegepas"</string>

    <string name="applied_clock_msg" msgid="1938218786265793285">"Horlosie is toegepas"</string>

    <!-- no translation found for applied_theme_msg (3749018706366796244) -->

    <skip />

    <!-- no translation found for applied_clock_msg (1303338016701443767) -->

    <skip />

    <!-- no translation found for applied_grid_msg (3250499654436933034) -->

    <skip />

    <string name="apply_theme_error_msg" msgid="791364062636538317">"Kon nie die styl toepas nie"</string>

    <string name="custom_theme_next" msgid="6235420097213197301">"Volgende"</string>

    <string name="custom_theme_previous" msgid="4941132112640503022">"Vorige"</string>

    <!-- no translation found for custom_theme (1618351922263478163) -->

    <skip />

    <string name="custom_theme_title" msgid="2192300350332693631">"Gepasmaakte <xliff:g id="ID_1">%1$d</xliff:g>"</string>

    <string name="custom_theme_fragment_title" msgid="6615547284702040280">"Gepasmaakte styl"</string>

    <string name="custom_theme_delete" msgid="4744494663184126202">"Vee uit"</string>
@@ -66,4 +74,8 @@ 
    <string name="no_thanks" msgid="7286616980115687627">"Nee, dankie"</string>

    <string name="clock_preview_content_description" msgid="5460561185905717460">"<xliff:g id="ID_1">%1$s</xliff:g>-horlosievoorskou"</string>

    <string name="something_went_wrong" msgid="529840112449799117">"Oeps! Iets het skeefgeloop."</string>

    <!-- no translation found for theme_preview_icons_section_title (7064768910744000643) -->

    <skip />

    <!-- no translation found for style_info_description (4201603728542216488) -->

    <skip />

</resources>

res/values-am/strings.xml

+18 −6
Original line number Diff line number Diff line
@@ -21,14 +21,14 @@ 
    <string name="theme_title" msgid="2144932106319405101">"ቅጥ"</string>

    <string name="clock_title" msgid="2126046720254613991">"ሰዓት"</string>

    <string name="grid_title" msgid="2825094404523390773">"ፍርግርግ"</string>

    <string name="wallpaper_title" msgid="6952635398953194544">"ልጣፍ"</string>

    <string name="apply_theme_btn" msgid="6293081192321303991">"ተግብር"</string>

    <string name="edit_custom_theme_lbl" msgid="5211377705710775224">"ለማርትዕ መታ ያድርጉ"</string>

    <string name="keep_my_wallpaper" msgid="8012385376769568517">"የአሁኑን ልጣፍ ያቆዩት"</string>

    <string name="apply_btn" msgid="7965877231041987336">"ተግብር"</string>

    <string name="accessibility_preview_pager" msgid="3548503287402185430">"ገጽ <xliff:g id="ID_1">%1$d</xliff:g> ከ<xliff:g id="ID_2">%2$d</xliff:g>"</string>

    <string name="next_page_content_description" msgid="5290226604542300962">"ቀጣይ"</string>

    <string name="previous_page_content_description" msgid="6025726405430262788">"ቀዳሚ"</string>

    <!-- no translation found for theme_preview_card_content_description (5989222908619535533) -->

    <skip />

    <!-- no translation found for grid_preview_card_content_description (8449383777584714842) -->

    <skip />

    <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>፣ አሁን ላይ ተፈጻሚ ሆኗል"</string>

    <string name="option_applied_previewed_description" msgid="5269654286638446858">"<xliff:g id="ID_1">%1$s</xliff:g>, currently applied and previewed"</string>

    <string name="option_previewed_description" msgid="3467217598865047661">"<xliff:g id="ID_1">%1$s</xliff:g>, currently previewed"</string>
@@ -41,12 +41,20 @@ 
    <string name="preview_name_wallpaper" msgid="1738652462949531828">"ልጣፍ"</string>

    <string name="font_card_title" msgid="2343292653502548685">"ABC • abc • 123"</string>

    <string name="font_card_body" msgid="6790525594503904468">"የእርስዎን ተወዳጅ ቁፊዎች ወደ ሁሉም ማያ ገጽ ያክሉ"</string>

    <!-- no translation found for grid_options_title (7071930966989877023) -->

    <skip />

    <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>

    <string name="applied_theme_msg" msgid="7348498271552054431">"ቅጥ ተተግብሯል"</string>

    <string name="applied_clock_msg" msgid="1938218786265793285">"ሰዓት ተተግብሯል"</string>

    <!-- no translation found for applied_theme_msg (3749018706366796244) -->

    <skip />

    <!-- no translation found for applied_clock_msg (1303338016701443767) -->

    <skip />

    <!-- no translation found for applied_grid_msg (3250499654436933034) -->

    <skip />

    <string name="apply_theme_error_msg" msgid="791364062636538317">"ቅጡን መተግበር ላይ ችግር ነበር"</string>

    <string name="custom_theme_next" msgid="6235420097213197301">"ቀጣይ"</string>

    <string name="custom_theme_previous" msgid="4941132112640503022">"ቀዳሚ"</string>

    <!-- no translation found for custom_theme (1618351922263478163) -->

    <skip />

    <string name="custom_theme_title" msgid="2192300350332693631">"ብጁ <xliff:g id="ID_1">%1$d</xliff:g>"</string>

    <string name="custom_theme_fragment_title" msgid="6615547284702040280">"ብጁ ቅጥ"</string>

    <string name="custom_theme_delete" msgid="4744494663184126202">"ሰርዝ"</string>
@@ -66,4 +74,8 @@ 
    <string name="no_thanks" msgid="7286616980115687627">"አይ፣ አመሰግናለሁ"</string>

    <string name="clock_preview_content_description" msgid="5460561185905717460">"የ<xliff:g id="ID_1">%1$s</xliff:g> ሰዓት ቅድመ-እይታ"</string>

    <string name="something_went_wrong" msgid="529840112449799117">"ውይ! የሆነ ችግር ተፈጥሯል።"</string>

    <!-- no translation found for theme_preview_icons_section_title (7064768910744000643) -->

    <skip />

    <!-- no translation found for style_info_description (4201603728542216488) -->

    <skip />

</resources>

res/values-ar/strings.xml

+19 −7
Original line number Diff line number Diff line
@@ -21,14 +21,14 @@ 
    <string name="theme_title" msgid="2144932106319405101">"النمط"</string>

    <string name="clock_title" msgid="2126046720254613991">"الساعة"</string>

    <string name="grid_title" msgid="2825094404523390773">"شبكة"</string>

    <string name="wallpaper_title" msgid="6952635398953194544">"الخلفية"</string>

    <string name="apply_theme_btn" msgid="6293081192321303991">"تطبيق"</string>

    <string name="edit_custom_theme_lbl" msgid="5211377705710775224">"انقُر للتعديل."</string>

    <string name="keep_my_wallpaper" msgid="8012385376769568517">"الاحتفاظ بالخلفية الحالية"</string>

    <string name="apply_btn" msgid="7965877231041987336">"تطبيق"</string>

    <string name="accessibility_preview_pager" msgid="3548503287402185430">"الصفحة <xliff:g id="ID_1">%1$d</xliff:g> من <xliff:g id="ID_2">%2$d</xliff:g>"</string>

    <string name="next_page_content_description" msgid="5290226604542300962">"التالي"</string>

    <string name="previous_page_content_description" msgid="6025726405430262788">"السابق"</string>

    <!-- no translation found for theme_preview_card_content_description (5989222908619535533) -->

    <skip />

    <!-- no translation found for grid_preview_card_content_description (8449383777584714842) -->

    <skip />

    <string name="option_applied_description" msgid="5022305212078053534">"<xliff:g id="ID_1">%1$s</xliff:g>، مستخدَم حاليًا"</string>

    <string name="option_applied_previewed_description" msgid="5269654286638446858">"تتم معاينة وتطبيق الخيار <xliff:g id="ID_1">%1$s</xliff:g> حاليًا."</string>

    <string name="option_previewed_description" msgid="3467217598865047661">"تتم معاينة الخيار <xliff:g id="ID_1">%1$s</xliff:g> حاليًا."</string>
@@ -41,13 +41,21 @@ 
    <string name="preview_name_wallpaper" msgid="1738652462949531828">"الخلفية"</string>

    <string name="font_card_title" msgid="2343292653502548685">"ABC • abc • 123"</string>

    <string name="font_card_body" msgid="6790525594503904468">"يمكنك إضافة خطوطك المفضّلة إلى كل شاشة."</string>

    <!-- no translation found for grid_options_title (7071930966989877023) -->

    <skip />

    <string name="grid_title_pattern" msgid="9188866567612607806">"<xliff:g id="ID_1">%1$d</xliff:g>x<xliff:g id="ID_2">%2$d</xliff:g>"</string>

    <string name="applied_theme_msg" msgid="7348498271552054431">"تم تطبيق النمط."</string>

    <string name="applied_clock_msg" msgid="1938218786265793285">"تم تطبيق الساعة"</string>

    <!-- no translation found for applied_theme_msg (3749018706366796244) -->

    <skip />

    <!-- no translation found for applied_clock_msg (1303338016701443767) -->

    <skip />

    <!-- no translation found for applied_grid_msg (3250499654436933034) -->

    <skip />

    <string name="apply_theme_error_msg" msgid="791364062636538317">"حدثت مشكلة أثناء تطبيق النمط."</string>

    <string name="custom_theme_next" msgid="6235420097213197301">"التالي"</string>

    <string name="custom_theme_previous" msgid="4941132112640503022">"الخطوة السابقة"</string>

    <string name="custom_theme_title" msgid="2192300350332693631">"<xliff:g id="ID_1">%1$d</xliff:g> مخصّصة"</string>

    <!-- no translation found for custom_theme (1618351922263478163) -->

    <skip />

    <string name="custom_theme_title" msgid="2192300350332693631">"مخصّص <xliff:g id="ID_1">%1$d</xliff:g>"</string>

    <string name="custom_theme_fragment_title" msgid="6615547284702040280">"النمط المخصّص"</string>

    <string name="custom_theme_delete" msgid="4744494663184126202">"حذف"</string>

    <string name="font_component_title" msgid="8800340833695292049">"اختيار الخط"</string>
@@ -66,4 +74,8 @@ 
    <string name="no_thanks" msgid="7286616980115687627">"لا، شكرًا"</string>

    <string name="clock_preview_content_description" msgid="5460561185905717460">"معاينة الساعة <xliff:g id="ID_1">%1$s</xliff:g>"</string>

    <string name="something_went_wrong" msgid="529840112449799117">"عفوًا! حدث خطأ ما."</string>

    <!-- no translation found for theme_preview_icons_section_title (7064768910744000643) -->

    <skip />

    <!-- no translation found for style_info_description (4201603728542216488) -->

    <skip />

</resources>