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

Commit 95378b2c authored by Peiyong Lin's avatar Peiyong Lin Committed by Android (Google) Code Review
Browse files

Merge "[WindowManager] Add PRIVATE_FLAG_COLOR_SPACE_AGNOSTIC."

parents 1f102622 75045389

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -2846,7 +2846,7 @@ package android.view { 
    field public static final int ACCESSIBILITY_TITLE_CHANGED = 33554432; // 0x2000000

    field public static final int PRIVATE_FLAG_NO_MOVE_ANIMATION = 64; // 0x40

    field public CharSequence accessibilityTitle;

    field @android.view.ViewDebug.ExportedProperty(flagMapping={@android.view.ViewDebug.FlagToString(mask=0x1, equals=0x1, name="FAKE_HARDWARE_ACCELERATED"), @android.view.ViewDebug.FlagToString(mask=0x2, equals=0x2, name="FORCE_HARDWARE_ACCELERATED"), @android.view.ViewDebug.FlagToString(mask=0x4, equals=0x4, name="WANTS_OFFSET_NOTIFICATIONS"), @android.view.ViewDebug.FlagToString(mask=0x10, equals=0x10, name="SHOW_FOR_ALL_USERS"), @android.view.ViewDebug.FlagToString(mask=android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION, equals=android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION, name="NO_MOVE_ANIMATION"), @android.view.ViewDebug.FlagToString(mask=0x80, equals=0x80, name="COMPATIBLE_WINDOW"), @android.view.ViewDebug.FlagToString(mask=0x100, equals=0x100, name="SYSTEM_ERROR"), @android.view.ViewDebug.FlagToString(mask=0x200, equals=0x200, name="INHERIT_TRANSLUCENT_DECOR"), @android.view.ViewDebug.FlagToString(mask=0x400, equals=0x400, name="KEYGUARD"), @android.view.ViewDebug.FlagToString(mask=0x800, equals=0x800, name="DISABLE_WALLPAPER_TOUCH_EVENTS"), @android.view.ViewDebug.FlagToString(mask=0x1000, equals=0x1000, name="FORCE_STATUS_BAR_VISIBLE_TRANSPARENT"), @android.view.ViewDebug.FlagToString(mask=0x2000, equals=0x2000, name="PRESERVE_GEOMETRY"), @android.view.ViewDebug.FlagToString(mask=0x4000, equals=0x4000, name="FORCE_DECOR_VIEW_VISIBILITY"), @android.view.ViewDebug.FlagToString(mask=0x8000, equals=0x8000, name="WILL_NOT_REPLACE_ON_RELAUNCH"), @android.view.ViewDebug.FlagToString(mask=0x10000, equals=0x10000, name="LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME"), @android.view.ViewDebug.FlagToString(mask=0x20000, equals=0x20000, name="FORCE_DRAW_STATUS_BAR_BACKGROUND"), @android.view.ViewDebug.FlagToString(mask=0x40000, equals=0x40000, name="SUSTAINED_PERFORMANCE_MODE"), @android.view.ViewDebug.FlagToString(mask=0x80000, equals=0x80000, name="HIDE_NON_SYSTEM_OVERLAY_WINDOWS"), @android.view.ViewDebug.FlagToString(mask=0x100000, equals=0x100000, name="IS_ROUNDED_CORNERS_OVERLAY"), @android.view.ViewDebug.FlagToString(mask=0x400000, equals=0x400000, name="IS_SCREEN_DECOR"), @android.view.ViewDebug.FlagToString(mask=0x800000, equals=0x800000, name="STATUS_FORCE_SHOW_NAVIGATION")}) public int privateFlags;

    field @android.view.ViewDebug.ExportedProperty(flagMapping={@android.view.ViewDebug.FlagToString(mask=0x1, equals=0x1, name="FAKE_HARDWARE_ACCELERATED"), @android.view.ViewDebug.FlagToString(mask=0x2, equals=0x2, name="FORCE_HARDWARE_ACCELERATED"), @android.view.ViewDebug.FlagToString(mask=0x4, equals=0x4, name="WANTS_OFFSET_NOTIFICATIONS"), @android.view.ViewDebug.FlagToString(mask=0x10, equals=0x10, name="SHOW_FOR_ALL_USERS"), @android.view.ViewDebug.FlagToString(mask=android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION, equals=android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION, name="NO_MOVE_ANIMATION"), @android.view.ViewDebug.FlagToString(mask=0x80, equals=0x80, name="COMPATIBLE_WINDOW"), @android.view.ViewDebug.FlagToString(mask=0x100, equals=0x100, name="SYSTEM_ERROR"), @android.view.ViewDebug.FlagToString(mask=0x200, equals=0x200, name="INHERIT_TRANSLUCENT_DECOR"), @android.view.ViewDebug.FlagToString(mask=0x400, equals=0x400, name="KEYGUARD"), @android.view.ViewDebug.FlagToString(mask=0x800, equals=0x800, name="DISABLE_WALLPAPER_TOUCH_EVENTS"), @android.view.ViewDebug.FlagToString(mask=0x1000, equals=0x1000, name="FORCE_STATUS_BAR_VISIBLE_TRANSPARENT"), @android.view.ViewDebug.FlagToString(mask=0x2000, equals=0x2000, name="PRESERVE_GEOMETRY"), @android.view.ViewDebug.FlagToString(mask=0x4000, equals=0x4000, name="FORCE_DECOR_VIEW_VISIBILITY"), @android.view.ViewDebug.FlagToString(mask=0x8000, equals=0x8000, name="WILL_NOT_REPLACE_ON_RELAUNCH"), @android.view.ViewDebug.FlagToString(mask=0x10000, equals=0x10000, name="LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME"), @android.view.ViewDebug.FlagToString(mask=0x20000, equals=0x20000, name="FORCE_DRAW_STATUS_BAR_BACKGROUND"), @android.view.ViewDebug.FlagToString(mask=0x40000, equals=0x40000, name="SUSTAINED_PERFORMANCE_MODE"), @android.view.ViewDebug.FlagToString(mask=0x80000, equals=0x80000, name="HIDE_NON_SYSTEM_OVERLAY_WINDOWS"), @android.view.ViewDebug.FlagToString(mask=0x100000, equals=0x100000, name="IS_ROUNDED_CORNERS_OVERLAY"), @android.view.ViewDebug.FlagToString(mask=0x400000, equals=0x400000, name="IS_SCREEN_DECOR"), @android.view.ViewDebug.FlagToString(mask=0x800000, equals=0x800000, name="STATUS_FORCE_SHOW_NAVIGATION"), @android.view.ViewDebug.FlagToString(mask=0x1000000, equals=0x1000000, name="COLOR_SPACE_AGNOSTIC")}) public int privateFlags;

  }



}

