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

Commit e9cba255 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Query the display status from DisplayInfo" into tm-d1-dev am:...

Merge "Merge "Query the display status from DisplayInfo" into tm-d1-dev am: ce7dcdce" into tm-qpr-dev
parents 70d8bb35 c70222a4
Loading
Loading
Loading
Loading
+5 −4
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ import android.util.DisplayMetrics;
import android.util.Log;
import android.util.Log;
import android.util.MathUtils;
import android.util.MathUtils;
import android.view.Display;
import android.view.Display;
import android.view.DisplayInfo;
import android.view.IWindowManager;
import android.view.IWindowManager;
import android.view.WindowManagerGlobal;
import android.view.WindowManagerGlobal;


@@ -87,14 +88,14 @@ public class DisplayDensityUtils {
        }
        }


        final Resources res = context.getResources();
        final Resources res = context.getResources();
        final DisplayMetrics metrics = new DisplayMetrics();
        DisplayInfo info = new DisplayInfo();
        context.getDisplayNoVerify().getRealMetrics(metrics);
        context.getDisplayNoVerify().getDisplayInfo(info);


        final int currentDensity = metrics.densityDpi;
        final int currentDensity = info.logicalDensityDpi;
        int currentDensityIndex = -1;
        int currentDensityIndex = -1;


        // Compute number of "larger" and "smaller" scales for this display.
        // Compute number of "larger" and "smaller" scales for this display.
        final int minDimensionPx = Math.min(metrics.widthPixels, metrics.heightPixels);
        final int minDimensionPx = Math.min(info.logicalWidth, info.logicalHeight);
        final int maxDensity = DisplayMetrics.DENSITY_MEDIUM * minDimensionPx / MIN_DIMENSION_DP;
        final int maxDensity = DisplayMetrics.DENSITY_MEDIUM * minDimensionPx / MIN_DIMENSION_DP;
        final float maxScaleDimen = context.getResources().getFraction(
        final float maxScaleDimen = context.getResources().getFraction(
                R.fraction.display_density_max_scale, 1, 1);
                R.fraction.display_density_max_scale, 1, 1);