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

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

Snap for 9311025 from c9c45ed7 to tm-qpr2-release 

Change-Id: I620a8e1cc6c4118883fcd0900b22bcd9e670ed29
parents c69297c0 c9c45ed7

go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java

+3 −3
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ import androidx.annotation.IntDef; 
import androidx.annotation.VisibleForTesting;



import com.android.launcher3.BaseActivity;

import com.android.launcher3.LauncherPrefs;

import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.views.ArrowTipView;

import com.android.quickstep.util.AssistContentRequester;

import com.android.quickstep.util.RecentsOrientedState;
@@ -124,7 +124,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory { 
                AssistContentRequester assistContentRequester) {

            super(taskThumbnailView);

            mFactoryContentRequester = assistContentRequester;

            mSharedPreferences = Utilities.getPrefs(mApplicationContext);

            mSharedPreferences = LauncherPrefs.getPrefs(mApplicationContext);

        }



        /**
@@ -151,7 +151,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory { 
            boolean isAllowedByPolicy = mThumbnailView.isRealSnapshot() && !isManagedProfileTask;

            getActionsView().setCallbacks(new OverlayUICallbacksGoImpl(isAllowedByPolicy, task));

            mTaskPackageName = task.key.getPackageName();

            mSharedPreferences = Utilities.getPrefs(mApplicationContext);

            mSharedPreferences = LauncherPrefs.getPrefs(mApplicationContext);

            checkSettings();



            if (!mAssistStructurePermitted || !mAssistScreenshotPermitted

quickstep/res/layout/all_apps_edu_view.xml

+2 −1
Original line number Diff line number Diff line
@@ -3,4 +3,5 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:orientation="vertical"

    android:layout_width="@dimen/swipe_edu_width"

    android:layout_height="@dimen/swipe_edu_max_height"/>
 
    android:layout_height="@dimen/swipe_edu_max_height"

    android:accessibilityPaneTitle="@string/taskbar_edu_a11y_title"/>

quickstep/res/layout/taskbar_all_apps.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
<com.android.launcher3.taskbar.allapps.TaskbarAllAppsSlideInView

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

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    android:layout_height="match_parent"

    android:accessibilityPaneTitle="@string/all_apps_label">



    <com.android.launcher3.taskbar.allapps.TaskbarAllAppsContainerView

        android:id="@+id/apps_view"

quickstep/res/values/strings.xml

+10 −4
Original line number Diff line number Diff line
@@ -189,10 +189,10 @@ 
    <string name="allset_hint">Swipe up to go Home</string>

    <!-- Hint string at the bottom of "All Set" page for button navigation [CHAR LIMIT=NONE] -->

    <string name="allset_button_hint">Tap the home button to go to your home screen</string>

    <!-- Description of "All Set" page on phones [CHAR LIMIT=NONE] -->

    <string name="allset_description">You\u2019re ready to start using your phone</string>

    <!-- Description of "All Set" page on tablets [CHAR LIMIT=NONE] -->

    <string name="allset_description_tablet">You\u2019re ready to start using your tablet</string>

    <!-- Description of "All Set" page on the user's device [CHAR LIMIT=NONE] -->

    <string name="allset_description_generic">You\u2019re ready to start using your <xliff:g id="device" example="Pixel 6">%1$s</xliff:g></string>

    <!-- A default device name to use in the description of the "All Set" page [CHAR LIMIT=NONE] -->

    <string name="default_device_name">device</string>

    <!-- String linking to navigation settings on "All Set" page [CHAR LIMIT=NONE] -->

    <string name="allset_navigation_settings"><annotation id="link">System navigation settings</annotation></string>
@@ -224,6 +224,8 @@ 
    <string name="accessibility_rotate_button">Rotate screen</string>



    <!-- ******* Taskbar Edu ******* -->

    <!-- Accessibility title for the taskbar education window. [CHAR_LIMIT=NONE] -->

    <string name="taskbar_edu_a11y_title">Taskbar education</string>

    <!-- Accessibility text spoken when the taskbar education panel appears [CHAR_LIMIT=NONE] -->

    <string name="taskbar_edu_opened">Taskbar education appeared</string>

    <!-- Accessibility text spoken when the taskbar education panel disappears [CHAR_LIMIT=NONE] -->
@@ -259,6 +261,10 @@ 
    <string name="taskbar_button_notifications">Notifications</string>

    <!-- Content description for quick settings button [CHAR_LIMIT=16] -->

    <string name="taskbar_button_quick_settings">Quick Settings</string>

    <!-- Accessibility title for the taskbar window. [CHAR_LIMIT=NONE] -->

    <string name="taskbar_a11y_title">Taskbar</string>

    <!-- Accessibility title for the taskbar window on phones. [CHAR_LIMIT=NONE] -->

    <string name="taskbar_phone_a11y_title">Navigation bar</string>



    <!-- Label for moving drop target to the top or left side of the screen, depending on orientation (from the taskbar only). -->

    <string name="move_drop_target_top_or_left">Move to top&#47;left</string>

quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ public class HotseatPredictionController implements DragController.DragListener, 
     * Sets or updates the predicted items only once the hotseat becomes hidden to the user

     */

    private void applyPredictedItems(FixedContainerItems items) {

        mPredictedItems = items.items;

        mPredictedItems = new ArrayList(items.items);

        if (mPredictedItems.isEmpty()) {

            HotseatRestoreHelper.restoreBackup(mLauncher);

        }