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

This commit is contained in:
TreeHugger Robot
2021-11-17 17:47:16 +00:00
committed by Android (Google) Code Review
2 changed files with 1 additions and 6 deletions

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;