core/java/android/view/WindowManager.java

+12 −1
Original line number Diff line number Diff line
@@ -1792,6 +1792,13 @@ public interface WindowManager extends ViewManager { 
         */

        public static final int PRIVATE_FLAG_STATUS_FORCE_SHOW_NAVIGATION = 0x00800000;



        /**

         * Flag to indicate that the window is color space agnostic, and the color can be

         * interpreted to any color space.

         * @hide

         */

        public static final int PRIVATE_FLAG_COLOR_SPACE_AGNOSTIC = 0x01000000;



        /**

         * An internal annotation for flags that can be specified to {@link #softInputMode}.

         *
@@ -1892,7 +1899,11 @@ public interface WindowManager extends ViewManager { 
                @ViewDebug.FlagToString(

                        mask = PRIVATE_FLAG_STATUS_FORCE_SHOW_NAVIGATION,

                        equals = PRIVATE_FLAG_STATUS_FORCE_SHOW_NAVIGATION,

                        name = "STATUS_FORCE_SHOW_NAVIGATION")

                        name = "STATUS_FORCE_SHOW_NAVIGATION"),

                @ViewDebug.FlagToString(

                        mask = PRIVATE_FLAG_COLOR_SPACE_AGNOSTIC,

                        equals = PRIVATE_FLAG_COLOR_SPACE_AGNOSTIC,

                        name = "COLOR_SPACE_AGNOSTIC")

        })

        @TestApi

        public int privateFlags;

packages/SystemUI/src/com/android/systemui/ScreenDecorations.java

+1 −0
Original line number Diff line number Diff line
@@ -471,6 +471,7 @@ public class ScreenDecorations extends SystemUI implements Tunable { 
            lp.width = WRAP_CONTENT;

            lp.height = MATCH_PARENT;

        }

        lp.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_COLOR_SPACE_AGNOSTIC;

        return lp;

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java

+1 −0
Original line number Diff line number Diff line
@@ -990,6 +990,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
        lp.setTitle("NavigationBar" + context.getDisplayId());

        lp.accessibilityTitle = context.getString(R.string.nav_bar);

        lp.windowAnimations = 0;

        lp.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_COLOR_SPACE_AGNOSTIC;



        View navigationBarView = LayoutInflater.from(context).inflate(

                R.layout.navigation_bar_window, null);

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowController.java

+10 −0
Original line number Diff line number Diff line
@@ -280,6 +280,15 @@ public class StatusBarWindowController implements Callback, Dumpable, Configurat 
        }

    }



    private void applyStatusBarColorSpaceAgnosticFlag(State state) {

        if (!isExpanded(state)) {

            mLpChanged.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_COLOR_SPACE_AGNOSTIC;

        } else {

            mLpChanged.privateFlags &=

                    ~WindowManager.LayoutParams.PRIVATE_FLAG_COLOR_SPACE_AGNOSTIC;

        }

    }



    private void apply(State state) {

        applyKeyguardFlags(state);

        applyForceStatusBarVisibleFlag(state);
@@ -294,6 +303,7 @@ public class StatusBarWindowController implements Callback, Dumpable, Configurat 
        applyBrightness(state);

        applyHasTopUi(state);

        applyNotTouchable(state);

        applyStatusBarColorSpaceAgnosticFlag(state);

        if (mLp != null && mLp.copyFrom(mLpChanged) != 0) {

            mWindowManager.updateViewLayout(mStatusBarView, mLp);

        }