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

Commit 1958761a authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6862191 from a5dae88b to rvc-qpr1-release 

Change-Id: I0829b875e72b562c3d57ab4651b2ad1b4d7da530
parents 60ca7a0b a5dae88b

quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java

+0 −1
Original line number Diff line number Diff line
@@ -250,7 +250,6 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy { 
            int start = mOrientationState.getOrientationHandler()

                    .getPrimaryValue(mTaskRect.left, mTaskRect.top);

            mScrollState.screenCenter = start + mScrollState.scroll + mScrollState.halfPageSize;

            mScrollState.pageParentScale = recentsViewScale.value;

            mScrollState.updateInterpolation(start);

            mCurveScale = TaskView.getCurveScaleForInterpolation(mScrollState.linearInterpolation);

        }

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

+2 −3
Original line number Diff line number Diff line
@@ -1386,13 +1386,12 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView 
         * Updates linearInterpolation for the provided child position

         */

        public void updateInterpolation(float childStart) {

            float scaledHalfPageSize = halfPageSize / pageParentScale;

            float pageCenter = childStart + scaledHalfPageSize;

            float pageCenter = childStart + halfPageSize;

            float distanceFromScreenCenter = screenCenter - pageCenter;

            // How far the page has to move from the center to be offscreen, taking into account

            // the EDGE_SCALE_DOWN_FACTOR that will be applied at that position.

            float distanceToReachEdge = halfScreenSize

                    + scaledHalfPageSize * (1 - TaskView.EDGE_SCALE_DOWN_FACTOR);

                    + halfPageSize * (1 - TaskView.EDGE_SCALE_DOWN_FACTOR);

            linearInterpolation = Math.min(1,

                    Math.abs(distanceFromScreenCenter) / distanceToReachEdge);

        }

quickstep/res/values-es-rUS/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ 
    <string name="all_apps_label" msgid="8542784161730910663">"Todas las apps"</string>

    <string name="all_apps_prediction_tip" msgid="2672336544844936186">"Predicción de tus apps"</string>

    <string name="hotseat_edu_title_migrate" msgid="306578144424489980">"Obtén sugerencias de aplicaciones en la fila inferior de la pantalla principal"</string>

    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Obtén sugerencias de apps en la fila de favoritos de la Pantalla principal"</string>

    <string name="hotseat_edu_title_migrate_landscape" msgid="3633942953997845243">"Obtén sugerencias de apps en la fila de favoritos de la pantalla principal"</string>

    <string name="hotseat_edu_message_migrate" msgid="8927179260533775320">"Accede fácilmente en la pantalla principal a las apps que más usas. Las sugerencias cambiarán según tus rutinas. Las apps de la fila inferior se desplazarán hacia arriba en la pantalla principal."</string>

    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Accede fácilmente en la pantalla principal a las apps que más usas. Las sugerencias cambiarán según tus rutinas. Se moverán a la Pantalla principal las apps que estén en la fila de favoritos."</string>

    <string name="hotseat_edu_message_migrate_landscape" msgid="4248943380443387697">"Accede fácilmente en la pantalla principal a las apps que más usas. Las sugerencias cambiarán según tus rutinas. Se moverán a la pantalla principal las apps que estén en la fila de favoritos."</string>

    <string name="hotseat_edu_message_migrate_alt" msgid="3042360119039646356">"Accede fácilmente a las apps que más usas en la pantalla principal. Las sugerencias cambiarán según tus rutinas. Las apps de la fila inferior se moverán a una nueva carpeta."</string>

    <string name="hotseat_edu_accept" msgid="1611544083278999837">"Obtén sugerencias de aplicaciones"</string>

    <string name="hotseat_edu_dismiss" msgid="2781161822780201689">"No, gracias"</string>

quickstep/res/values-hu/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">"Osztott képernyő"</string>

    <string name="recent_task_option_pin" msgid="7929860679018978258">"Rögzítés"</string>

    <string name="recent_task_option_pin" msgid="7929860679018978258">"Kitűzés"</string>

    <string name="recent_task_option_freeform" msgid="48863056265284071">"Szabad forma"</string>

    <string name="recents_empty_message" msgid="7040467240571714191">"Nincsenek mostanában használt elemek"</string>

    <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Alkalmazáshasználati beállítások"</string>

quickstep/res/values-in/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    <string name="recents_empty_message" msgid="7040467240571714191">"Tidak ada item yang baru dibuka"</string>

    <string name="accessibility_app_usage_settings" msgid="6312864233673544149">"Setelan penggunaan aplikasi"</string>

    <string name="recents_clear_all" msgid="5328176793634888831">"Hapus semua"</string>

    <string name="accessibility_recent_apps" msgid="4058661986695117371">"Aplikasi baru-baru ini"</string>

    <string name="accessibility_recent_apps" msgid="4058661986695117371">"Aplikasi terbaru"</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 menit"</string>

    <string name="time_left_for_app" msgid="3111996412933644358">"<xliff:g id="TIME">%1$s</xliff:g> tersisa hari ini"</string>