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

Commit 0866c063 authored by Amin Shaikh's avatar Amin Shaikh
Browse files

Merging ub-launcher3-qt-dev, build 5456233 

Test: Manual

Bug: 126238021 n Bug: 128923737 n Bug: 129365634 n Bug: 129410887 n Bug: 129846060 n
Change-Id: If40a08cc8202703f4f8b57728310060817153a92
parents 3b8c5d73 551f0c08

res/layout/preview_card_color_content.xml

+7 −6
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ 
            android:tint="@color/theme_preview_icon_color"

            android:maxHeight="2dp"

            android:progress="1"

            android:clickable="true"

            android:max="3"/>

    </LinearLayout>

    <LinearLayout
@@ -103,7 +104,7 @@ 
            android:layout_height="wrap_content"

            android:checked="true"

            android:layout_gravity="center"

            android:clickable="false"/>

            android:enabled="false"/>

        <RadioButton

            android:id="@+id/preview_radio_selected"

            android:layout_width="wrap_content"
@@ -112,14 +113,14 @@ 
            android:layout_marginRight="22dp"

            android:checked="true"

            android:layout_gravity="center"

            android:clickable="false"/>

            android:enabled="false"/>

        <Switch

            android:id="@+id/preview_toggle_selected"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:checked="true"

            android:layout_gravity="center"

            android:clickable="false"/>

            android:enabled="false"/>

    </LinearLayout>

    <LinearLayout

        android:layout_width="match_parent"
@@ -133,7 +134,7 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:clickable="false"/>

            android:enabled="false"/>

        <RadioButton

            android:id="@+id/preview_radio_unselected"

            android:layout_width="wrap_content"
@@ -141,12 +142,12 @@ 
            android:layout_marginLeft="30dp"

            android:layout_marginRight="22dp"

            android:layout_gravity="center"

            android:clickable="false"/>

            android:enabled="false"/>

        <Switch

            android:id="@+id/preview_toggle_unselected"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:clickable="false"/>

            android:enabled="false"/>

    </LinearLayout>

</LinearLayout>

res/layout/preview_card_cover_content.xml

0 → 100644
+108 −0
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.

-->

<LinearLayout

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

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

    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:layout_gravity="center"

    android:gravity="center_horizontal"

    android:orientation="vertical"

    tools:showIn="@layout/theme_preview_card">

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_weight="0"

        android:layout_marginTop="40dp"

        android:layout_marginBottom="36dp"

        android:gravity="center|bottom"

        android:orientation="horizontal">

        <FrameLayout

            android:layout_width="@dimen/preview_theme_icon_size"

            android:layout_height="@dimen/preview_theme_icon_size"

            android:layout_marginLeft="6dp">

            <ImageView

                android:layout_width="@dimen/preview_theme_icon_size"

                android:layout_height="@dimen/preview_theme_icon_size"

                android:id="@+id/preview_color_qs_0_bg"/>

            <ImageView

                android:layout_width="@dimen/preview_theme_tile_size"

                android:layout_height="@dimen/preview_theme_tile_size"

                android:id="@+id/preview_color_qs_0_icon"

                android:tint="@color/tile_enabled_icon_color"

                android:layout_gravity="center"/>

        </FrameLayout>

        <FrameLayout

            android:layout_width="@dimen/preview_theme_icon_size"

            android:layout_height="@dimen/preview_theme_icon_size"

            android:layout_marginHorizontal="50dp">

            <ImageView

                android:layout_width="@dimen/preview_theme_icon_size"

                android:layout_height="@dimen/preview_theme_icon_size"

                android:id="@+id/preview_color_qs_1_bg"/>

            <ImageView

                android:layout_width="@dimen/preview_theme_tile_size"

                android:layout_height="@dimen/preview_theme_tile_size"

                android:id="@+id/preview_color_qs_1_icon"

                android:tint="@color/tile_enabled_icon_color"

                android:layout_gravity="center"/>

        </FrameLayout>

        <FrameLayout

            android:layout_width="@dimen/preview_theme_icon_size"

            android:layout_height="@dimen/preview_theme_icon_size"

            android:layout_marginRight="6dp">

            <ImageView

                android:layout_width="@dimen/preview_theme_icon_size"

                android:layout_height="@dimen/preview_theme_icon_size"

                android:id="@+id/preview_color_qs_2_bg"

                android:tint="@color/tile_disabled_background_color"/>

            <ImageView

                android:layout_width="@dimen/preview_theme_tile_size"

                android:layout_height="@dimen/preview_theme_tile_size"

                android:id="@+id/preview_color_qs_2_icon"

                android:color="@color/tile_disabled_icon_color"

                android:layout_gravity="center"/>

        </FrameLayout>

    </LinearLayout>

    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:orientation="horizontal">

        <ImageView

            android:id="@+id/shape_preview_icon_0"

            android:layout_width="@dimen/preview_theme_shape_size"

            android:layout_height="@dimen/preview_theme_shape_size"

            android:layout_marginVertical="4dp"

            android:elevation="4dp"/>

        <ImageView

            android:id="@+id/shape_preview_icon_1"

            android:layout_width="@dimen/preview_theme_shape_size"

            android:layout_height="@dimen/preview_theme_shape_size"

            android:layout_marginHorizontal="38dp"

            android:layout_marginVertical="4dp"

            android:elevation="4dp"/>

        <ImageView

            android:id="@+id/shape_preview_icon_2"

            android:layout_width="@dimen/preview_theme_shape_size"

            android:layout_height="@dimen/preview_theme_shape_size"

            android:layout_marginVertical="4dp"

            android:layout_marginRight="2dp"

            android:elevation="4dp"/>

    </LinearLayout>

    <include layout="@layout/theme_cover_qsb"/>

