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

Merge "Revert "Add feature flag to control two panel home in portrait"" into sc-v2-dev am: 42f111dc27

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16279502

Change-Id: I69f25262f5ae58304c8b1c0615cf9510221f6ef3
This commit is contained in:
TreeHugger Robot
2021-11-17 18:07:05 +00:00
committed by Automerger Merge Worker
parent a4157b6afe 42f111dc27
commit 54dd53876c
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/launcher3/DeviceProfile.java
View File

@@ -251,8 +251,7 @@ public class DeviceProfile {
// Tablet UI does not support emulated landscape.
isTablet = allowRotation && info.isTablet(windowBounds);
isPhone = !isTablet;
isTwoPanels = isTablet && useTwoPanels
&& (isLandscape || FeatureFlags.ENABLE_TWO_PANEL_HOME_IN_PORTRAIT.get());
isTwoPanels = isTablet && useTwoPanels;
aspectRatio = ((float) Math.max(widthPx, heightPx)) / Math.min(widthPx, heightPx);
boolean isTallDevice = Float.compare(aspectRatio, TALL_DEVICE_ASPECT_RATIO_THRESHOLD) >= 0;

4
src/com/android/launcher3/config/FeatureFlags.java
View File

@@ -210,10 +210,6 @@ public final class FeatureFlags {
"ENABLE_TWO_PANEL_HOME", true,
"Uses two panel on home screen. Only applicable on large screen devices.");
public static final BooleanFlag ENABLE_TWO_PANEL_HOME_IN_PORTRAIT = getDebugFlag(
"ENABLE_TWO_PANEL_HOME_IN_PORTRAIT", true,
"Uses two panel on home screen in portrait if ENABLE_TWO_PANEL_HOME is enabled.");
public static final BooleanFlag ENABLE_SCRIM_FOR_APP_LAUNCH = getDebugFlag(
"ENABLE_SCRIM_FOR_APP_LAUNCH", false,
"Enables scrim during app launch animation.");