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

Commit a1b6dd58 authored by Xin Li's avatar Xin Li
Browse files

Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 

Bug: 172690556
Merged-In: I527097ba19414c3ed99606f95276ff506cfb4ec2
Change-Id: If031ceec4c449b2dd5a7f6516fa5faa3d880b144
parents ec2bbed5 3f563648

res/layout-land/fragment_grid_picker.xml

+4 −20
Original line number Diff line number Diff line
@@ -42,34 +42,18 @@ 
            <include layout="@layout/grid_preview_card"/>

        </FrameLayout>



        <LinearLayout

        <FrameLayout

            android:id="@+id/options_section"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:paddingVertical="10dp"

            android:orientation="vertical">

            android:paddingVertical="10dp">



            <androidx.recyclerview.widget.RecyclerView

                android:id="@+id/options_container"

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:layout_weight="1"/>



            <RelativeLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:paddingHorizontal="10dp">

                <Button

                    android:id="@+id/apply_button"

                    style="@style/ActionPrimaryButton"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_alignParentEnd="true"

                    android:text="@string/apply_btn"/>

            </RelativeLayout>



        </LinearLayout>

                android:layout_height="match_parent"/>

        </FrameLayout>

    </LinearLayout>

        <androidx.core.widget.ContentLoadingProgressBar

            android:id="@+id/loading_indicator"

res/layout/preview_card_wallpaper_content.xml

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2019 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<FrameLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    android:id="@+id/preview_static_image"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_gravity="bottom"

    tools:showIn="@layout/theme_preview_card">

    <TextView

        style="@style/CardTitleTextAppearance"

        android:id="@+id/wallpaper_description"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal|bottom"/>

</FrameLayout>
 
 No newline at end of file

res/values-af/strings.xml

+1 −2
Original line number Diff line number Diff line
@@ -76,6 +76,5 @@ 
    <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>

    <string name="theme_preview_icons_section_title" msgid="7064768910744000643">"Kleur/ikone"</string>

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

    <skip />

    <string name="style_info_description" msgid="2612473574431003251">"Voorskou van lettertipe, ikone, programvorm en kleur"</string>

</resources>

res/values-am/strings.xml

+5 −10
Original line number Diff line number Diff line
@@ -27,14 +27,10 @@ 
    <string name="apply_btn" msgid="7965877231041987336">"ተግብር"</string>

    <string name="theme_preview_card_content_description" msgid="5989222908619535533">"የቅጥ ቅድመ-እይታ"</string>

    <string name="grid_preview_card_content_description" msgid="8449383777584714842">"የፍርግርግ ቅድመ-እይታ"</string>

    <!-- no translation found for font_preview_content_description (128230439293337891) -->

    <skip />

    <!-- no translation found for icon_preview_content_description (7761101284351952890) -->

    <skip />

    <!-- no translation found for color_preview_content_description (4879120462082058124) -->

    <skip />

    <!-- no translation found for shape_preview_content_description (6479487796176550432) -->

    <skip />

    <string name="font_preview_content_description" msgid="128230439293337891">"የቅርጸ-ቁምፊ ቅድመ-እይታ"</string>

    <string name="icon_preview_content_description" msgid="7761101284351952890">"የአዶ ቅድመ-እይታ"</string>

    <string name="color_preview_content_description" msgid="4879120462082058124">"የቀለም ቅድመ-እይታ"</string>

    <string name="shape_preview_content_description" msgid="6479487796176550432">"የቅርጽ ቅድመ-እይታ"</string>

    <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>
@@ -76,6 +72,5 @@ 
    <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>

    <string name="theme_preview_icons_section_title" msgid="7064768910744000643">"ቀለም / አዶዎች"</string>

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

    <skip />

    <string name="style_info_description" msgid="2612473574431003251">"የቅርጸ-ቁምፊ፣ የአዶዎች፣ የመተግበሪያ ቅርጽ እና የቀለም ቅድመ-እይታ"</string>

</resources>

res/values-ar/strings.xml

+1 −2
Original line number Diff line number Diff line
@@ -76,6 +76,5 @@ 
    <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>

    <string name="theme_preview_icons_section_title" msgid="7064768910744000643">"اللون / الرموز"</string>

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

    <skip />

    <string name="style_info_description" msgid="2612473574431003251">"معاينة الخط والرموز وشكل التطبيق واللون"</string>

</resources>