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

Merge "Avoid IconView's setModalAlpha interfere with setContentAlpha" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-05-22 09:40:29 +00:00
committed by Android (Google) Code Review
parent fe2107c59d 63e4e4ce11
commit 656f0e8d13
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
quickstep/src/com/android/quickstep/views/IconView.java
View File

@@ -28,6 +28,7 @@ import androidx.annotation.Nullable;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.Utilities;
import com.android.launcher3.util.MultiValueAlpha;
import com.android.launcher3.views.ActivityContext;
import com.android.quickstep.orientation.RecentsPagedOrientationHandler;
import com.android.quickstep.util.RecentsOrientedState;
@@ -37,21 +38,33 @@ import com.android.quickstep.util.RecentsOrientedState;
* when the drawable changes.
*/
public class IconView extends View implements TaskViewIcon {
private static final int NUM_ALPHA_CHANNELS = 2;
private static final int INDEX_CONTENT_ALPHA = 0;
private static final int INDEX_MODAL_ALPHA = 1;
private final MultiValueAlpha mMultiValueAlpha;
@Nullable
private Drawable mDrawable;
private int mDrawableWidth, mDrawableHeight;
public IconView(Context context) {
super(context);
this(context, null);
}
public IconView(Context context, AttributeSet attrs) {
super(context, attrs);
this(context, attrs, 0);
}
public IconView(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
this(context, attrs, defStyleAttr, 0);
}
public IconView(Context context, @Nullable AttributeSet attrs, int defStyleAttr,
int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
mMultiValueAlpha = new MultiValueAlpha(this, NUM_ALPHA_CHANNELS);
mMultiValueAlpha.setUpdateVisibility(/* updateVisibility= */ true);
}
/**
@@ -143,22 +156,12 @@ public class IconView extends View implements TaskViewIcon {
@Override
public void setContentAlpha(float alpha) {
setAlpha(alpha);
mMultiValueAlpha.get(INDEX_CONTENT_ALPHA).setValue(alpha);
}
@Override
public void setModalAlpha(float alpha) {
setAlpha(alpha);
}
@Override
public void setAlpha(float alpha) {
super.setAlpha(alpha);
if (alpha > 0) {
setVisibility(VISIBLE);
} else {
setVisibility(INVISIBLE);
}
mMultiValueAlpha.get(INDEX_MODAL_ALPHA).setValue(alpha);
}
/**