PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'heads/android-14.0.0_r18' into 14-dev

Browse Source
This commit is contained in:
MrSluffy
2023-12-14 15:26:43 +08:00
parent 32700b0100
commit cc8f9828ab
756 changed files with 23785 additions and 12235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/LauncherState.java
+62 -7
View File
@@ -15,8 +15,8 @@
*/
package com.android.launcher3;
import static com.android.launcher3.anim.Interpolators.ACCEL_2;
import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
import static com.android.app.animation.Interpolators.ACCELERATE_2;
import static com.android.app.animation.Interpolators.DECELERATE_2;
import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_HOME;
import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
import static com.android.launcher3.testing.shared.TestProtocol.ALL_APPS_STATE_ORDINAL;
@@ -33,6 +33,7 @@ import static com.android.launcher3.testing.shared.TestProtocol.SPRING_LOADED_ST
import android.content.Context;
import android.graphics.Color;
import android.view.View;
import android.view.animation.Interpolator;
import androidx.annotation.FloatRange;
@@ -68,6 +69,7 @@ public abstract class LauncherState implements BaseState<LauncherState> {
public static final int CLEAR_ALL_BUTTON = 1 << 4;
public static final int WORKSPACE_PAGE_INDICATOR = 1 << 5;
public static final int SPLIT_PLACHOLDER_VIEW = 1 << 6;
public static final int FLOATING_SEARCH_BAR = 1 << 7;
// Flag indicating workspace has multiple pages visible.
public static final int FLAG_MULTI_PAGE = BaseState.getFlag(0);
@@ -92,7 +94,7 @@ public abstract class LauncherState implements BaseState<LauncherState> {
public static final float NO_SCALE = 1;
protected static final PageAlphaProvider DEFAULT_ALPHA_PROVIDER =
new PageAlphaProvider(ACCEL_2) {
new PageAlphaProvider(ACCELERATE_2) {
@Override
public float getPageAlpha(int pageIndex) {
return 1;
@@ -100,7 +102,7 @@ public abstract class LauncherState implements BaseState<LauncherState> {
};
protected static final PageTranslationProvider DEFAULT_PAGE_TRANSLATION_PROVIDER =
new PageTranslationProvider(DEACCEL_2) {
new PageTranslationProvider(DECELERATE_2) {
@Override
public float getPageTranslation(int pageIndex) {
return 0;
@@ -212,8 +214,61 @@ public abstract class LauncherState implements BaseState<LauncherState> {
return 0;
}
/**
* How far from the bottom of the screen the <em>floating</em> search bar should rest in this
* state when the IME is not present.
* <p>
* To hide offscreen, use a negative value.
* <p>
* Note: if the provided value is non-negative but less than the current bottom insets, the
* insets will be applied. As such, you can use 0 to default to this.
*/
public int getFloatingSearchBarRestingMarginBottom(Launcher launcher) {
DeviceProfile dp = launcher.getDeviceProfile();
return areElementsVisible(launcher, FLOATING_SEARCH_BAR) ? dp.getQsbOffsetY()
: -dp.hotseatQsbHeight;
}
/**
* How far from the start of the screen the <em>floating</em> search bar should rest.
* <p>
* To use original margin, return a negative value.
*/
public int getFloatingSearchBarRestingMarginStart(Launcher launcher) {
boolean isRtl = Utilities.isRtl(launcher.getResources());
View qsb = launcher.getHotseat().getQsb();
return isRtl ? launcher.getHotseat().getRight() - qsb.getRight() : qsb.getLeft();
}
/**
* How far from the end of the screen the <em>floating</em> search bar should rest.
* <p>
* To use original margin, return a negative value.
*/
public int getFloatingSearchBarRestingMarginEnd(Launcher launcher) {
DeviceProfile dp = launcher.getDeviceProfile();
if (dp.isQsbInline) {
int marginStart = getFloatingSearchBarRestingMarginStart(launcher);
return dp.widthPx - marginStart - dp.hotseatQsbWidth;
}
boolean isRtl = Utilities.isRtl(launcher.getResources());
View qsb = launcher.getHotseat().getQsb();
return isRtl ? qsb.getLeft() : launcher.getHotseat().getRight() - qsb.getRight();
}
/** Whether the <em>floating</em> search bar should use the pill UI when not focused. */
public boolean shouldFloatingSearchBarUsePillWhenUnfocused(Launcher launcher) {
return false;
}
public int getVisibleElements(Launcher launcher) {
return HOTSEAT_ICONS | WORKSPACE_PAGE_INDICATOR | VERTICAL_SWIPE_INDICATOR;
int elements = HOTSEAT_ICONS | WORKSPACE_PAGE_INDICATOR | VERTICAL_SWIPE_INDICATOR;
// Floating search bar is visible in normal state except in landscape on phones.
if (!(launcher.getDeviceProfile().isPhone && launcher.getDeviceProfile().isLandscape)) {
elements |= FLOATING_SEARCH_BAR;
}
return elements;
}
/**
@@ -329,7 +384,7 @@ public abstract class LauncherState implements BaseState<LauncherState> {
return DEFAULT_ALPHA_PROVIDER;
}
final int centerPage = launcher.getWorkspace().getNextPage();
return new PageAlphaProvider(ACCEL_2) {
return new PageAlphaProvider(ACCELERATE_2) {
@Override
public float getPageAlpha(int pageIndex) {
return pageIndex != centerPage ? 0 : 1f;
@@ -346,7 +401,7 @@ public abstract class LauncherState implements BaseState<LauncherState> {
return DEFAULT_PAGE_TRANSLATION_PROVIDER;
}
final float quarterPageSpacing = launcher.getWorkspace().getPageSpacing() / 4f;
return new PageTranslationProvider(DEACCEL_2) {
return new PageTranslationProvider(DECELERATE_2) {
@Override
public float getPageTranslation(int pageIndex) {
boolean isRtl = launcher.getWorkspace().mIsRtl;