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

Commit 57972501 authored by Automerger Merge Worker's avatar Automerger Merge Worker
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 am: e9cba255

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



Change-Id: I9f128626de43ceb6f9699ed5a8b0b3c6d58c4b62
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a1fe3c30 e9cba255

packages/SettingsLib/src/com/android/settingslib/display/DisplayDensityUtils.java

+5 −4
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.util.DisplayMetrics; 
import android.util.Log;

import android.util.MathUtils;

import android.view.Display;

import android.view.DisplayInfo;

import android.view.IWindowManager;

import android.view.WindowManagerGlobal;
@@ -87,14 +88,14 @@ public class DisplayDensityUtils { 
        }



        final Resources res = context.getResources();

        final DisplayMetrics metrics = new DisplayMetrics();

        context.getDisplayNoVerify().getRealMetrics(metrics);

        DisplayInfo info = new DisplayInfo();

        context.getDisplayNoVerify().getDisplayInfo(info);



        final int currentDensity = metrics.densityDpi;

        final int currentDensity = info.logicalDensityDpi;

        int currentDensityIndex = -1;



        // 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 float maxScaleDimen = context.getResources().getFraction(

                R.fraction.display_density_max_scale, 1, 1);