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

Commit 7238a059 authored by Tiger Huang's avatar Tiger Huang
Browse files

Window Manager Flag Migration (10/n) 

Refine the APIs of system bar appearance/behavior:
- Add getters
- Let the caller can only change certain appearance flags with out
  touching others
- Adjust appearance/behavior for the legacy apps if they don't uses the
  new APIs

Bug: 118118435
Test: atest InsetsSourceProviderTest InsetsStateControllerTest
            InsetsPolicyTest WindowStateTests CommandQueueTest
            RegisterStatusBarResultTest InsetsFlagsTest
            LightBarControllerTest RegisterStatusBarResultTest
            ViewRootImplTest DisplayPolicyLayoutTests
            DisplayPolicyInsetsTests DisplayPolicyTests
            TaskSnapshotSurfaceTest

Change-Id: I388decc9dc9b617348a6352b81fe77a19f27a0d7
parent 77a699ba

api/current.txt

+3 −1
Original line number Diff line number Diff line
@@ -53843,8 +53843,10 @@ package android.view { 














  public interface WindowInsetsController {















    method public default void controlInputMethodAnimation(long, @NonNull android.view.WindowInsetsAnimationControlListener);













    method public int getSystemBarsAppearance();













    method public int getSystemBarsBehavior();















    method public default void hideInputMethod();













    method public void setSystemBarsAppearance(int);













    method public void setSystemBarsAppearance(int, int);















    method public void setSystemBarsBehavior(int);















    method public default void showInputMethod();















    field public static final int APPEARANCE_LIGHT_NAVIGATION_BARS = 16; // 0x10

























api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -4451,7 +4451,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=0x800, equals=0x800, name="DISABLE_WALLPAPER_TOUCH_EVENTS"), @android.view.ViewDebug.FlagToString(mask=0x1000, equals=0x1000, name="FORCE_STATUS_BAR_VISIBLE"), @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"), @android.view.ViewDebug.FlagToString(mask=0x4000000, equals=0x4000000, name="FIT_INSETS_CONTROLLED"), @android.view.ViewDebug.FlagToString(mask=0x8000000, equals=0x8000000, name="ONLY_DRAW_BOTTOM_BAR_BACKGROUND")}) 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=0x800, equals=0x800, name="DISABLE_WALLPAPER_TOUCH_EVENTS"), @android.view.ViewDebug.FlagToString(mask=0x1000, equals=0x1000, name="FORCE_STATUS_BAR_VISIBLE"), @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"), @android.view.ViewDebug.FlagToString(mask=0x4000000, equals=0x4000000, name="APPEARANCE_CONTROLLED"), @android.view.ViewDebug.FlagToString(mask=0x8000000, equals=0x8000000, name="BEHAVIOR_CONTROLLED"), @android.view.ViewDebug.FlagToString(mask=0x10000000, equals=0x10000000, name="FIT_INSETS_CONTROLLED"), @android.view.ViewDebug.FlagToString(mask=0x20000000, equals=0x20000000, name="ONLY_DRAW_BOTTOM_BAR_BACKGROUND")}) public int privateFlags;















  }































}

































core/java/android/view/InsetsController.java



+26
−4




























Original line number
Diff line number
Diff line








@@ -19,6 +19,8 @@ package android.view;













import static android.view.InsetsState.ITYPE_IME;















import static android.view.InsetsState.toPublicType;















import static android.view.WindowInsets.Type.all;













import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_APPEARANCE_CONTROLLED;













import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_BEHAVIOR_CONTROLLED;































import android.animation.Animator;















import android.animation.AnimatorListenerAdapter;









@@ -28,7 +30,6 @@ import android.annotation.IntDef;













import android.annotation.NonNull;















import android.graphics.Insets;















import android.graphics.Rect;













import android.net.InvalidPacketException.ErrorCode;















import android.os.RemoteException;















import android.util.ArraySet;















import android.util.Log;










