fix: Conflict incoming changes from 15-dev
This commit is contained in:
1 parent
14e352c827
commit
2e76c99dad
1726 files changed
+146970
-95027
No files matched your search
@@ -187,6 +187,8 @@ public class AllAppsTransitionController
|
||||
|
||||
private boolean mHasScaleEffect;
|
||||
private final MSDLPlayerWrapper mMSDLPlayerWrapper;
|
||||
// Indicates whether this transition should scale the allapps header in addition to its content.
|
||||
private boolean mShouldScaleHeader;
|
||||
|
||||
public AllAppsTransitionController(Launcher l) {
|
||||
mLauncher = l;
|
||||
@@ -233,7 +235,7 @@ public class AllAppsTransitionController
|
||||
boolean fromBackground =
|
||||
mLauncher.getStateManager().getCurrentStableState() == BACKGROUND_APP;
|
||||
// Allow apps panel to shift the full screen if coming from another app.
|
||||
float shiftRange = fromBackground ? mLauncher.getDeviceProfile().heightPx : mShiftRange;
|
||||
float shiftRange = fromBackground ? mLauncher.getDeviceProfile().getDeviceProperties().getHeightPx() : mShiftRange;
|
||||
getAppsViewProgressTranslationY().setValue(mProgress * shiftRange);
|
||||
mLauncher.onAllAppsTransition(1 - progress);
|
||||
|
||||
@@ -273,6 +275,11 @@ public class AllAppsTransitionController
|
||||
setAlphas(state, new StateAnimationConfig(), NO_ANIM_PROPERTY_SETTER);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBackStarted(LauncherState toState) {
|
||||
setShouldScaleHeader(!mLauncher.getAppsView().shouldBackExitSearch());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBackProgressed(
|
||||
LauncherState toState, @FloatRange(from = 0.0, to = 1.0) float backProgress) {
|
||||
@@ -290,8 +297,8 @@ public class AllAppsTransitionController
|
||||
private void onScaleProgressChanged() {
|
||||
final float scaleProgress = mAllAppScale.value;
|
||||
SCALE_PROPERTY.set(mLauncher.getAppsView(), scaleProgress);
|
||||
if (!mLauncher.getAppsView().isSearching()
|
||||
|| !mLauncher.getDeviceProfile().shouldShowAllAppsOnSheet()) {
|
||||
|
||||
if (mShouldScaleHeader || !mShouldShowAllAppsOnSheet) {
|
||||
mLauncher.getScrimView().setScrimHeaderScale(scaleProgress);
|
||||
}
|
||||
|
||||
@@ -313,6 +320,21 @@ public class AllAppsTransitionController
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return AnimatedFloat for all apps scale. This will scale the allapps content by default.
|
||||
* @see #setShouldScaleHeader(boolean)
|
||||
*/
|
||||
public AnimatedFloat getAllAppScale() {
|
||||
return mAllAppScale;
|
||||
}
|
||||
|
||||
/**
|
||||
* Specify whether this transition should scale the allapps header in addition to its content.
|
||||
*/
|
||||
public void setShouldScaleHeader(boolean shouldScaleHeader) {
|
||||
mShouldScaleHeader = shouldScaleHeader;
|
||||
}
|
||||
|
||||
/** Set {@link Animator.AnimatorListener} for scaling all apps scale to 1 animation. */
|
||||
public void setAllAppsSearchBackAnimationListener(Animator.AnimatorListener listener) {
|
||||
mAllAppsSearchBackAnimationListener = listener;
|
||||
@@ -324,7 +346,7 @@ public class AllAppsTransitionController
|
||||
*/
|
||||
public void animateAllAppsToNoScale() {
|
||||
if (mAllAppScale.isAnimating()) {
|
||||
return;
|
||||
mAllAppScale.cancelAnimation();
|
||||
}
|
||||
Animator animator = mAllAppScale.animateToValue(1f)
|
||||
.setDuration(REVERT_SWIPE_ALL_APPS_TO_HOME_ANIMATION_DURATION_MS);
|
||||
|
||||
Reference in new issue
Block a user