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

Commit 3a70dd66 authored by Tiger Huang's avatar Tiger Huang Committed by Android (Google) Code Review
Browse files

Merge "Window Manager Flag Migration (7/n)"

parents 4cbee9e7 4a7835ff

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4434,7 +4434,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=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;

    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=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"), @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;

  }



  public class WindowlessViewRoot {

core/java/android/app/ActivityThread.java

+3 −1
Original line number Diff line number Diff line
@@ -4407,7 +4407,9 @@ public final class ActivityThread extends ClientTransactionHandler { 
                r.newConfig = null;

            }

            if (localLOGV) Slog.v(TAG, "Resuming " + r + " with isForward=" + isForward);

            WindowManager.LayoutParams l = r.window.getAttributes();

            ViewRootImpl impl = r.window.getDecorView().getViewRootImpl();

            WindowManager.LayoutParams l = impl != null

                    ? impl.mWindowAttributes : r.window.getAttributes();

            if ((l.softInputMode

                    & WindowManager.LayoutParams.SOFT_INPUT_IS_FORWARD_NAVIGATION)

                    != forwardBit) {

core/java/android/inputmethodservice/InputMethodService.java

+12 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; 
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;

import static android.view.ViewRootImpl.NEW_INSETS_MODE_NONE;

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

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



import static java.lang.annotation.RetentionPolicy.SOURCE;
@@ -66,6 +67,7 @@ import android.view.ViewGroup; 
import android.view.ViewRootImpl;

import android.view.ViewTreeObserver;

import android.view.Window;

import android.view.WindowInsets;

import android.view.WindowManager;

import android.view.animation.AnimationUtils;

import android.view.inputmethod.CompletionInfo;
@@ -1019,6 +1021,16 @@ public class InputMethodService extends AbstractInputMethodService { 
                Context.LAYOUT_INFLATER_SERVICE);

        mWindow = new SoftInputWindow(this, "InputMethod", mTheme, null, null, mDispatcherState,

                WindowManager.LayoutParams.TYPE_INPUT_METHOD, Gravity.BOTTOM, false);

        mWindow.getWindow().setFitWindowInsetsTypes(WindowInsets.Type.systemBars());

        mWindow.getWindow().addPrivateFlags(PRIVATE_FLAG_ONLY_DRAW_BOTTOM_BAR_BACKGROUND);

        mWindow.getWindow().getDecorView().setOnApplyWindowInsetsListener(

                (v, insets) -> v.onApplyWindowInsets(

                        new WindowInsets.Builder(insets).setSystemWindowInsets(

                                android.graphics.Insets.of(

                                        insets.getSystemWindowInsetLeft(),

                                        insets.getSystemWindowInsetTop(),

                                        insets.getSystemWindowInsetRight(),

                                        insets.getStableInsetBottom())).build()));

        // For ColorView in DecorView to work, FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS needs to be set

        // by default (but IME developers can opt this out later if they want a new behavior).

        mWindow.getWindow().setFlags(

core/java/android/service/voice/VoiceInteractionSession.java

+1 −0
Original line number Diff line number Diff line
@@ -1137,6 +1137,7 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall 
        mWindow = new SoftInputWindow(mContext, "VoiceInteractionSession", mTheme,

                mCallbacks, this, mDispatcherState,

                WindowManager.LayoutParams.TYPE_VOICE_INTERACTION, Gravity.BOTTOM, true);

        mWindow.getWindow().setFitWindowInsetsTypes(0 /* types */);

        mWindow.getWindow().addFlags(

                WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED |

                        WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN |

core/java/android/service/wallpaper/WallpaperService.java

+1 −0
Original line number Diff line number Diff line
@@ -811,6 +811,7 @@ public abstract class WallpaperService extends Service { 
                        // Add window

                        mLayout.type = mIWallpaperEngine.mWindowType;

                        mLayout.gravity = Gravity.START|Gravity.TOP;

                        mLayout.setFitWindowInsetsTypes(0 /* types */);

                        mLayout.setTitle(WallpaperService.this.getClass().getName());

                        mLayout.windowAnimations =

                                com.android.internal.R.style.Animation_Wallpaper;