Merge "Use only current density to check isTablet" into sc-v2-dev

This commit is contained in:
Alex Chau
2021-11-19 20:24:57 +00:00
committed by Android (Google) Code Review

View File

@@ -18,7 +18,6 @@ package com.android.systemui.shared.recents.utilities;
import static android.app.StatusBarManager.NAVIGATION_HINT_BACK_ALT; import static android.app.StatusBarManager.NAVIGATION_HINT_BACK_ALT;
import static android.app.StatusBarManager.NAVIGATION_HINT_IME_SHOWN; import static android.app.StatusBarManager.NAVIGATION_HINT_IME_SHOWN;
import static android.util.DisplayMetrics.DENSITY_DEVICE_STABLE;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.content.Context; import android.content.Context;
@@ -126,10 +125,9 @@ public class Utilities {
final WindowManager windowManager = context.getSystemService(WindowManager.class); final WindowManager windowManager = context.getSystemService(WindowManager.class);
final Rect bounds = windowManager.getCurrentWindowMetrics().getBounds(); final Rect bounds = windowManager.getCurrentWindowMetrics().getBounds();
float originalSmallestWidth = dpiFromPx(Math.min(bounds.width(), bounds.height()), float smallestWidth = dpiFromPx(Math.min(bounds.width(), bounds.height()),
context.getResources().getConfiguration().densityDpi); context.getResources().getConfiguration().densityDpi);
return dpiFromPx(Math.min(bounds.width(), bounds.height()), DENSITY_DEVICE_STABLE) return smallestWidth >= TABLET_MIN_DPS;
>= TABLET_MIN_DPS && originalSmallestWidth >= TABLET_MIN_DPS;
} }
public static float dpiFromPx(float size, int densityDpi) { public static float dpiFromPx(float size, int densityDpi) {