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

Commit 096b8067 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6160382 from 4cb6907b to rvc-release 

Change-Id: I61d32182ec5738c85327befe341129ce3dee72c9
parents 9371f568 4cb6907b

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

+8 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import com.android.launcher3.appprediction.DynamicItemCache; 
import com.android.launcher3.dragndrop.DragController;

import com.android.launcher3.dragndrop.DragOptions;

import com.android.launcher3.icons.IconCache;

import com.android.launcher3.logging.FileLog;

import com.android.launcher3.popup.SystemShortcut;

import com.android.launcher3.shortcuts.ShortcutKey;

import com.android.launcher3.touch.ItemLongClickListener;
@@ -300,6 +301,7 @@ public class HotseatPredictionController implements DragController.DragListener, 


    private void setPredictedApps(List<AppTarget> appTargets) {

        mComponentKeyMappers.clear();

        StringBuilder predictionLog = new StringBuilder("predictedApps: [\n");

        for (AppTarget appTarget : appTargets) {

            ComponentKey key;

            if (appTarget.getShortcutInfo() != null) {
@@ -308,8 +310,14 @@ public class HotseatPredictionController implements DragController.DragListener, 
                key = new ComponentKey(new ComponentName(appTarget.getPackageName(),

                        appTarget.getClassName()), appTarget.getUser());

            }

            predictionLog.append(key.toString());

            predictionLog.append(",rank:");

            predictionLog.append(appTarget.getRank());

            predictionLog.append("\n");

            mComponentKeyMappers.add(new ComponentKeyMapper(key, mDynamicItemCache));

        }

        predictionLog.append("]");

        FileLog.d(TAG, predictionLog.toString());

        updateDependencies();

        if (isReady()) {

            fillGapsWithPrediction();

quickstep/res/values/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -75,11 +75,11 @@ 
    <!-- Hotseat migration wizard message -->

    <string translatable="false" name="hotseat_migrate_message">To pin a favorite app, drag it over a suggested app. To hide a suggested app, touch &amp; hold it.</string>

    <!-- Toast message user sees after opting into fully predicted hybrid hotseat -->

    <string translatable="false" name="hotseat_items_migrated">Your hotseat items have been moved to the last page.</string>

    <string translatable="false" name="hotseat_items_migrated">Bottom row of apps moved to last screen</string>

    <!-- Toast message user sees after opting into fully predicted hybrid hotseat -->

    <string translatable="false" name="hotseat_no_migration">You can remove items from the hotseat manually to see suggested apps in their spot.</string>

    <string translatable="false" name="hotseat_no_migration">Bottom row won\'t be replaced. Manually drag apps for predictions.</string>

    <!-- Button text to opt in for fully predicted hotseat -->

    <string translatable="false" name="hotseat_migrate_accept">I\'m in</string>

    <string translatable="false" name="hotseat_migrate_accept">Turn On</string>

    <!-- Button text to dismiss opt in for fully predicted hotseat -->

    <string translatable="false" name="hotseat_migrate_dismiss">No thanks</string>

    <!-- Hotseat onboard notification title -->

quickstep/src/com/android/quickstep/SystemUiProxy.java

+9 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.quickstep; 
import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;



import android.content.Context;

import android.graphics.Bitmap;

import android.graphics.Insets;

import android.graphics.Rect;

import android.os.Bundle;

import android.os.IBinder;
@@ -25,6 +27,7 @@ import android.os.IBinder.DeathRecipient; 
import android.os.RemoteException;

import android.util.Log;

import android.view.MotionEvent;



import com.android.launcher3.util.MainThreadInitializedObject;

import com.android.quickstep.util.SharedApiCompat;

import com.android.systemui.shared.recents.ISystemUiProxy;
@@ -266,6 +269,12 @@ public class SystemUiProxy implements ISystemUiProxy { 
        }

    }



    @Override

    public void handleImageAsScreenshot(

            Bitmap screenImage, Rect locationInScreen, Insets visibleInsets, int taskId) {



    }



    /**

     * See SharedApiCompat#setShelfHeight()

     */