msemes/Flexera-Launcher
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'android-14.0.0_r28' into android-14.0.0_r28

Browse Source 
Android 14.0.0 Release 28 (UP1A.231105.001.B2)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZcKIlAAKCRDorT+BmrEO
# eBpvAJ4nxs3kcAIk4V/imBoX2pQFBOJYCACfUgnHI+9dgPBM5yKFzN/Hm/DhrDs=
# =avdO
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Feb  7 03:29:24 2024 CST
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Can't check signature: No public key

# Conflicts:
#	lawnchair/res/color/widgets_picker_scrim.xml
#	quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
#	quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java
#	quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
#	quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
#	quickstep/src/com/android/quickstep/TaskAnimationManager.java
#	quickstep/src/com/android/quickstep/TaskViewUtils.java
#	quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
#	src/com/android/launcher3/config/FeatureFlags.java
#	src/com/android/launcher3/folder/LauncherDelegate.java
This commit is contained in:
Goooler committed 2024-02-08 22:44:10 +08:00
2 parents 30f4cd3ac3 5e0122d13a
commit aa2f7086ea
12 files changed
+361 -281
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
+16 -16
View File
@@ -209,22 +209,22 @@ public class TaskbarLauncherStateController {
}
}
@Override
public void onStateTransitionComplete(LauncherState finalState) {
mLauncherState = finalState;
updateStateForFlag(FLAG_LAUNCHER_IN_STATE_TRANSITION, false);
// TODO(b/279514548) Cleans up bad state that can occur when user interacts with
// taskbar on top of transparent activity.
if (finalState == LauncherState.NORMAL && mLauncher.hasBeenResumed()) {
updateStateForFlag(FLAG_RESUMED, true);
}
applyState();
boolean disallowLongClick = finalState == LauncherState.OVERVIEW_SPLIT_SELECT;
com.android.launcher3.taskbar.Utilities.setOverviewDragState(
mControllers, finalState.disallowTaskbarGlobalDrag(),
disallowLongClick, finalState.allowTaskbarInitialSplitSelection());
}
};
@Override
public void onStateTransitionComplete(LauncherState finalState) {
mLauncherState = finalState;
updateStateForFlag(FLAG_LAUNCHER_IN_STATE_TRANSITION, false);
// TODO(b/279514548) Cleans up bad state that can occur when user interacts with
// taskbar on top of transparent activity.
if (finalState == LauncherState.NORMAL && mLauncher.isResumed()) {
updateStateForFlag(FLAG_RESUMED, true);
}
applyState();
boolean disallowLongClick = finalState == LauncherState.OVERVIEW_SPLIT_SELECT;
com.android.launcher3.taskbar.Utilities.setOverviewDragState(
mControllers, finalState.disallowTaskbarGlobalDrag(),
disallowLongClick, finalState.allowTaskbarInitialSplitSelection());
}
};
/**
* Initializes the controller instance, and applies the initial state