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

Commit 58dc1cfc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Merge branch 'ub-launcher3-qt-r1-dev' into ub-launcher3-qt-dev" into ub-launcher3-qt-dev

parents 2fb6a4cf eff77245

quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java

+2 −0
Original line number Diff line number Diff line
@@ -499,6 +499,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { 
        mSnapshotView.setDimAlpha(curveInterpolation * MAX_PAGE_SCRIM_ALPHA);

        setCurveScale(getCurveScaleForCurveInterpolation(curveInterpolation));



        float fade = Utilities.boundToRange(1.0f - 2 * scrollState.linearInterpolation, 0f, 1f);

        mTaskFooterContainer.setAlpha(fade);

        if (mMenuView != null) {

            mMenuView.setPosition(getX() - getRecentsView().getScrollX(), getY());

            mMenuView.setScaleX(getScaleX());

quickstep/res/layout/task.xml

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:animateLayoutChanges="true"

        android:forceHasOverlappingRendering="true"

        android:layout_gravity="bottom|center_horizontal">

        <FrameLayout

            android:id="@+id/proactive_suggest_container"

quickstep/res/values-ar/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
    <string name="accessibility_close_task" msgid="5354563209433803643">"إغلاق"</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>

    <string name="accessibility_recent_apps" msgid="4058661986695117371">"التطبيقات التي تمّ استخدامها مؤخرًا"</string>

    <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g>، <xliff:g id="REMAINING_TIME">%2$s</xliff:g>"</string>

    <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"أقل من دقيقة"</string>

    <string name="time_left_for_app" msgid="3111996412933644358">"يتبقى اليوم <xliff:g id="TIME">%1$s</xliff:g>."</string>

quickstep/res/values-de/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="recent_task_option_split_screen" msgid="5353188922202653570">"Splitscreen"</string>

    <string name="recent_task_option_pin" msgid="7929860679018978258">"Anpinnen"</string>

    <string name="recent_task_option_pin" msgid="7929860679018978258">"Fixieren"</string>

    <string name="recent_task_option_freeform" msgid="48863056265284071">"Freeform-Modus"</string>

    <string name="accessibility_desc_recent_apps" msgid="1444379410873162882">"Übersicht"</string>

    <string name="recents_empty_message" msgid="7040467240571714191">"Keine kürzlich verwendeten Elemente"</string>

quickstep/res/values-gl/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
    <string name="accessibility_close_task" msgid="5354563209433803643">"Pecha a aplicación"</string>

    <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Configuración do uso de aplicacións"</string>

    <string name="recents_clear_all" msgid="5328176793634888831">"Borrar todo"</string>

    <string name="accessibility_recent_apps" msgid="4058661986695117371">"Apps recentes"</string>

    <string name="accessibility_recent_apps" msgid="4058661986695117371">"Aplicacións recentes"</string>

    <string name="task_contents_description_with_remaining_time" msgid="4479688746574672685">"<xliff:g id="TASK_DESCRIPTION">%1$s</xliff:g> (<xliff:g id="REMAINING_TIME">%2$s</xliff:g>)"</string>

    <string name="shorter_duration_less_than_one_minute" msgid="4722015666335015336">"&lt;1 min"</string>

    <string name="time_left_for_app" msgid="3111996412933644358">"Tempo restante hoxe <xliff:g id="TIME">%1$s</xliff:g>"</string>