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

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

Merge "Abstracting out state handler logic into base classes so that it can... 

Merge "Abstracting out state handler logic into base classes so that it can also be used in different activity" into ub-launcher3-rvc-dev
parents badfff44 35e7d386

quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AllAppsTipView.java

+10 −11
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ import android.os.UserManager; 
import com.android.launcher3.AbstractFloatingView;

import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.LauncherStateManager;

import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.allapps.FloatingHeaderView;

import com.android.launcher3.statemanager.StateManager.StateListener;

import com.android.launcher3.views.ArrowTipView;

import com.android.systemui.shared.system.LauncherEventUtil;
@@ -71,8 +71,7 @@ public class AllAppsTipView { 


    public static void scheduleShowIfNeeded(Launcher launcher) {

        if (!hasSeenAllAppsTip(launcher)) {

            launcher.getStateManager().addStateListener(

                    new LauncherStateManager.StateListener() {

            launcher.getStateManager().addStateListener(new StateListener<LauncherState>() {

                @Override

                public void onStateTransitionComplete(LauncherState finalState) {

                    if (finalState == ALL_APPS) {

quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AppsDividerView.java

+2 −2
Original line number Diff line number Diff line
@@ -38,18 +38,18 @@ import androidx.core.content.ContextCompat; 
import com.android.launcher3.DeviceProfile;

import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.LauncherStateManager;

import com.android.launcher3.R;

import com.android.launcher3.allapps.FloatingHeaderRow;

import com.android.launcher3.allapps.FloatingHeaderView;

import com.android.launcher3.anim.PropertySetter;

import com.android.launcher3.statemanager.StateManager.StateListener;

import com.android.launcher3.util.Themes;



/**

 * A view which shows a horizontal divider

 */

@TargetApi(Build.VERSION_CODES.O)

public class AppsDividerView extends View implements LauncherStateManager.StateListener,

public class AppsDividerView extends View implements StateListener<LauncherState>,

        FloatingHeaderRow {



    private static final String ALL_APPS_VISITED_COUNT = "launcher.all_apps_visited_count";

quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionUiStateManager.java

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import com.android.launcher3.Launcher; 
import com.android.launcher3.LauncherAppState;

import com.android.launcher3.LauncherSettings;

import com.android.launcher3.LauncherState;

import com.android.launcher3.LauncherStateManager.StateListener;

import com.android.launcher3.Utilities;

import com.android.launcher3.allapps.AllAppsContainerView;

import com.android.launcher3.allapps.AllAppsStore.OnUpdateListener;
@@ -41,6 +40,7 @@ import com.android.launcher3.icons.IconCache.ItemInfoUpdateReceiver; 
import com.android.launcher3.model.data.ItemInfo;

import com.android.launcher3.model.data.ItemInfoWithIcon;

import com.android.launcher3.shortcuts.ShortcutKey;

import com.android.launcher3.statemanager.StateManager.StateListener;

import com.android.launcher3.userevent.nano.LauncherLogProto;

import com.android.launcher3.util.ComponentKey;

import com.android.launcher3.util.MainThreadInitializedObject;
@@ -63,8 +63,8 @@ import java.util.stream.IntStream; 
 * 4) Maintains the current active client id (for the predictions) and all updates are performed on

 * that client id.

 */

public class PredictionUiStateManager implements StateListener, ItemInfoUpdateReceiver,

        OnIDPChangeListener, OnUpdateListener {

public class PredictionUiStateManager implements StateListener<LauncherState>,

        ItemInfoUpdateReceiver, OnIDPChangeListener, OnUpdateListener {



    public static final String LAST_PREDICTION_ENABLED_STATE = "last_prediction_enabled_state";

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import com.android.launcher3.BaseQuickstepLauncher; 
import com.android.launcher3.DeviceProfile;

import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.LauncherStateManager.AtomicAnimationFactory;

import com.android.launcher3.Workspace;

import com.android.launcher3.allapps.DiscoveryBounce;

import com.android.launcher3.anim.AnimatorPlaybackController;
@@ -50,6 +49,7 @@ import com.android.launcher3.model.data.AppInfo; 
import com.android.launcher3.model.data.ItemInfo;

import com.android.launcher3.model.data.WorkspaceItemInfo;

import com.android.launcher3.popup.SystemShortcut;

import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.uioverrides.states.QuickstepAtomicAnimationFactory;

import com.android.launcher3.uioverrides.touchcontrollers.FlingAndHoldTouchController;

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java

+4 −4
Original line number Diff line number Diff line
@@ -62,12 +62,12 @@ import com.android.launcher3.CellLayout; 
import com.android.launcher3.Hotseat;

import com.android.launcher3.LauncherState;

import com.android.launcher3.LauncherState.ScaleAndTranslation;

import com.android.launcher3.LauncherStateManager;

import com.android.launcher3.LauncherStateManager.AtomicAnimationFactory;

import com.android.launcher3.Workspace;

import com.android.launcher3.allapps.AllAppsContainerView;

import com.android.launcher3.allapps.AllAppsTransitionController;

import com.android.launcher3.anim.SpringAnimationBuilder;

import com.android.launcher3.statemanager.StateManager;

import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory;

import com.android.launcher3.states.StateAnimationConfig;

import com.android.launcher3.uioverrides.QuickstepLauncher;

import com.android.quickstep.SysUINavigationMode;
@@ -76,7 +76,7 @@ import com.android.quickstep.views.RecentsView; 
/**

 * Animation factory for quickstep specific transitions

 */

public class QuickstepAtomicAnimationFactory extends AtomicAnimationFactory {

public class QuickstepAtomicAnimationFactory extends AtomicAnimationFactory<LauncherState> {



    // Scale recents takes before animating in

    private static final float RECENTS_PREPARE_SCALE = 1.33f;
@@ -153,7 +153,7 @@ public class QuickstepAtomicAnimationFactory extends AtomicAnimationFactory { 
                    config.setInterpolator(ANIM_HOTSEAT_TRANSLATE, OVERSHOOT_1_2);

                }



                LauncherStateManager stateManager = mLauncher.getStateManager();

                StateManager<LauncherState> stateManager = mLauncher.getStateManager();

                return stateManager.createAtomicAnimation(

                        stateManager.getCurrentStableState(), OVERVIEW, config);

            }