Loading bliss/src/foundation/e/bliss/folder/GridFolder.java +1 −0 Original line number Original line Diff line number Diff line Loading @@ -169,6 +169,7 @@ public class GridFolder extends Folder implements OnAlarmListener { @Override @Override public void onFolderOpenStart() { public void onFolderOpenStart() { setVisibility(View.VISIBLE); mLastStateBeforeOpen = mLauncher.getStateManager().getState(); mLastStateBeforeOpen = mLauncher.getStateManager().getState(); if (!mLauncher.isInState(NORMAL)) { if (!mLauncher.isInState(NORMAL)) { mLauncher.getStateManager().goToState(LauncherState.NORMAL, false); mLauncher.getStateManager().goToState(LauncherState.NORMAL, false); Loading quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java +7 −0 Original line number Original line Diff line number Diff line Loading @@ -110,6 +110,7 @@ import com.android.launcher3.anim.PendingAnimation; import com.android.launcher3.appprediction.PredictionRowView; import com.android.launcher3.appprediction.PredictionRowView; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.dragndrop.DragOptions; import com.android.launcher3.dragndrop.DragOptions; import com.android.launcher3.folder.Folder; import com.android.launcher3.hybridhotseat.HotseatPredictionController; import com.android.launcher3.hybridhotseat.HotseatPredictionController; import com.android.launcher3.logging.InstanceId; import com.android.launcher3.logging.InstanceId; import com.android.launcher3.logging.StatsLogManager; import com.android.launcher3.logging.StatsLogManager; Loading Loading @@ -440,7 +441,13 @@ public class QuickstepLauncher extends Launcher { } else { } else { SystemUiProxy.INSTANCE.get(this).setShelfHeight(visible, profile.hotseatBarSizePx); SystemUiProxy.INSTANCE.get(this).setShelfHeight(visible, profile.hotseatBarSizePx); } } Folder folder = Folder.getOpen(this); if (folder != null && !folder.isFolderWobbling()) { folder.setVisibility((state == NORMAL) ? View.VISIBLE : View.INVISIBLE); } } } if (state == NORMAL && !inTransition) { if (state == NORMAL && !inTransition) { ((RecentsView) getOverviewPanel()).setSwipeDownShouldLaunchApp(false); ((RecentsView) getOverviewPanel()).setSwipeDownShouldLaunchApp(false); } } Loading src/com/android/launcher3/folder/Folder.java +7 −0 Original line number Original line Diff line number Diff line Loading @@ -312,6 +312,13 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo return startDrag(v, new DragOptions()); return startDrag(v, new DragOptions()); } } public boolean isFolderWobbling() { Launcher launcher = mLauncherDelegate.getLauncher(); if (launcher != null) { return launcher.getWorkspace().isWobbling(); } else return false; } public boolean startDrag(View v, DragOptions options) { public boolean startDrag(View v, DragOptions options) { Object tag = v.getTag(); Object tag = v.getTag(); if (tag instanceof WorkspaceItemInfo) { if (tag instanceof WorkspaceItemInfo) { Loading Loading
bliss/src/foundation/e/bliss/folder/GridFolder.java +1 −0 Original line number Original line Diff line number Diff line Loading @@ -169,6 +169,7 @@ public class GridFolder extends Folder implements OnAlarmListener { @Override @Override public void onFolderOpenStart() { public void onFolderOpenStart() { setVisibility(View.VISIBLE); mLastStateBeforeOpen = mLauncher.getStateManager().getState(); mLastStateBeforeOpen = mLauncher.getStateManager().getState(); if (!mLauncher.isInState(NORMAL)) { if (!mLauncher.isInState(NORMAL)) { mLauncher.getStateManager().goToState(LauncherState.NORMAL, false); mLauncher.getStateManager().goToState(LauncherState.NORMAL, false); Loading
quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java +7 −0 Original line number Original line Diff line number Diff line Loading @@ -110,6 +110,7 @@ import com.android.launcher3.anim.PendingAnimation; import com.android.launcher3.appprediction.PredictionRowView; import com.android.launcher3.appprediction.PredictionRowView; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.dragndrop.DragOptions; import com.android.launcher3.dragndrop.DragOptions; import com.android.launcher3.folder.Folder; import com.android.launcher3.hybridhotseat.HotseatPredictionController; import com.android.launcher3.hybridhotseat.HotseatPredictionController; import com.android.launcher3.logging.InstanceId; import com.android.launcher3.logging.InstanceId; import com.android.launcher3.logging.StatsLogManager; import com.android.launcher3.logging.StatsLogManager; Loading Loading @@ -440,7 +441,13 @@ public class QuickstepLauncher extends Launcher { } else { } else { SystemUiProxy.INSTANCE.get(this).setShelfHeight(visible, profile.hotseatBarSizePx); SystemUiProxy.INSTANCE.get(this).setShelfHeight(visible, profile.hotseatBarSizePx); } } Folder folder = Folder.getOpen(this); if (folder != null && !folder.isFolderWobbling()) { folder.setVisibility((state == NORMAL) ? View.VISIBLE : View.INVISIBLE); } } } if (state == NORMAL && !inTransition) { if (state == NORMAL && !inTransition) { ((RecentsView) getOverviewPanel()).setSwipeDownShouldLaunchApp(false); ((RecentsView) getOverviewPanel()).setSwipeDownShouldLaunchApp(false); } } Loading
src/com/android/launcher3/folder/Folder.java +7 −0 Original line number Original line Diff line number Diff line Loading @@ -312,6 +312,13 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo return startDrag(v, new DragOptions()); return startDrag(v, new DragOptions()); } } public boolean isFolderWobbling() { Launcher launcher = mLauncherDelegate.getLauncher(); if (launcher != null) { return launcher.getWorkspace().isWobbling(); } else return false; } public boolean startDrag(View v, DragOptions options) { public boolean startDrag(View v, DragOptions options) { Object tag = v.getTag(); Object tag = v.getTag(); if (tag instanceof WorkspaceItemInfo) { if (tag instanceof WorkspaceItemInfo) { Loading