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

Commit dbf53c85 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8676880 from 3960374e to tm-d1-release 

Change-Id: I3cb34326986ec11e8042e680f4d6bf639c071025
parents f864c43c 3960374e

quickstep/res/values-nb/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ 
    <string name="toast_split_select_app" msgid="5453865907322018352">"Trykk på en annen app for å bruke delt skjerm"</string>

    <string name="toast_split_app_unsupported" msgid="3271526028981899666">"Appen støtter ikke delt skjerm."</string>

    <string name="blocked_by_policy" msgid="2071401072261365546">"Appen eller organisasjonen din tillater ikke denne handlingen"</string>

    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Vil du hoppe over navigeringsveiledning?"</string>

    <string name="skip_tutorial_dialog_title" msgid="2725643161260038458">"Vil du hoppe over navigeringsveiledningen?"</string>

    <string name="skip_tutorial_dialog_subtitle" msgid="544063326241955662">"Du kan finne dette i <xliff:g id="NAME">%1$s</xliff:g>-appen senere"</string>

    <string name="gesture_tutorial_action_button_label_cancel" msgid="3809842569351264108">"Avbryt"</string>

    <string name="gesture_tutorial_action_button_label_skip" msgid="394452764989751960">"Hopp over"</string>

quickstep/src/com/android/quickstep/TopTaskTracker.java

+22 −5
Original line number Diff line number Diff line
@@ -15,12 +15,13 @@ 
 */

package com.android.quickstep;



import static android.app.ActivityTaskManager.INVALID_TASK_ID;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;

import static android.content.Intent.ACTION_CHOOSER;

import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;



import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT;

import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_ASSISTANT;



import android.app.ActivityManager.RunningTaskInfo;

import android.content.Context;
@@ -64,6 +65,7 @@ public class TopTaskTracker extends ISplitScreenListener.Stub implements TaskSta 


    private final StagedSplitTaskPosition mMainStagePosition = new StagedSplitTaskPosition();

    private final StagedSplitTaskPosition mSideStagePosition = new StagedSplitTaskPosition();

    private int mPinnedTaskId = INVALID_TASK_ID;



    private TopTaskTracker(Context context) {

        mMainStagePosition.stageType = SplitConfigurationOptions.STAGE_TYPE_MAIN;
@@ -132,8 +134,18 @@ public class TopTaskTracker extends ISplitScreenListener.Stub implements TaskSta 
        }

    }



    @Override

    public void onActivityPinned(String packageName, int userId, int taskId, int stackId) {

        mPinnedTaskId = taskId;

    }



    @Override

    public void onActivityUnpinned() {

        mPinnedTaskId = INVALID_TASK_ID;

    }



    private void resetTaskId(StagedSplitTaskPosition taskPosition) {

        taskPosition.taskId = -1;

        taskPosition.taskId = INVALID_TASK_ID;

    }



    /**
@@ -141,7 +153,8 @@ public class TopTaskTracker extends ISplitScreenListener.Stub implements TaskSta 
     *         Will return empty array if device is not in staged split

     */

    public int[] getRunningSplitTaskIds() {

        if (mMainStagePosition.taskId == -1 || mSideStagePosition.taskId == -1) {

        if (mMainStagePosition.taskId == INVALID_TASK_ID

                || mSideStagePosition.taskId == INVALID_TASK_ID) {

            return new int[]{};

        }

        int[] out = new int[2];
@@ -175,7 +188,11 @@ public class TopTaskTracker extends ISplitScreenListener.Stub implements TaskSta 
                            false /* filterOnlyVisibleRecents */));

            Collections.addAll(mOrderedTaskList, tasks);

        }

        return new CachedTaskInfo(new ArrayList<>(mOrderedTaskList));



        // Strip the pinned task

        ArrayList<RunningTaskInfo> tasks = new ArrayList<>(mOrderedTaskList);

        tasks.removeIf(t -> t.taskId == mPinnedTaskId);

        return new CachedTaskInfo(tasks);

    }



    /**
@@ -194,7 +211,7 @@ public class TopTaskTracker extends ISplitScreenListener.Stub implements TaskSta 
        }



        public int getTaskId() {

            return mTopTask == null ? -1 : mTopTask.taskId;

            return mTopTask == null ? INVALID_TASK_ID : mTopTask.taskId;

        }



        /**

res/values-bs/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ 
    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Pauziraj poslovne aplikacije"</string>

    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Uključi poslovne aplikacije"</string>

    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtrirajte"</string>

    <string name="search_pref_screen_title" msgid="3258959643336315962">"Pretraživanje telefona"</string>

    <string name="search_pref_screen_title_tablet" msgid="5220319680451343959">"Pretraživanje tableta"</string>

    <string name="search_pref_screen_title" msgid="3258959643336315962">"Pretražite telefon"</string>

    <string name="search_pref_screen_title_tablet" msgid="5220319680451343959">"Pretražite tablet"</string>

    <string name="remote_action_failed" msgid="1383965239183576790">"Nije uspjelo: <xliff:g id="WHAT">%1$s</xliff:g>"</string>

</resources>

res/values-fr/strings.xml

+2 −4
Original line number Diff line number Diff line
@@ -171,9 +171,7 @@ 
    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Mettre en pause les applis professionnelles"</string>

    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Activer les applications professionnelles"</string>

    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filtre"</string>

    <!-- no translation found for search_pref_screen_title (3258959643336315962) -->

    <skip />

    <!-- no translation found for search_pref_screen_title_tablet (5220319680451343959) -->

    <skip />

    <string name="search_pref_screen_title" msgid="3258959643336315962">"Rechercher sur votre téléphone"</string>

    <string name="search_pref_screen_title_tablet" msgid="5220319680451343959">"Rechercher sur votre tablette"</string>

    <string name="remote_action_failed" msgid="1383965239183576790">"Échec : <xliff:g id="WHAT">%1$s</xliff:g>"</string>

</resources>

res/values-nb/strings.xml

+2 −4
Original line number Diff line number Diff line
@@ -171,9 +171,7 @@ 
    <string name="work_apps_pause_btn_text" msgid="4669288269140620646">"Sett jobbapper på pause"</string>

    <string name="work_apps_enable_btn_text" msgid="1156432622148413741">"Slå på jobbapper"</string>

    <string name="developer_options_filter_hint" msgid="5896817443635989056">"Filter"</string>

    <!-- no translation found for search_pref_screen_title (3258959643336315962) -->

    <skip />

    <!-- no translation found for search_pref_screen_title_tablet (5220319680451343959) -->

    <skip />

    <string name="search_pref_screen_title" msgid="3258959643336315962">"Søk på telefonen"</string>

    <string name="search_pref_screen_title_tablet" msgid="5220319680451343959">"Søk på nettbrettet"</string>

    <string name="remote_action_failed" msgid="1383965239183576790">"Mislyktes: <xliff:g id="WHAT">%1$s</xliff:g>"</string>

</resources>