Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Automerger Merge Worker
2022-06-15 06:11:46 +00:00
committed by Android (Google) Code Review
parent 70d8bb351f c70222a460
commit e9cba2550d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SettingsLib/src/com/android/settingslib/display/DisplayDensityUtils.java
View File

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