mirror of
https://github.com/alesimula/Murine-launcher.git
synced 2026-10-28 09:43:42 +00:00
OPACITY_TEST - update AllAppsState ActivityAllAppsContainerView
This commit is contained in:
1 parent
1ecbddb5cb
commit
8501145cb5
2 files changed
+18
-9
No files matched your search
@@ -299,8 +299,10 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
|
||||
private static int setColorLStar(int color, double newLStar) {
|
||||
double[] lab = new double[3];
|
||||
ColorUtils.colorToLAB(color, lab);
|
||||
lab[0] = newLStar;
|
||||
return ColorUtils.LABToColor(lab[0], lab[1], lab[2]);
|
||||
lab[0] = Math.max(0, Math.min(100, newLStar));
|
||||
int alpha = Color.alpha(color);
|
||||
int rgb = ColorUtils.LABToColor(lab[0], lab[1], lab[2]);
|
||||
return (alpha << 24) | (rgb & 0x00FFFFFF);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -328,18 +330,20 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
|
||||
int bg;
|
||||
|
||||
if (Utilities.ATLEAST_S) {
|
||||
fg = dark ? android.R.color.system_neutral1_800 : android.R.color.system_neutral1_100;
|
||||
fallbackRes = dark ? android.R.color.system_accent2_800 : android.R.color.system_accent2_200;
|
||||
fg = dark ? android.R.color.system_neutral1_900 : android.R.color.system_neutral1_100;
|
||||
fallbackRes = dark ? android.R.color.system_accent2_900 : android.R.color.system_accent2_200;
|
||||
bg = android.R.color.system_accent1_500;
|
||||
} else {
|
||||
fg = dark ? R.color.widget_picker_selected_tab_text_color_dark : R.color.widget_picker_selected_tab_text_color_light;
|
||||
fg = dark ? R.color.widget_picker_primary_surface_color_dark : R.color.widget_picker_primary_surface_color_light;
|
||||
fallbackRes = dark ? R.color.widget_picker_tab_background_unselected_dark : R.color.widget_picker_tab_background_unselected_light;
|
||||
bg = R.color.accent_ripple_color;
|
||||
}
|
||||
int layerFg = ColorUtils.setAlphaComponent(getResources().getColor(fg, null),
|
||||
(int) (0.32f * 255));
|
||||
// TODO LStar wth blur: 66D, 8D
|
||||
// TODO LStar no blur: 4D, 90D
|
||||
int layerBg = ColorUtils.setAlphaComponent(
|
||||
setColorLStar(getResources().getColor(bg, null), dark ? 90D : 4D),
|
||||
setColorLStar(getResources().getColor(bg, null), dark ? 4D : 90D),
|
||||
(int) (0.32f * 255));
|
||||
mBottomSheetBackgroundColorOverBlur = ColorUtils.compositeColors(layerFg, layerBg);
|
||||
mBottomSheetBackgroundColorBlurFallback = getResources().getColor(fallbackRes);
|
||||
|
||||
@@ -19,9 +19,15 @@ import static com.android.app.animation.Interpolators.DECELERATE;
|
||||
import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_ALLAPPS;
|
||||
|
||||
import android.graphics.Color;
|
||||
import android.content.res.Resources;
|
||||
|
||||
import androidx.core.graphics.ColorUtils;
|
||||
|
||||
import com.android.launcher3.Launcher;
|
||||
import com.android.launcher3.LauncherPrefs;
|
||||
import com.android.launcher3.LauncherState;
|
||||
import com.android.launcher3.R;
|
||||
import com.android.launcher3.icons.FastBitmapDrawable;
|
||||
import com.android.launcher3.util.Themes;
|
||||
import com.android.launcher3.views.ActivityContext;
|
||||
import com.android.launcher3.views.ScrimColors;
|
||||
@@ -99,9 +105,8 @@ public class AllAppsState extends LauncherState {
|
||||
|
||||
@Override
|
||||
public ScrimColors getWorkspaceScrimColor(Launcher launcher) {
|
||||
return new ScrimColors(launcher.getDeviceProfile().isTablet
|
||||
? launcher.getResources().getColor(R.color.widgets_picker_scrim)
|
||||
: Themes.getAttrColor(launcher, R.attr.allAppsScrimColor),
|
||||
return new ScrimColors(
|
||||
/* backgroundColor */ Color.TRANSPARENT,
|
||||
/* foregroundColor */ Color.TRANSPARENT);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user