</LinearLayout>
 
 No newline at end of file

res/layout/theme_cover_qsb.xml

0 → 100644
+21 −0
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"

    android:id="@+id/theme_qsb"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:visibility="gone"/>
 
 No newline at end of file

res/layout/theme_preview_card.xml

+41 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
<androidx.cardview.widget.CardView

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

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

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

    style="@style/PreviewCard"

    android:layout_width="match_parent"

    android:layout_height="match_parent"
@@ -32,6 +33,45 @@ 
            android:padding="@dimen/preview_card_padding"

            android:orientation="vertical">



            <FrameLayout

                android:id="@+id/theme_preview_top_bar"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginBottom="20dp"

                android:visibility="gone"

                tools:visibility="visible">

                <TextView

                    android:id="@+id/theme_preview_clock"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_gravity="start|center_vertical"

                    android:textColor="@color/icon_thumbnail_color"

                    tools:text="8:10"/>

                <LinearLayout

                    android:id="@+id/theme_preview_top_bar_icons"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_gravity="end|center_vertical"

                    android:orientation="horizontal">

                    <ImageView

                        android:id="@+id/preview_icon_0"

                        android:layout_width="@dimen/preview_theme_cover_topbar_icon_size"

                        android:layout_height="@dimen/preview_theme_cover_topbar_icon_size"

                        android:tint="@color/icon_thumbnail_color"/>

                    <ImageView

                        android:id="@+id/preview_icon_1"

                        android:layout_width="@dimen/preview_theme_cover_topbar_icon_size"

                        android:layout_height="@dimen/preview_theme_cover_topbar_icon_size"

                        android:layout_marginHorizontal="8dp"

                        android:tint="@color/icon_thumbnail_color"/>

                    <ImageView

                        android:id="@+id/preview_icon_2"

                        android:layout_width="@dimen/preview_theme_cover_topbar_icon_size"

                        android:layout_height="@dimen/preview_theme_cover_topbar_icon_size"

                        android:tint="@color/icon_thumbnail_color"/>

                </LinearLayout>

            </FrameLayout>



            <TextView

                android:id="@+id/theme_preview_card_header"

                android:layout_width="wrap_content"
@@ -59,7 +99,7 @@ 
                android:gravity="center"

                android:text="@string/edit_custom_theme_lbl"

                android:textAppearance="@style/EditLabelTextAppearance"

                android:visibility="gone"/>

                android:visibility="invisible"/>

        </LinearLayout>

    </FrameLayout>

</androidx.cardview.widget.CardView>
 
 No newline at end of file

res/values-af/strings.xml

0 → 100644
+61 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!-- 

     Copyright (C) 2018 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.

 -->



<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="6995669566699638946">"Style en muurpapiere"</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>

    <string name="theme_font_example" msgid="5196060278649495083">"ABC"</string>

    <string name="default_theme_title" msgid="2555741736622366797">"Verstek"</string>

    <string name="preview_name_font" msgid="4465423899630037038">"Lettertipe"</string>

    <string name="preview_name_icon" msgid="6818927315316316440">"Ikoon"</string>

    <string name="preview_name_color" msgid="8776203144994416172">"Kleur"</string>

    <string name="preview_name_shape" msgid="5676971146080968721">"Vorm"</string>

    <string name="preview_name_wallpaper" msgid="1738652462949531828">"Muurpapier"</string>

    <string name="font_card_title" msgid="7331657993811241308">"Pasmaak jou toestel"</string>

    <string name="font_card_body" msgid="5245191135258233681">"Voeg jou styl by elke skerm met gepasmaakte of uitstalontwerpe wat jou foon se tuisskerm, ikone en meer verander"</string>

    <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="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_title" msgid="2485536123742716285">"Gepasmaak"</string>

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

    <string name="custom_theme_delete" msgid="4744494663184126202">"Vee uit"</string>

    <string name="font_component_title" msgid="8800340833695292049">"Kies lettertipe"</string>

    <string name="icon_component_title" msgid="5779787138399083903">"Kies ikone"</string>

    <string name="color_component_title" msgid="1194089273921078816">"Kies kleur"</string>

    <string name="shape_component_title" msgid="8366847436022025538">"Kies vorm"</string>

    <string name="icon_component_label" msgid="2625784884001407944">"Ikone <xliff:g id="ID_1">%1$d</xliff:g>"</string>

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

    <string name="delete_custom_theme_confirmation" msgid="4452137183628769394">"Vee gepasmaakte styl uit?"</string>

    <string name="delete_custom_theme_button" msgid="5102462988130208824">"Vee uit"</string>

    <string name="cancel" msgid="4651030493668562067">"Kanselleer"</string>

    <string name="set_theme_wallpaper_dialog_message" msgid="2179661027350908003">"Stel styl se muurpapier"</string>

    <string name="use_style_instead_title" msgid="1578754995763917502">"Gebruik eerder <xliff:g id="ID_1">%1$s</xliff:g>?"</string>

    <string name="use_style_instead_body" msgid="3051937045807471496">"Die komponente wat jy gekies het, stem ooreen met die styl <xliff:g id="ID_1">%1$s</xliff:g>. Wil jy eerder <xliff:g id="ID_2">%1$s</xliff:g> gebruik?"</string>

    <string name="use_style_button" msgid="1754493078383627019">"Gebruik <xliff:g id="ID_1">%1$s</xliff:g>"</string>

    <string name="no_thanks" msgid="7286616980115687627">"Nee, dankie"</string>

</resources>