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

Commit 44a8e4da authored by Tiger Huang's avatar Tiger Huang
Browse files

Don't handle the system UI visibility at server side 

The system UI visibility has been deprecated. Except disable flags, it
should be converted to the new APIs before being sent to WMS. This CL
renames mSystemUiVisibilitiy to mDisableFLags in WindowState.

Bug: 149813814
Test: atest TaskSnapshotControllerTest TaskSnapshotPersisterLoaderTest
Change-Id: I6730ba664359656ee814c7bc959844d6ed4aaeb9
parent b73471b4

core/java/android/app/ActivityManager.java

+14 −13
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ import android.util.DisplayMetrics; 
import android.util.Singleton;

import android.util.Size;

import android.view.Surface;

import android.view.WindowInsetsController.Appearance;



import com.android.internal.app.LocalePicker;

import com.android.internal.app.procstats.ProcessStats;
@@ -2116,7 +2117,7 @@ public class ActivityManager { 
        // the task having a secure window or having previews disabled

        private final boolean mIsRealSnapshot;

        private final int mWindowingMode;

        private final int mSystemUiVisibility;

        private final @Appearance int mAppearance;

        private final boolean mIsTranslucent;

        // Must be one of the named color spaces, otherwise, always use SRGB color space.

        private final ColorSpace mColorSpace;
@@ -2125,7 +2126,7 @@ public class ActivityManager { 
                @NonNull ComponentName topActivityComponent, HardwareBuffer snapshot,

                @NonNull ColorSpace colorSpace, int orientation, int rotation, Point taskSize,

                Rect contentInsets, boolean isLowResolution, boolean isRealSnapshot,

                int windowingMode, int systemUiVisibility, boolean isTranslucent) {

                int windowingMode, @Appearance int appearance, boolean isTranslucent) {

            mId = id;

            mTopActivityComponent = topActivityComponent;

            mSnapshot = snapshot;
@@ -2138,7 +2139,7 @@ public class ActivityManager { 
            mIsLowResolution = isLowResolution;

            mIsRealSnapshot = isRealSnapshot;

            mWindowingMode = windowingMode;

            mSystemUiVisibility = systemUiVisibility;

            mAppearance = appearance;

            mIsTranslucent = isTranslucent;

        }
@@ -2157,7 +2158,7 @@ public class ActivityManager { 
            mIsLowResolution = source.readBoolean();

            mIsRealSnapshot = source.readBoolean();

            mWindowingMode = source.readInt();

            mSystemUiVisibility = source.readInt();

            mAppearance = source.readInt();

            mIsTranslucent = source.readBoolean();

        }
@@ -2265,11 +2266,11 @@ public class ActivityManager { 
        }



        /**

         * @return The system ui visibility flags for the top most visible fullscreen window at the

         * @return The {@link Appearance} flags for the top most visible fullscreen window at the

         *         time that the snapshot was taken.

         */

        public int getSystemUiVisibility() {

            return mSystemUiVisibility;

        public @Appearance int getAppearance() {

            return mAppearance;

        }



        @Override
@@ -2291,7 +2292,7 @@ public class ActivityManager { 
            dest.writeBoolean(mIsLowResolution);

            dest.writeBoolean(mIsRealSnapshot);

            dest.writeInt(mWindowingMode);

            dest.writeInt(mSystemUiVisibility);

            dest.writeInt(mAppearance);

            dest.writeBoolean(mIsTranslucent);

        }
@@ -2311,7 +2312,7 @@ public class ActivityManager { 
                    + " mIsLowResolution=" + mIsLowResolution

                    + " mIsRealSnapshot=" + mIsRealSnapshot

                    + " mWindowingMode=" + mWindowingMode

                    + " mSystemUiVisibility=" + mSystemUiVisibility

                    + " mAppearance=" + mAppearance

                    + " mIsTranslucent=" + mIsTranslucent;

        }
@@ -2336,7 +2337,7 @@ public class ActivityManager { 
            private Rect mContentInsets;

            private boolean mIsRealSnapshot;

            private int mWindowingMode;

            private int mSystemUiVisibility;

            private @Appearance int mAppearance;

            private boolean mIsTranslucent;

            private int mPixelFormat;
@@ -2393,8 +2394,8 @@ public class ActivityManager { 
                return this;

            }



            public Builder setSystemUiVisibility(int systemUiVisibility) {

                mSystemUiVisibility = systemUiVisibility;

            public Builder setAppearance(@Appearance int appearance) {

                mAppearance = appearance;

                return this;

            }
@@ -2428,7 +2429,7 @@ public class ActivityManager { 
                        false /* isLowResolution */,

                        mIsRealSnapshot,

                        mWindowingMode,

                        mSystemUiVisibility,

                        mAppearance,

                        mIsTranslucent);



            }

core/proto/android/server/windowmanagerservice.proto

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ message WindowStateProto { 
    optional int32 requested_width = 18;

    optional int32 requested_height = 19;

    optional int32 view_visibility = 20 [(.android.typedef) = "android.view.View.Visibility"];

    optional int32 system_ui_visibility = 21;

    optional int32 system_ui_visibility = 21 [deprecated=true];

    optional bool has_surface = 22;

    optional bool is_ready_for_display = 23;

    optional .android.graphics.RectProto display_frame = 24 [deprecated=true];

packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/ThumbnailData.java

+3 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.graphics.Point; 
import android.graphics.Rect;

import android.hardware.HardwareBuffer;

import android.util.Log;

import android.view.WindowInsetsController.Appearance;



/**

 * Data for a single thumbnail.
@@ -43,7 +44,7 @@ public class ThumbnailData { 
    public boolean isRealSnapshot;

    public boolean isTranslucent;

    public int windowingMode;

    public int systemUiVisibility;

    public @Appearance int appearance;

    public float scale;

    public long snapshotId;
@@ -57,7 +58,6 @@ public class ThumbnailData { 
        isRealSnapshot = true;

        isTranslucent = false;

        windowingMode = WINDOWING_MODE_UNDEFINED;

        systemUiVisibility = 0;

        snapshotId = 0;

    }
@@ -93,7 +93,7 @@ public class ThumbnailData { 
        isRealSnapshot = snapshot.isRealSnapshot();

        isTranslucent = snapshot.isTranslucent();

        windowingMode = snapshot.getWindowingMode();

        systemUiVisibility = snapshot.getSystemUiVisibility();

        appearance = snapshot.getAppearance();

        snapshotId = snapshot.getId();

    }

}

proto/src/task_snapshot.proto

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
     int32 inset_bottom = 5;

     bool is_real_snapshot = 6;

     int32 windowing_mode = 7;

     int32 system_ui_visibility = 8;

     int32 system_ui_visibility = 8 [deprecated=true];

     bool is_translucent = 9;

     string top_activity_component = 10;

     // deprecated because original width and height are stored now instead of the scale.
@@ -40,4 +40,5 @@ 
     int32 task_width = 14;

     // The task height when the snapshot was taken

     int32 task_height = 15;

     int32 appearance = 16;

 }

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

+1 −2
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ import android.app.ActivityManager; 
import android.app.ActivityThread;

import android.app.LoadedApk;

import android.app.ResourcesManager;

import android.app.StatusBarManager;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;
@@ -2746,7 +2745,7 @@ public class DisplayPolicy { 
        final int dockedAppearance = updateLightStatusBarLw(0 /* appearance */,

                mTopDockedOpaqueWindowState, mTopDockedOpaqueOrDimmingWindowState,

                mDockedStackBounds);

        final int disableFlags = win.getSystemUiVisibility() & StatusBarManager.DISABLE_MASK;

        final int disableFlags = win.getDisableFlags();

        final int opaqueAppearance = updateSystemBarsLw(win, disableFlags);

        final WindowState navColorWin = chooseNavigationColorWindowLw(

                mTopFullscreenOpaqueWindowState, mTopFullscreenOpaqueOrDimmingWindowState,