Inlining BaseQuickstepLauncher to QuickstepLauncher
Bug: 243022799 Test: Presubmit Change-Id: I3706fc1f10d88ea73bd873c7e94c3e78795791eb
This commit is contained in:
1 parent
831f5ee748
commit
d6801af69a
21 files changed
+694
-772
No files matched your search
@@ -37,12 +37,12 @@ import android.view.Display;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.android.launcher3.BaseQuickstepLauncher;
|
||||
import com.android.launcher3.DeviceProfile;
|
||||
import com.android.launcher3.LauncherAppState;
|
||||
import com.android.launcher3.anim.AnimatorPlaybackController;
|
||||
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.SettingsCache;
|
||||
import com.android.launcher3.util.SimpleBroadcastReceiver;
|
||||
@@ -237,8 +237,8 @@ public class TaskbarManager {
|
||||
*/
|
||||
private UnfoldTransitionProgressProvider getUnfoldTransitionProgressProviderForActivity(
|
||||
StatefulActivity activity) {
|
||||
if (activity instanceof BaseQuickstepLauncher) {
|
||||
return ((BaseQuickstepLauncher) activity).getUnfoldTransitionProgressProvider();
|
||||
if (activity instanceof QuickstepLauncher) {
|
||||
return ((QuickstepLauncher) activity).getUnfoldTransitionProgressProvider();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
@@ -247,11 +247,11 @@ public class TaskbarManager {
|
||||
* Creates a {@link TaskbarUIController} to use while the given StatefulActivity is active.
|
||||
*/
|
||||
private TaskbarUIController createTaskbarUIControllerForActivity(StatefulActivity activity) {
|
||||
if (activity instanceof BaseQuickstepLauncher) {
|
||||
if (activity instanceof QuickstepLauncher) {
|
||||
if (mTaskbarActivityContext.getPackageManager().hasSystemFeature(FEATURE_PC)) {
|
||||
return new DesktopTaskbarUIController((BaseQuickstepLauncher) activity);
|
||||
return new DesktopTaskbarUIController((QuickstepLauncher) activity);
|
||||
}
|
||||
return new LauncherTaskbarUIController((BaseQuickstepLauncher) activity);
|
||||
return new LauncherTaskbarUIController((QuickstepLauncher) activity);
|
||||
}
|
||||
if (activity instanceof RecentsActivity) {
|
||||
return new FallbackTaskbarUIController((RecentsActivity) activity);
|
||||
|
||||
Reference in new issue
Block a user