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

Commit e6b8feca authored by Lingyu Feng's avatar Lingyu Feng Committed by Android (Google) Code Review
Browse files

Merge "Add logs for DisplayWindowSettings.shouldShowSystemDecors" into main

parents 7c077e50 59058f09

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

+2 −0
Original line number Diff line number Diff line
@@ -3872,6 +3872,8 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        mInsetsPolicy.dump(prefix, pw);

        mDwpcHelper.dump(prefix, pw);

        pw.println();

        mWmService.mDisplayWindowSettings.dump(this, prefix, pw);

        pw.println();

    }



    @Override

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

+15 −0
Original line number Diff line number Diff line
@@ -25,11 +25,14 @@ import static android.view.WindowManager.REMOVE_CONTENT_MODE_UNDEFINED; 


import static com.android.server.wm.DisplayContent.FORCE_SCALING_MODE_AUTO;

import static com.android.server.wm.DisplayContent.FORCE_SCALING_MODE_DISABLED;

import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;

import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.WindowConfiguration;

import android.provider.Settings;

import android.util.Slog;

import android.view.Display;

import android.view.DisplayInfo;

import android.view.IWindowManager;
@@ -41,6 +44,7 @@ import android.window.DesktopExperienceFlags; 
import com.android.server.policy.WindowManagerPolicy;

import com.android.server.wm.DisplayContent.ForceScalingMode;



import java.io.PrintWriter;

import java.util.Objects;



/**
@@ -48,6 +52,7 @@ import java.util.Objects; 
 * delegates the persistence and lookup of settings values to the supplied {@link SettingsProvider}.

 */

class DisplayWindowSettings {

    private static final String TAG = TAG_WITH_CLASS_NAME ? "DisplayWindowSettings" : TAG_WM;

    @NonNull

    private final WindowManagerService mService;

    @NonNull
@@ -279,6 +284,9 @@ class DisplayWindowSettings { 


     void setShouldShowSystemDecorsInternalLocked(@NonNull DisplayContent dc,

            boolean shouldShow) {

        final int displayId = dc.getDisplayId();

        Slog.i(TAG, "Set shouldShowSystemDecors for display: displayId=" + displayId

                + ", shouldShow=" + shouldShow);

        final DisplayInfo displayInfo = dc.getDisplayInfo();

        final SettingsProvider.SettingsEntry overrideSettings =

                mSettingsProvider.getOverrideSettings(displayInfo);
@@ -461,6 +469,13 @@ class DisplayWindowSettings { 
        mSettingsProvider.onDisplayRemoved(dc.getDisplayInfo());

    }



    void dump(@NonNull DisplayContent dc, @NonNull String prefix, @NonNull PrintWriter pw) {

        final DisplayInfo displayInfo = dc.getDisplayInfo();

        final SettingsProvider.SettingsEntry settings = mSettingsProvider.getSettings(displayInfo);

        pw.println(prefix + "DisplayWindowSettingsProvider");

        pw.println(prefix + "  " + settings);

    }



    /**

     * Provides the functionality to lookup the {@link SettingsEntry settings} for a given

     * {@link DisplayInfo}.