- Replace UI_STATE_OVERVIEW with UI_STATE_FULLSCREEN_TASK. Overview no longer needs it's own status bar treatment as it's handled by ScrimView already. So remove instances of UI_STATE_OVERVIEW and replace some with UI_STATE_FULLSCREEN_TASK if a TaskView is behind the status bar. - Add ScrimView to fallback recents activity. - Remove scrim from Background state, don't fade it in until the gesture ends to RECENTS. Test: watch scrim and status bar colors during the following - Swipe up to home (no scrim, status bar matches task at first but then wallpaper once task isn't overlapping status bar) - Swipe up to overview (no scrim until let go to overview, status bar matches task at first, then wallpaper after not overlapping, then scrim once it's 90% opacity) - Quick switch from home (scrim fades in, status bar matches once it reaches 90% opacity) - Quick switch from app (no scrim, status bar matches center task) - Repeat above for 3P launcher and 2 button mode Fixes: 185681676 Fixes: 185286870 Change-Id: I9e5c292cc734e714169b9cc8268e8dad4e868aca
59 lines
2.1 KiB
Java
59 lines
2.1 KiB
Java
/*
|
|
* Copyright (C) 2019 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
package com.android.launcher3.uioverrides.states;
|
|
|
|
import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
|
|
|
|
import com.android.launcher3.Launcher;
|
|
import com.android.launcher3.R;
|
|
import com.android.launcher3.util.Themes;
|
|
|
|
/**
|
|
* State to indicate we are about to launch a recent task. Note that this state is only used when
|
|
* quick switching from launcher; quick switching from an app uses LauncherSwipeHandler.
|
|
* @see com.android.quickstep.GestureState.GestureEndTarget#NEW_TASK
|
|
*/
|
|
public class QuickSwitchState extends BackgroundAppState {
|
|
|
|
public QuickSwitchState(int id) {
|
|
super(id, LAUNCHER_STATE_BACKGROUND);
|
|
}
|
|
|
|
@Override
|
|
public ScaleAndTranslation getWorkspaceScaleAndTranslation(Launcher launcher) {
|
|
float shiftRange = launcher.getAllAppsController().getShiftRange();
|
|
float shiftProgress = getVerticalProgress(launcher) - NORMAL.getVerticalProgress(launcher);
|
|
float translationY = shiftProgress * shiftRange;
|
|
return new ScaleAndTranslation(0.9f, 0, translationY);
|
|
}
|
|
|
|
@Override
|
|
public int getWorkspaceScrimColor(Launcher launcher) {
|
|
return Themes.getAttrColor(launcher, R.attr.overviewScrimColor);
|
|
}
|
|
|
|
@Override
|
|
public float getVerticalProgress(Launcher launcher) {
|
|
// Don't move all apps shelf while quick-switching (just let it fade).
|
|
return 1f;
|
|
}
|
|
|
|
@Override
|
|
public int getVisibleElements(Launcher launcher) {
|
|
return TASKBAR;
|
|
}
|
|
}
|