@@ -781,20 +782,41 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation













    }































    @Override













    public void setSystemBarsAppearance(@Appearance int appearance) {













        if (mViewRoot.mWindowAttributes.insetsFlags.appearance != appearance) {













            mViewRoot.mWindowAttributes.insetsFlags.appearance = appearance;













    public void setSystemBarsAppearance(@Appearance int appearance, @Appearance int mask) {













        mViewRoot.mWindowAttributes.privateFlags |= PRIVATE_FLAG_APPEARANCE_CONTROLLED;













        final InsetsFlags insetsFlags = mViewRoot.mWindowAttributes.insetsFlags;













        if (insetsFlags.appearance != appearance) {













            insetsFlags.appearance = (insetsFlags.appearance & ~mask) | (appearance & mask);















            mViewRoot.mWindowAttributesChanged = true;















            mViewRoot.scheduleTraversals();















        }















    }





























    @Override













    public @Appearance int getSystemBarsAppearance() {













        if ((mViewRoot.mWindowAttributes.privateFlags & PRIVATE_FLAG_APPEARANCE_CONTROLLED) == 0) {













            // We only return the requested appearance, not the implied one.













            return 0;













        }













        return mViewRoot.mWindowAttributes.insetsFlags.appearance;













    }





























    @Override















    public void setSystemBarsBehavior(@Behavior int behavior) {













        mViewRoot.mWindowAttributes.privateFlags |= PRIVATE_FLAG_BEHAVIOR_CONTROLLED;















        if (mViewRoot.mWindowAttributes.insetsFlags.behavior != behavior) {















            mViewRoot.mWindowAttributes.insetsFlags.behavior = behavior;















            mViewRoot.mWindowAttributesChanged = true;















            mViewRoot.scheduleTraversals();















        }















    }



























    @Override













    public @Appearance int getSystemBarsBehavior() {













        if ((mViewRoot.mWindowAttributes.privateFlags & PRIVATE_FLAG_BEHAVIOR_CONTROLLED) == 0) {













            // We only return the requested behavior, not the implied one.













            return 0;













        }













        return mViewRoot.mWindowAttributes.insetsFlags.behavior;













    }















}
























core/java/android/view/ViewRootImpl.java



+31
−4




























Original line number
Diff line number
Diff line








@@ -25,15 +25,24 @@ import static android.view.View.SYSTEM_UI_FLAG_IMMERSIVE;













import static android.view.View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;















import static android.view.View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;















import static android.view.View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION;













import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;













import static android.view.View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;













import static android.view.View.SYSTEM_UI_FLAG_LOW_PROFILE;















import static android.view.WindowCallbacks.RESIZE_MODE_DOCKED_DIVIDER;















import static android.view.WindowCallbacks.RESIZE_MODE_FREEFORM;













import static android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS;













import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS;













import static android.view.WindowInsetsController.APPEARANCE_LOW_PROFILE_BARS;















import static android.view.WindowInsetsController.BEHAVIOR_SHOW_BARS_BY_SWIPE;













import static android.view.WindowInsetsController.BEHAVIOR_SHOW_BARS_BY_TOUCH;















import static android.view.WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE;















import static android.view.WindowManager.LayoutParams.FLAG_FULLSCREEN;















import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;















import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION;















import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;















import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;













import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_APPEARANCE_CONTROLLED;













import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_BEHAVIOR_CONTROLLED;















import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_FIT_INSETS_CONTROLLED;















import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_FORCE_DECOR_VIEW_VISIBILITY;















import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;










@@ -1897,10 +1906,28 @@ public final class ViewRootImpl implements ViewParent,













        final int type = inOutParams.type;















        final int adjust = inOutParams.softInputMode & SOFT_INPUT_MASK_ADJUST;





























        if ((sysUiVis & SYSTEM_UI_FLAG_IMMERSIVE_STICKY) != 0) {













        if ((inOutParams.privateFlags & PRIVATE_FLAG_APPEARANCE_CONTROLLED) == 0) {













            inOutParams.insetsFlags.appearance = 0;













            if ((sysUiVis & SYSTEM_UI_FLAG_LOW_PROFILE) != 0) {













                inOutParams.insetsFlags.appearance |= APPEARANCE_LOW_PROFILE_BARS;













            }













            if ((sysUiVis & SYSTEM_UI_FLAG_LIGHT_STATUS_BAR) != 0) {













                inOutParams.insetsFlags.appearance |= APPEARANCE_LIGHT_STATUS_BARS;













            }













            if ((sysUiVis & SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR) != 0) {













                inOutParams.insetsFlags.appearance |= APPEARANCE_LIGHT_NAVIGATION_BARS;













            }













        }



























        if ((inOutParams.privateFlags & PRIVATE_FLAG_BEHAVIOR_CONTROLLED) == 0) {













            if ((sysUiVis & SYSTEM_UI_FLAG_IMMERSIVE_STICKY) != 0













                    || (flags & FLAG_FULLSCREEN) != 0) {















                inOutParams.insetsFlags.behavior = BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE;















            } else if ((sysUiVis & SYSTEM_UI_FLAG_IMMERSIVE) != 0) {















                inOutParams.insetsFlags.behavior = BEHAVIOR_SHOW_BARS_BY_SWIPE;













            } else {













                inOutParams.insetsFlags.behavior = BEHAVIOR_SHOW_BARS_BY_TOUCH;













            }















        }































        if ((inOutParams.privateFlags & PRIVATE_FLAG_FIT_INSETS_CONTROLLED) != 0) {

































core/java/android/view/WindowInsetsController.java



+30
−4




























Original line number
Diff line number
Diff line








@@ -29,7 +29,7 @@ import java.lang.annotation.RetentionPolicy;













/**















 * Interface to control windows that generate insets.















 *













 * TODO Needs more information and examples once the API is more baked.













 * TODO(118118435): Needs more information and examples once the API is more baked.















 */















public interface WindowInsetsController {


























@@ -205,20 +205,46 @@ public interface WindowInsetsController {





























    /**















     * Controls the appearance of system bars.













     * <p>













     * For example, the following statement adds {@link #APPEARANCE_LIGHT_STATUS_BARS}:













     * <pre>













     * setSystemBarsAppearance(APPEARANCE_LIGHT_STATUS_BARS, APPEARANCE_LIGHT_STATUS_BARS)













     * </pre>













     * And the following statement clears it:













     * <pre>













     * setSystemBarsAppearance(0, APPEARANCE_LIGHT_STATUS_BARS)













     * </pre>















     *















     * @param appearance Bitmask of {@link Appearance} flags.













     * @see Appearance













     * @param mask Specifies which flags of appearance should be changed.













     * @see #getSystemBarsAppearance













     */













    void setSystemBarsAppearance(@Appearance int appearance, @Appearance int mask);



























    /**













     * Retrieves the requested appearance of system bars.













     *













     * @return The requested bitmask of system bar appearance controlled by this window.













     * @see #setSystemBarsAppearance(int, int)















     */













    void setSystemBarsAppearance(@Appearance int appearance);













    @Appearance int getSystemBarsAppearance();































    /**















     * Controls the behavior of system bars.















     *















     * @param behavior Determines how the bars behave when being hidden by the application.













     * @see Behavior













     * @see #getSystemBarsBehavior















     */















    void setSystemBarsBehavior(@Behavior int behavior);





























    /**













     * Retrieves the requested behavior of system bars.













     *













     * @return the system bar behavior controlled by this window.













     * @see #setSystemBarsBehavior(int)













     */













    @Behavior int getSystemBarsBehavior();





























    /**















     * @hide















     */