Revert "Made the taskbar touchable during animation to home."
This reverts commit d89732ef85.
Reason for revert: b/374080485
Flag: NONE
Change-Id: I56236f539957efaaa4caa30a4b887d017037709f
This commit is contained in:
1 parent
bea43b0c03
commit
164b832ec4
5 files changed
+23
-73
No files matched your search
@@ -190,8 +190,6 @@ public class TaskbarLauncherStateController {
|
||||
|
||||
private boolean mIsQsbInline;
|
||||
|
||||
private boolean mIsHotseatVisibleForTaskbarAlignment;
|
||||
|
||||
private final DeviceProfile.OnDeviceProfileChangeListener mOnDeviceProfileChangeListener =
|
||||
new DeviceProfile.OnDeviceProfileChangeListener() {
|
||||
@Override
|
||||
@@ -733,7 +731,6 @@ public class TaskbarLauncherStateController {
|
||||
boolean committed) {
|
||||
boolean isInStashedState = mLauncherState.isTaskbarStashed(mLauncher);
|
||||
TaskbarStashController stashController = mControllers.taskbarStashController;
|
||||
TaskbarInsetsController insetsController = mControllers.taskbarInsetsController;
|
||||
stashController.updateStateForFlag(FLAG_IN_STASHED_LAUNCHER_STATE, isInStashedState);
|
||||
Animator stashAnimator = stashController.createApplyStateAnimator(duration);
|
||||
if (stashAnimator != null) {
|
||||
@@ -742,11 +739,7 @@ public class TaskbarLauncherStateController {
|
||||
public void onAnimationEnd(Animator animation) {
|
||||
if (isInStashedState && committed) {
|
||||
// Reset hotseat alpha to default
|
||||
updateIconAlphaForHome(
|
||||
/* taskbarAlpha = */ 0,
|
||||
ALPHA_CHANNEL_TASKBAR_ALIGNMENT,
|
||||
/* updateTaskbarAlpha = */ false
|
||||
);
|
||||
mLauncher.getHotseat().setIconsAlpha(1, ALPHA_CHANNEL_TASKBAR_ALIGNMENT);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -871,14 +864,6 @@ public class TaskbarLauncherStateController {
|
||||
if (mIsQsbInline) {
|
||||
mLauncher.getHotseat().setQsbAlpha(targetAlpha, alphaChannel);
|
||||
}
|
||||
if (alphaChannel == ALPHA_CHANNEL_TASKBAR_ALIGNMENT) {
|
||||
boolean isHotseatVisibleForTaskbarAlignment = isHotseatVisibleForTaskbarAlignment();
|
||||
if (mIsHotseatVisibleForTaskbarAlignment != isHotseatVisibleForTaskbarAlignment) {
|
||||
mIsHotseatVisibleForTaskbarAlignment = isHotseatVisibleForTaskbarAlignment;
|
||||
mControllers.taskbarInsetsController
|
||||
.onTaskbarOrBubblebarWindowHeightOrInsetsChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** Updates launcher home screen appearance accordingly to the bubble bar location. */
|
||||
@@ -939,13 +924,6 @@ public class TaskbarLauncherStateController {
|
||||
translationXAnimation.start();
|
||||
}
|
||||
|
||||
/** Returns true if hotseat icons visible for the taskbar alignment */
|
||||
public boolean isHotseatVisibleForTaskbarAlignment() {
|
||||
return mLauncher.getHotseat()
|
||||
.getIconsAlpha(ALPHA_CHANNEL_TASKBAR_ALIGNMENT).getValue() == 1;
|
||||
}
|
||||
|
||||
|
||||
private final class TaskBarRecentsAnimationListener implements
|
||||
RecentsAnimationCallbacks.RecentsAnimationListener {
|
||||
private final RecentsAnimationCallbacks mCallbacks;
|
||||
|
||||
Reference in new issue
Block a user