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

Commit 0f1001c7 authored by Alex Chau's avatar Alex Chau Committed by Android (Google) Code Review
Browse files

Merge "Use real IDP in DeviceProfileTest" into tm-qpr-dev

parents 7a6c6106 e818bcb9

quickstep/src/com/android/launcher3/statehandlers/BackButtonAlphaHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.launcher3.statehandlers;



import static com.android.launcher3.anim.Interpolators.LINEAR;

import static com.android.launcher3.util.DisplayController.NavigationMode.TWO_BUTTONS;

import static com.android.launcher3.util.NavigationMode.TWO_BUTTONS;

import static com.android.quickstep.AnimatedFloat.VALUE;



import com.android.launcher3.LauncherState;

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ import com.android.launcher3.testing.TestLogging; 
import com.android.launcher3.testing.shared.TestProtocol;

import com.android.launcher3.touch.ItemClickHandler;

import com.android.launcher3.util.DisplayController;

import com.android.launcher3.util.DisplayController.NavigationMode;

import com.android.launcher3.util.NavigationMode;

import com.android.launcher3.util.PackageManagerHelper;

import com.android.launcher3.util.SettingsCache;

import com.android.launcher3.util.TraceHelper;

quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java

+2 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import com.android.launcher3.statemanager.StatefulActivity; 
import com.android.launcher3.taskbar.unfold.NonDestroyableScopedUnfoldTransitionProgressProvider;

import com.android.launcher3.uioverrides.QuickstepLauncher;

import com.android.launcher3.util.DisplayController;

import com.android.launcher3.util.NavigationMode;

import com.android.launcher3.util.SettingsCache;

import com.android.launcher3.util.SimpleBroadcastReceiver;

import com.android.quickstep.RecentsActivity;
@@ -83,7 +84,7 @@ public class TaskbarManager { 
    // It's destruction/creation will be managed by the activity.

    private final ScopedUnfoldTransitionProgressProvider mUnfoldProgressProvider =

            new NonDestroyableScopedUnfoldTransitionProgressProvider();

    private DisplayController.NavigationMode mNavMode;

    private NavigationMode mNavMode;



    private TaskbarActivityContext mTaskbarActivityContext;

    private StatefulActivity mActivity;

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

+2 −2
Original line number Diff line number Diff line
@@ -45,9 +45,9 @@ import static com.android.launcher3.testing.shared.TestProtocol.OVERVIEW_STATE_O 
import static com.android.launcher3.testing.shared.TestProtocol.QUICK_SWITCH_STATE_ORDINAL;

import static com.android.launcher3.util.DisplayController.CHANGE_ACTIVE_SCREEN;

import static com.android.launcher3.util.DisplayController.CHANGE_NAVIGATION_MODE;

import static com.android.launcher3.util.DisplayController.NavigationMode.TWO_BUTTONS;

import static com.android.launcher3.util.Executors.THREAD_POOL_EXECUTOR;

import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;

import static com.android.launcher3.util.NavigationMode.TWO_BUTTONS;

import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;



import android.animation.AnimatorSet;
@@ -114,8 +114,8 @@ import com.android.launcher3.uioverrides.touchcontrollers.TransposedQuickSwitchT 
import com.android.launcher3.uioverrides.touchcontrollers.TwoButtonNavbarTouchController;

import com.android.launcher3.util.ActivityOptionsWrapper;

import com.android.launcher3.util.DisplayController;

import com.android.launcher3.util.DisplayController.NavigationMode;

import com.android.launcher3.util.IntSet;

import com.android.launcher3.util.NavigationMode;

import com.android.launcher3.util.ObjectWrapper;

import com.android.launcher3.util.PendingRequestArgs;

import com.android.launcher3.util.PendingSplitSelectInfo;

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ import com.android.launcher3.states.StateAnimationConfig; 
import com.android.launcher3.touch.AbstractStateChangeTouchController;

import com.android.launcher3.touch.SingleAxisSwipeDetector;

import com.android.launcher3.util.DisplayController;

import com.android.launcher3.util.DisplayController.NavigationMode;

import com.android.launcher3.util.NavigationMode;

import com.android.quickstep.SystemUiProxy;

import com.android.quickstep.TaskUtils;

import com.android.quickstep.views.RecentsView;