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

Commit e1cf3650 authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "Send out a configuration change when screen size changes due to... 

Merge "Send out a configuration change when screen size changes due to expanded desktop." into cm-10.1
parents a33a12bd 9483d878

services/java/com/android/server/wm/WindowManagerService.java

+24 −7
Original line number Diff line number Diff line
@@ -6929,6 +6929,8 @@ public class WindowManagerService extends IWindowManager.Stub 
        boolean rotated;

        int dh;

        int dw;

        int appWidth;

        int appHeight;

    }



    private ApplicationDisplayMetrics calculateDisplayMetrics(DisplayContent displayContent) {
@@ -6969,27 +6971,28 @@ public class WindowManagerService extends IWindowManager.Stub 
        }



        final ApplicationDisplayMetrics m = calculateDisplayMetrics(displayContent);

        final int appWidth = mPolicy.getNonDecorDisplayWidth(m.dw, m.dh, mRotation);

        final int appHeight = mPolicy.getNonDecorDisplayHeight(m.dw, m.dh, mRotation);

        final DisplayInfo displayInfo = displayContent.getDisplayInfo();



        m.appWidth = mPolicy.getNonDecorDisplayWidth(m.dw, m.dh, mRotation);

        m.appHeight = mPolicy.getNonDecorDisplayHeight(m.dw, m.dh, mRotation);



        synchronized(displayContent.mDisplaySizeLock) {

            displayInfo.rotation = mRotation;

            displayInfo.logicalWidth = m.dw;

            displayInfo.logicalHeight = m.dh;

            displayInfo.logicalDensityDpi = displayContent.mBaseDisplayDensity;

            displayInfo.appWidth = appWidth;

            displayInfo.appHeight = appHeight;

            displayInfo.appWidth = m.appWidth;

            displayInfo.appHeight = m.appHeight;

            displayInfo.getLogicalMetrics(mRealDisplayMetrics, null);

            displayInfo.getAppMetrics(mDisplayMetrics, null);

            mDisplayManagerService.setDisplayInfoOverrideFromWindowManager(

                    displayContent.getDisplayId(), displayInfo);



            mAnimator.setDisplayDimensions(m.dw, m.dh, appWidth, appHeight);

            mAnimator.setDisplayDimensions(m.dw, m.dh, m.appWidth, m.appHeight);

        }



        if (false) {

            Slog.i(TAG, "Set app display size: " + appWidth + " x " + appHeight);

            Slog.i(TAG, "Set app display size: " + m.appWidth + " x " + m.appHeight);

        }



        return m;
@@ -10500,10 +10503,24 @@ public class WindowManagerService extends IWindowManager.Stub 


    public void updateDisplayMetrics() {

        long origId = Binder.clearCallingIdentity();

        boolean changed = false;



        synchronized (mWindowMap) {

            final DisplayContent displayContent = getDefaultDisplayContentLocked();

            final DisplayInfo displayInfo =

                    displayContent != null ? displayContent.getDisplayInfo() : null;

            final int oldWidth = displayInfo != null ? displayInfo.appWidth : -1;

            final int oldHeight = displayInfo != null ? displayInfo.appHeight : -1;

            final ApplicationDisplayMetrics metrics =

                    updateApplicationDisplayMetricsLocked(displayContent);



            if (metrics != null && oldWidth >= 0 && oldHeight >= 0) {

                changed = oldWidth != metrics.appWidth || oldHeight != metrics.appHeight;

            }

        }



        if (changed) {

            mH.sendEmptyMessage(H.SEND_NEW_CONFIGURATION);

        }



        Binder.restoreCallingIdentity(origId);