aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-03 17:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[Search][Motion] Separate AllApps scrim and content interpolation"

Browse Source 
This reverts commit 8c383f97e4.

Reason for revert: ScrimView is used in multiple places, Overview is broken by this change.

Change-Id: Ie395e2d94feaca4c9365bb5da68e9dc219990e03
This commit is contained in:
Zak Cohen
2021-04-26 23:59:07 +00:00
parent 8c383f97e4
commit 079003b44d
4 changed files with 13 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/launcher3/allapps/AllAppsTransitionController.java
View File

@@ -43,7 +43,6 @@ import com.android.launcher3.anim.PropertySetter;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.statemanager.StateManager.StateHandler;
import com.android.launcher3.states.StateAnimationConfig;
import com.android.launcher3.views.ScrimView;
/**
* Handles AllApps view transition.
@@ -71,11 +70,10 @@ public class AllAppsTransitionController
controller.setProgress(progress);
}
};
private final Launcher mLauncher;
private AllAppsContainerView mAppsView;
private ScrimView mScrimView;
private final Launcher mLauncher;
private boolean mIsVerticalLayout;
// Animation in this class is controlled by a single variable {@link mProgress}.
@@ -123,8 +121,6 @@ public class AllAppsTransitionController
*/
public void setProgress(float progress) {
mProgress = progress;
//Note: Take inverted progress so progress=0 maps to a transparent scrim
mScrimView.setProgress(1 - progress);
mAppsView.setTranslationY(mProgress * mShiftRange);
}
@@ -189,12 +185,8 @@ public class AllAppsTransitionController
return AnimationSuccessListener.forRunnable(this::onProgressAnimationEnd);
}
/**
* Setup views
*/
public void setupViews(AllAppsContainerView appsView, ScrimView scrimView) {
public void setupViews(AllAppsContainerView appsView) {
mAppsView = appsView;
mScrimView = scrimView;
if (FeatureFlags.ENABLE_DEVICE_SEARCH.get() && Utilities.ATLEAST_R) {
mLauncher.getSystemUiController().updateUiState(UI_STATE_ALLAPPS,
View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN