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

Commit 667b7f5d authored by Xin Li's avatar Xin Li
Browse files

Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future 

Bug: 343100748
Merged-In: I26f0ed9e921beac762f3f9e6aaceb1002ad4801a
Change-Id: Ib58ffbc33000d37eb9066354f217c95ca56091ac
parents 4e3992b0 fb095226

quickstep/res/layout-land/keyboard_quick_switch_taskview.xml

+18 −16
Original line number Diff line number Diff line
@@ -36,19 +36,19 @@ 
        app:layout_constraintEnd_toEndOf="parent">



        <include

            layout="@layout/keyboard_quick_switch_thumbnail"

            android:id="@+id/thumbnail1"

            layout="@layout/keyboard_quick_switch_taskview_thumbnail"

            android:id="@+id/thumbnail_1"

            android:layout_width="0dp"

            android:layout_height="match_parent"



            app:layout_constraintTop_toTopOf="parent"

            app:layout_constraintBottom_toBottomOf="parent"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintEnd_toStartOf="@id/thumbnail2"/>

            app:layout_constraintEnd_toStartOf="@id/thumbnail_2"/>



        <include

            layout="@layout/keyboard_quick_switch_thumbnail"

            android:id="@+id/thumbnail2"

            layout="@layout/keyboard_quick_switch_taskview_thumbnail"

            android:id="@+id/thumbnail_2"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:visibility="gone"
@@ -56,31 +56,33 @@ 


            app:layout_constraintTop_toTopOf="parent"

            app:layout_constraintBottom_toBottomOf="parent"

            app:layout_constraintStart_toEndOf="@id/thumbnail1"

            app:layout_constraintStart_toEndOf="@id/thumbnail_1"

            app:layout_constraintEnd_toEndOf="parent"/>



        <ImageView

            android:id="@+id/icon1"

            android:id="@+id/icon_1"

            android:layout_width="@dimen/keyboard_quick_switch_taskview_icon_size"

            android:layout_height="@dimen/keyboard_quick_switch_taskview_icon_size"

            android:layout_marginTop="@dimen/keyboard_quick_switch_taskview_icon_margin"

            android:layout_marginStart="@dimen/keyboard_quick_switch_taskview_icon_margin"

            android:importantForAccessibility="no"

            android:scaleType="centerCrop"



            app:layout_constraintTop_toTopOf="@id/thumbnail1"

            app:layout_constraintStart_toStartOf="@id/thumbnail1"/>

            app:layout_constraintTop_toTopOf="@id/thumbnail_1"

            app:layout_constraintBottom_toBottomOf="@id/thumbnail_1"

            app:layout_constraintStart_toStartOf="@id/thumbnail_1"

            app:layout_constraintEnd_toEndOf="@id/thumbnail_1"/>



        <ImageView

            android:id="@+id/icon2"

            android:id="@+id/icon_2"

            android:layout_width="@dimen/keyboard_quick_switch_taskview_icon_size"

            android:layout_height="@dimen/keyboard_quick_switch_taskview_icon_size"

            android:layout_marginTop="@dimen/keyboard_quick_switch_taskview_icon_margin"

            android:layout_marginStart="@dimen/keyboard_quick_switch_taskview_icon_margin"

            android:importantForAccessibility="no"

            android:visibility="gone"

            android:scaleType="centerCrop"



            app:layout_constraintTop_toTopOf="@id/thumbnail2"

            app:layout_constraintStart_toStartOf="@id/thumbnail2"/>

            app:layout_constraintTop_toTopOf="@id/thumbnail_2"

            app:layout_constraintBottom_toBottomOf="@id/thumbnail_2"

            app:layout_constraintStart_toStartOf="@id/thumbnail_2"

            app:layout_constraintEnd_toEndOf="@id/thumbnail_2"/>



    </androidx.constraintlayout.widget.ConstraintLayout>

quickstep/res/layout/keyboard_quick_switch_taskview.xml

