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

Move UnionDecorationHandler to Launcher

Browse Source 
- Create base SectionDecorationInfo.java and RecyclerViewAnimationController.java
- SearchTransitionController now inherits from RecyclerViewAnimationController where RecyclerViewAnimationController will control
animation for private space

Bug: 299294792
Test: Verified SearchTransitionController didn't regress by turning off BACKGROUND_DRAWABLES flag.
- Verified QL highlight still works
- video: https://drive.google.com/file/d/15yjBWofebn6m7VgEnLK6kEYqhC_adJQ3/view?usp=sharing

Flag: None
Change-Id: If34f4bb199be0e113485279931d2927cb9fad397
This commit is contained in:
Brandon Dayauon committed 2023-12-11 11:27:25 -08:00
1 parent aa84ba761e
commit 763e40d747
9 files changed
+657 -263
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/com/android/launcher3/allapps/SearchTransitionController.java
+26 -243
View File
@@ -18,34 +18,21 @@ package com.android.launcher3.allapps;
import static android.view.View.VISIBLE;
import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
import static com.android.app.animation.Interpolators.DECELERATE_1_7;
import static com.android.app.animation.Interpolators.INSTANT;
import static com.android.app.animation.Interpolators.clampToProgress;
import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
import static com.android.launcher3.anim.AnimatorListeners.forEndCallback;
import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;
import android.animation.ObjectAnimator;
import android.animation.TimeInterpolator;
import android.graphics.drawable.Drawable;
import android.util.FloatProperty;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.Interpolator;
import com.android.launcher3.BubbleTextView;
import com.android.launcher3.R;
import com.android.launcher3.Utilities;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.model.data.ItemInfo;
/** Coordinates the transition between Search and A-Z in All Apps. */
public class SearchTransitionController {
private static final String LOG_TAG = "SearchTransitionCtrl";
public class SearchTransitionController extends RecyclerViewAnimationController {
// Interpolator when the user taps the QSB while already in All Apps.
private static final Interpolator INTERPOLATOR_WITHIN_ALL_APPS = DECELERATE_1_7;
@@ -53,42 +40,10 @@ public class SearchTransitionController {
// happening simultaneously.
private static final Interpolator INTERPOLATOR_TRANSITIONING_TO_ALL_APPS = INSTANT;
/**
* These values represent points on the [0, 1] animation progress spectrum. They are used to
* animate items in the {@link SearchRecyclerView}.
*/
private static final float TOP_CONTENT_FADE_PROGRESS_START = 0.133f;
private static final float CONTENT_FADE_PROGRESS_DURATION = 0.083f;
private static final float TOP_BACKGROUND_FADE_PROGRESS_START = 0.633f;
private static final float BACKGROUND_FADE_PROGRESS_DURATION = 0.15f;
private static final float CONTENT_STAGGER = 0.01f; // Progress before next item starts fading.
private static final FloatProperty<SearchTransitionController> SEARCH_TO_AZ_PROGRESS =
new FloatProperty<SearchTransitionController>("searchToAzProgress") {
@Override
public Float get(SearchTransitionController controller) {
return controller.getSearchToAzProgress();
}
@Override
public void setValue(SearchTransitionController controller, float progress) {
controller.setSearchToAzProgress(progress);
}
};
private final ActivityAllAppsContainerView<?> mAllAppsContainerView;
private ObjectAnimator mSearchToAzAnimator = null;
private float mSearchToAzProgress = 1f;
private boolean mSkipNextAnimationWithinAllApps;
public SearchTransitionController(ActivityAllAppsContainerView<?> allAppsContainerView) {
mAllAppsContainerView = allAppsContainerView;
}
/** Returns true if a transition animation is currently in progress. */
public boolean isRunning() {
return mSearchToAzAnimator != null;
super(allAppsContainerView);
}
/**
@@ -101,51 +56,31 @@ public class SearchTransitionController {
* @param onEndRunnable will be called when the animation finishes, unless another animation is
* scheduled in the meantime
*/
public void animateToSearchState(boolean goingToSearch, long duration, Runnable onEndRunnable) {
float targetProgress = goingToSearch ? 0 : 1;
if (mSearchToAzAnimator != null) {
mSearchToAzAnimator.cancel();
}
mSearchToAzAnimator = ObjectAnimator.ofFloat(this, SEARCH_TO_AZ_PROGRESS, targetProgress);
boolean inAllApps = mAllAppsContainerView.isInAllApps();
TimeInterpolator timeInterpolator =
inAllApps ? INTERPOLATOR_WITHIN_ALL_APPS : INTERPOLATOR_TRANSITIONING_TO_ALL_APPS;
if (mSkipNextAnimationWithinAllApps) {
timeInterpolator = INSTANT;
mSkipNextAnimationWithinAllApps = false;
}
if (timeInterpolator == INSTANT) {
duration = 0; // Don't want to animate when coming from QSB.
}
mSearchToAzAnimator.setDuration(duration).setInterpolator(timeInterpolator);
mSearchToAzAnimator.addListener(forEndCallback(() -> mSearchToAzAnimator = null));
@Override
protected void animateToState(boolean goingToSearch, long duration, Runnable onEndRunnable) {
super.animateToState(goingToSearch, duration, onEndRunnable);
if (!goingToSearch) {
mSearchToAzAnimator.addListener(forSuccessCallback(() -> {
mAnimator.addListener(forSuccessCallback(() -> {
mAllAppsContainerView.getFloatingHeaderView().setFloatingRowsCollapsed(false);
mAllAppsContainerView.getFloatingHeaderView().reset(false /* animate */);
mAllAppsContainerView.getAppsRecyclerViewContainer().setTranslationY(0);
}));
}
mSearchToAzAnimator.addListener(forSuccessCallback(onEndRunnable));
mAllAppsContainerView.getFloatingHeaderView().setFloatingRowsCollapsed(true);
mAllAppsContainerView.getFloatingHeaderView().setVisibility(VISIBLE);
mAllAppsContainerView.getFloatingHeaderView().maybeSetTabVisibility(VISIBLE);
mAllAppsContainerView.getAppsRecyclerViewContainer().setVisibility(VISIBLE);
getSearchRecyclerView().setVisibility(VISIBLE);
getSearchRecyclerView().setChildAttachedConsumer(this::onSearchChildAttached);
mSearchToAzAnimator.start();
getRecyclerView().setVisibility(VISIBLE);
}
private SearchRecyclerView getSearchRecyclerView() {
@Override
protected SearchRecyclerView getRecyclerView() {
return mAllAppsContainerView.getSearchRecyclerView();
}
private void setSearchToAzProgress(float searchToAzProgress) {
mSearchToAzProgress = searchToAzProgress;
int searchHeight = updateSearchRecyclerViewProgress();
@Override
protected int onProgressUpdated(float searchToAzProgress) {
int searchHeight = super.onProgressUpdated(searchToAzProgress);
FloatingHeaderView headerView = mAllAppsContainerView.getFloatingHeaderView();
@@ -171,179 +106,27 @@ public class SearchTransitionController {
appsContainer.setTranslationY(appsTranslationY);
// Fade apps out with tabs (in 20% of the total animation).
appsContainer.setAlpha(clampToProgress(searchToAzProgress, 0.8f, 1f));
return searchHeight;
}
/**
* Updates the children views of SearchRecyclerView based on the current animation progress.
*
* @return the total height of animating views (excluding at most one row of app icons).
* Should only animate if the view is not an app icon or if the app row is complete.
*/
private int updateSearchRecyclerViewProgress() {
int numSearchResultsAnimated = 0;
int totalHeight = 0;
int appRowHeight = 0;
boolean appRowComplete = false;
Integer top = null;
SearchRecyclerView searchRecyclerView = getSearchRecyclerView();
for (int i = 0; i < searchRecyclerView.getChildCount(); i++) {
View searchResultView = searchRecyclerView.getChildAt(i);
if (searchResultView == null) {
continue;
}
if (top == null) {
top = searchResultView.getTop();
}
int adapterPosition = searchRecyclerView.getChildAdapterPosition(searchResultView);
int spanIndex = getSpanIndex(searchRecyclerView, adapterPosition);
appRowComplete |= appRowHeight > 0 && spanIndex == 0;
// We don't animate the first (currently only) app row we see, as that is assumed to be
// predicted/prefix-matched apps.
boolean shouldAnimate = !isAppIcon(searchResultView) || appRowComplete;
float contentAlpha = 1f;
float backgroundAlpha = 1f;
if (shouldAnimate) {
if (spanIndex > 0) {
// Animate this item with the previous item on the same row.
numSearchResultsAnimated--;
}
// Adjust content alpha based on start progress and stagger.
float startContentFadeProgress = Math.max(0,
TOP_CONTENT_FADE_PROGRESS_START
- CONTENT_STAGGER * numSearchResultsAnimated);
float endContentFadeProgress = Math.min(1,
startContentFadeProgress + CONTENT_FADE_PROGRESS_DURATION);
contentAlpha = 1 - clampToProgress(mSearchToAzProgress,
startContentFadeProgress, endContentFadeProgress);
// Adjust background (or decorator) alpha based on start progress and stagger.
float startBackgroundFadeProgress = Math.max(0,
TOP_BACKGROUND_FADE_PROGRESS_START
- CONTENT_STAGGER * numSearchResultsAnimated);
float endBackgroundFadeProgress = Math.min(1,
startBackgroundFadeProgress + BACKGROUND_FADE_PROGRESS_DURATION);
backgroundAlpha = 1 - clampToProgress(mSearchToAzProgress,
startBackgroundFadeProgress, endBackgroundFadeProgress);
numSearchResultsAnimated++;
}
Drawable background = searchResultView.getBackground();
if (background != null
&& searchResultView instanceof ViewGroup
&& FeatureFlags.ENABLE_SEARCH_RESULT_BACKGROUND_DRAWABLES.get()) {
searchResultView.setAlpha(1f);
// Apply content alpha to each child, since the view needs to be fully opaque for
// the background to show properly.
ViewGroup searchResultViewGroup = (ViewGroup) searchResultView;
for (int j = 0; j < searchResultViewGroup.getChildCount(); j++) {
searchResultViewGroup.getChildAt(j).setAlpha(contentAlpha);
}
// Apply background alpha to the background drawable directly.
background.setAlpha((int) (255 * backgroundAlpha));
} else {
searchResultView.setAlpha(contentAlpha);
// Apply background alpha to decorator if possible.
if (adapterPosition != NO_POSITION) {
searchRecyclerView.getApps().getAdapterItems().get(adapterPosition)
.setDecorationFillAlpha((int) (255 * backgroundAlpha));
}
// Apply background alpha to view's background (e.g. for Search Edu card).
if (background != null) {
background.setAlpha((int) (255 * backgroundAlpha));
}
}
float scaleY = 1;
if (shouldAnimate) {
scaleY = 1 - mSearchToAzProgress;
}
int scaledHeight = (int) (searchResultView.getHeight() * scaleY);
searchResultView.setScaleY(scaleY);
// For rows with multiple elements, only count the height once and translate elements to
// the same y position.
int y = top + totalHeight;
if (spanIndex > 0) {
// Continuation of an existing row; move this item into the row.
y -= scaledHeight;
} else {
// Start of a new row contributes to total height.
totalHeight += scaledHeight;
if (!shouldAnimate) {
appRowHeight = scaledHeight;
}
}
searchResultView.setY(y);
}
return totalHeight - appRowHeight;
@Override
protected boolean shouldAnimate(View view, boolean hasDecorationInfo, boolean appRowComplete) {
return !isAppIcon(view) || appRowComplete;
}
/** @return the column that the view at this position is found (0 assumed if indeterminate). */
private int getSpanIndex(SearchRecyclerView searchRecyclerView, int adapterPosition) {
if (adapterPosition == NO_POSITION) {
Log.w(LOG_TAG, "Can't determine span index - child not found in adapter");
return 0;
@Override
protected TimeInterpolator getInterpolator() {
TimeInterpolator timeInterpolator =
mAllAppsContainerView.isInAllApps()
? INTERPOLATOR_WITHIN_ALL_APPS : INTERPOLATOR_TRANSITIONING_TO_ALL_APPS;
if (mSkipNextAnimationWithinAllApps) {
timeInterpolator = INSTANT;
mSkipNextAnimationWithinAllApps = false;
}
if (!(searchRecyclerView.getAdapter() instanceof AllAppsGridAdapter<?>)) {
Log.e(LOG_TAG, "Search RV doesn't have an AllAppsGridAdapter?");
// This case shouldn't happen, but for debug devices we will continue to create a more
// visible crash.
if (!Utilities.IS_DEBUG_DEVICE) {
return 0;
}
}
AllAppsGridAdapter<?> adapter = (AllAppsGridAdapter<?>) searchRecyclerView.getAdapter();
return adapter.getSpanIndex(adapterPosition);
}
private boolean isAppIcon(View item) {
return item instanceof BubbleTextView && item.getTag() instanceof ItemInfo
&& ((ItemInfo) item.getTag()).itemType == ITEM_TYPE_APPLICATION;
}
/** Called just before a child is attached to the SearchRecyclerView. */
private void onSearchChildAttached(View child) {
// Avoid allocating hardware layers for alpha changes.
child.forceHasOverlappingRendering(false);
child.setPivotY(0);
if (mSearchToAzProgress > 0) {
// Before the child is rendered, apply the animation including it to avoid flicker.
updateSearchRecyclerViewProgress();
} else {
// Apply default states without processing the full layout.
child.setAlpha(1);
child.setScaleY(1);
child.setTranslationY(0);
int adapterPosition = getSearchRecyclerView().getChildAdapterPosition(child);
if (adapterPosition != NO_POSITION) {
getSearchRecyclerView().getApps().getAdapterItems().get(adapterPosition)
.setDecorationFillAlpha(255);
}
if (child instanceof ViewGroup
&& FeatureFlags.ENABLE_SEARCH_RESULT_BACKGROUND_DRAWABLES.get()) {
ViewGroup childGroup = (ViewGroup) child;
for (int i = 0; i < childGroup.getChildCount(); i++) {
childGroup.getChildAt(i).setAlpha(1f);
}
}
if (child.getBackground() != null) {
child.getBackground().setAlpha(255);
}
}
}
private float getSearchToAzProgress() {
return mSearchToAzProgress;
return timeInterpolator;
}
/**