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

Commit c2e0898a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Modify logic for showing the Unsupported Display Size dialog" into... 

Merge "Modify logic for showing the Unsupported Display Size dialog" into aosp-main-future am: 9bd539ce

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



Change-Id: I69acc0e83788a43d46fdff4888585f0690f2f7b0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fa19d374 9bd539ce

services/core/java/com/android/server/wm/AppWarnings.java

+5 −3
Original line number Diff line number Diff line
@@ -152,10 +152,12 @@ class AppWarnings { 
     * @param r activity record for which the warning may be displayed

     */

    public void showUnsupportedDisplaySizeDialogIfNeeded(ActivityRecord r) {

        final Configuration globalConfig = mAtm.getGlobalConfiguration();

        if (globalConfig.densityDpi != DisplayMetrics.DENSITY_DEVICE_STABLE

        final DisplayContent dc = r.getDisplayContent();

        final Configuration config = dc == null

                ? mAtm.getGlobalConfiguration() : dc.getConfiguration();

        if (config.densityDpi != DisplayMetrics.DENSITY_DEVICE_STABLE

                && r.info.applicationInfo.requiresSmallestWidthDp

                > globalConfig.smallestScreenWidthDp) {

                > config.smallestScreenWidthDp) {

            mUiHandler.showUnsupportedDisplaySizeDialog(r);

        }

    }