+18 −16
Original line number Diff line number Diff line
@@ -36,51 +36,53 @@ 
        app:layout_constraintEnd_toEndOf="parent">



        <include

            layout="@layout/keyboard_quick_switch_thumbnail"

            android:id="@+id/thumbnail1"

            layout="@layout/keyboard_quick_switch_taskview_thumbnail"

            android:id="@+id/thumbnail_1"

            android:layout_width="match_parent"

            android:layout_height="0dp"



            app:layout_constraintTop_toTopOf="parent"

            app:layout_constraintBottom_toTopOf="@id/thumbnail2"

            app:layout_constraintBottom_toTopOf="@id/thumbnail_2"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintEnd_toEndOf="parent"/>



        <include

            layout="@layout/keyboard_quick_switch_thumbnail"

            android:id="@+id/thumbnail2"

            layout="@layout/keyboard_quick_switch_taskview_thumbnail"

            android:id="@+id/thumbnail_2"

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:visibility="gone"

            android:layout_marginTop="@dimen/keyboard_quick_switch_split_view_spacing"



            app:layout_constraintTop_toBottomOf="@id/thumbnail1"

            app:layout_constraintTop_toBottomOf="@id/thumbnail_1"

            app:layout_constraintBottom_toBottomOf="parent"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintEnd_toEndOf="parent"/>



        <ImageView

            android:id="@+id/icon1"

            android:id="@+id/icon_1"

            android:layout_width="@dimen/keyboard_quick_switch_taskview_icon_size"

            android:layout_height="@dimen/keyboard_quick_switch_taskview_icon_size"

            android:layout_marginTop="@dimen/keyboard_quick_switch_taskview_icon_margin"

            android:layout_marginStart="@dimen/keyboard_quick_switch_taskview_icon_margin"

            android:importantForAccessibility="no"

            android:scaleType="centerCrop"



            app:layout_constraintTop_toTopOf="@id/thumbnail1"

            app:layout_constraintStart_toStartOf="@id/thumbnail1"/>

            app:layout_constraintTop_toTopOf="@id/thumbnail_1"

            app:layout_constraintBottom_toBottomOf="@id/thumbnail_1"

            app:layout_constraintStart_toStartOf="@id/thumbnail_1"

            app:layout_constraintEnd_toEndOf="@id/thumbnail_1"/>



        <ImageView

            android:id="@+id/icon2"

            android:id="@+id/icon_2"

            android:layout_width="@dimen/keyboard_quick_switch_taskview_icon_size"

            android:layout_height="@dimen/keyboard_quick_switch_taskview_icon_size"

            android:layout_marginTop="@dimen/keyboard_quick_switch_taskview_icon_margin"

            android:layout_marginStart="@dimen/keyboard_quick_switch_taskview_icon_margin"

            android:importantForAccessibility="no"

            android:visibility="gone"

            android:scaleType="centerCrop"



            app:layout_constraintTop_toTopOf="@id/thumbnail2"

            app:layout_constraintStart_toStartOf="@id/thumbnail2"/>

            app:layout_constraintTop_toTopOf="@id/thumbnail_2"

            app:layout_constraintBottom_toBottomOf="@id/thumbnail_2"

            app:layout_constraintStart_toStartOf="@id/thumbnail_2"

            app:layout_constraintEnd_toEndOf="@id/thumbnail_2"/>



    </androidx.constraintlayout.widget.ConstraintLayout>

quickstep/res/values-af/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 
    <string name="default_device_name" msgid="6660656727127422487">"toestel"</string>

    <string name="allset_navigation_settings" msgid="4713404605961476027"><annotation id="link">"Stelselnavigasie-instellings"</annotation></string>

    <string name="action_share" msgid="2648470652637092375">"Deel"</string>

    <string name="action_screenshot" msgid="8171125848358142917">"Skermkiekie"</string>

    <string name="action_screenshot" msgid="8171125848358142917">"Skermskoot"</string>

    <string name="action_split" msgid="2098009717623550676">"Verdeel"</string>

    <string name="toast_split_select_app" msgid="8464310533320556058">"Tik op ’n ander app om verdeelde skerm te gebruik"</string>

    <string name="toast_contextual_split_select_app" msgid="433510957123687090">"Kies ’n ander app as jy verdeelde skerm wil gebruik"</string>

quickstep/res/values-ar/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="recent_task_option_pin" msgid="7929860679018978258">"تثبيت"</string>

    <string name="recent_task_option_freeform" msgid="48863056265284071">"شكل مجاني"</string>

    <string name="recents_empty_message" msgid="7040467240571714191">"ليست هناك عناصر تم استخدامها مؤخرًا"</string>

    <string name="recents_empty_message" msgid="7040467240571714191">"ما مِن عناصر تم استخدامها مؤخرًا"</string>

    <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"إعدادات استخدام التطبيق"</string>

    <string name="recents_clear_all" msgid="5328176793634888831">"محو الكل"</string>

    <string name="accessibility_recent_apps" msgid="4058661986695117371">"التطبيقات المستخدمة مؤخرًا"</string>
@@ -96,10 +96,10 @@ 
    <string name="action_screenshot" msgid="8171125848358142917">"لقطة شاشة"</string>

    <string name="action_split" msgid="2098009717623550676">"تقسيم"</string>

    <string name="toast_split_select_app" msgid="8464310533320556058">"انقر على تطبيق آخر لاستخدام وضع تقسيم الشاشة."</string>

    <string name="toast_contextual_split_select_app" msgid="433510957123687090">"اختَر تطبيقًا آخر لاستخدام \"وضع تقسيم الشاشة\"."</string>

    <string name="toast_contextual_split_select_app" msgid="433510957123687090">"اختَر تطبيقًا آخر لاستخدام \"وضع تقسيم الشاشة\""</string>

    <string name="toast_split_select_app_cancel" msgid="1532690483356445639"><b>"إلغاء"</b></string>

    <string name="toast_split_select_cont_desc" msgid="2119685056059607602">"الخروج من وضع تقسيم الشاشة"</string>

    <string name="toast_split_app_unsupported" msgid="2360229567007828914">"اختَر تطبيقًا آخر لاستخدام \"وضع تقسيم الشاشة\"."</string>

    <string name="toast_split_app_unsupported" msgid="2360229567007828914">"اختَر تطبيقًا آخر لاستخدام \"وضع تقسيم الشاشة\""</string>

    <string name="blocked_by_policy" msgid="2071401072261365546">"لا يسمح التطبيق أو لا تسمح مؤسستك بهذا الإجراء."</string>

    <string name="split_widgets_not_supported" msgid="1355743038053053866">"التطبيقات المصغّرة غير متوفّرة حاليًا، يرجى اختيار تطبيق آخر."</string>

    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"هل تريد تخطي الدليل التوجيهي للتنقّل؟"</string>