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

Commit 9051eda8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "WindowAttributes: Remove flags2"

parents a122b0b3 1002b03e

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -47990,7 +47990,6 @@ package android.view { 
    field public float buttonBrightness;

    field public float dimAmount;

    field public int flags;

    field public long flags2;

    field public int format;

    field public int gravity;

    field public float horizontalMargin;

core/java/android/view/WindowManager.java

+0 −26
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static android.view.WindowLayoutParamsProto.ALPHA; 
import static android.view.WindowLayoutParamsProto.BUTTON_BRIGHTNESS;

import static android.view.WindowLayoutParamsProto.COLOR_MODE;

import static android.view.WindowLayoutParamsProto.FLAGS;

import static android.view.WindowLayoutParamsProto.FLAGS_EXTRA;

import static android.view.WindowLayoutParamsProto.FORMAT;

import static android.view.WindowLayoutParamsProto.GRAVITY;

import static android.view.WindowLayoutParamsProto.HAS_SYSTEM_UI_LISTENERS;
@@ -46,7 +45,6 @@ import static android.view.WindowLayoutParamsProto.Y; 


import android.Manifest.permission;

import android.annotation.IntDef;

import android.annotation.LongDef;

import android.annotation.NonNull;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;
@@ -1300,18 +1298,6 @@ public interface WindowManager extends ViewManager { 
        }, formatToHexString = true)

        public int flags;



        /** @hide */

        @Retention(RetentionPolicy.SOURCE)

        @LongDef(

            flag = true,

            value = {})

        @interface Flags2 {}



        /**

         * Various behavioral options/flags.  Default is none.

         */

        @Flags2 public long flags2;



        /**

         * If the window has requested hardware acceleration, but this is not

         * allowed in the process it is in, then still render it as if it is
@@ -2334,7 +2320,6 @@ public interface WindowManager extends ViewManager { 
            out.writeInt(y);

            out.writeInt(type);

            out.writeInt(flags);

            out.writeLong(flags2);

            out.writeInt(privateFlags);

            out.writeInt(softInputMode);

            out.writeInt(layoutInDisplayCutoutMode);
@@ -2391,7 +2376,6 @@ public interface WindowManager extends ViewManager { 
            y = in.readInt();

            type = in.readInt();

            flags = in.readInt();

            flags2 = in.readLong();

            privateFlags = in.readInt();

            softInputMode = in.readInt();

            layoutInDisplayCutoutMode = in.readInt();
@@ -2525,10 +2509,6 @@ public interface WindowManager extends ViewManager { 
                flags = o.flags;

                changes |= FLAGS_CHANGED;

            }

            if (flags2 != o.flags2) {

                flags2 = o.flags2;

                changes |= FLAGS_CHANGED;

            }

            if (privateFlags != o.privateFlags) {

                privateFlags = o.privateFlags;

                changes |= PRIVATE_FLAGS_CHANGED;
@@ -2790,11 +2770,6 @@ public interface WindowManager extends ViewManager { 
            sb.append(System.lineSeparator());

            sb.append(prefix).append("  fl=").append(

                    ViewDebug.flagsToString(LayoutParams.class, "flags", flags));

            if (flags2 != 0) {

                sb.append(System.lineSeparator());

                // TODO(roosa): add a long overload for ViewDebug.flagsToString.

                sb.append(prefix).append("  fl2=0x").append(Long.toHexString(flags2));

            }

            if (privateFlags != 0) {

                sb.append(System.lineSeparator());

                sb.append(prefix).append("  pfl=").append(ViewDebug.flagsToString(
@@ -2842,7 +2817,6 @@ public interface WindowManager extends ViewManager { 
            proto.write(NEEDS_MENU_KEY, needsMenuKey);

            proto.write(COLOR_MODE, mColorMode);

            proto.write(FLAGS, flags);

            proto.write(FLAGS_EXTRA, flags2);

            proto.write(PRIVATE_FLAGS, privateFlags);

            proto.write(SYSTEM_UI_VISIBILITY_FLAGS, systemUiVisibility);

            proto.write(SUBTREE_SYSTEM_UI_VISIBILITY_FLAGS, subtreeSystemUiVisibility);

core/proto/android/view/windowlayoutparams.proto

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ message WindowLayoutParamsProto { 
  optional NeedsMenuState needs_menu_key = 22;

  optional .android.view.DisplayProto.ColorMode color_mode = 23;

  optional uint32 flags = 24;

  optional uint64 flags_extra = 25;

  optional uint32 private_flags = 26;

  optional uint32 system_ui_visibility_flags = 27;

  optional uint32 subtree_system_ui_visibility_flags = 28;