Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e22af04f authored by Alex Chau's avatar Alex Chau Committed by Automerger Merge Worker
Browse files

Merge "Use only current density to check isTablet" into sc-v2-dev am: 1f72543a am: 46ee1bfb 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16306280

Change-Id: Ic07143ff7e3401dce76a24fdbb9fb22adfc15d69
parents 3e84fae4 46ee1bfb

packages/SystemUI/shared/src/com/android/systemui/shared/recents/utilities/Utilities.java

+2 −4
Original line number Diff line number Diff line
@@ -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_IME_SHOWN;

import static android.util.DisplayMetrics.DENSITY_DEVICE_STABLE;



import android.annotation.TargetApi;

import android.content.Context;
@@ -126,10 +125,9 @@ public class Utilities { 
        final WindowManager windowManager = context.getSystemService(WindowManager.class);

        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);

        return dpiFromPx(Math.min(bounds.width(), bounds.height()), DENSITY_DEVICE_STABLE)

                >= TABLET_MIN_DPS && originalSmallestWidth >= TABLET_MIN_DPS;

        return smallestWidth >= TABLET_MIN_DPS;

    }



    public static float dpiFromPx(float size, int densityDpi) {