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

Commit af30559d authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge changes from topic "content_apply" 

* changes:
  Force non-floating main app windows to not fit anything
  Introduce Window.setContentOnApplyWindowInsetsListener
parents 1dfa0895 0da8fd16

api/current.txt

+6 −0
Original line number Diff line number Diff line
@@ -54314,6 +54314,7 @@ package android.view { 
    method public final void removeOnFrameMetricsAvailableListener(android.view.Window.OnFrameMetricsAvailableListener);

    method public boolean requestFeature(int);

    method @NonNull public final <T extends android.view.View> T requireViewById(@IdRes int);

    method public void resetOnContentApplyWindowInsetsListener();

    method public abstract void restoreHierarchyState(android.os.Bundle);

    method public abstract android.os.Bundle saveHierarchyState();

    method public void setAllowEnterTransitionOverlap(boolean);
@@ -54352,6 +54353,7 @@ package android.view { 
    method public abstract void setNavigationBarColor(@ColorInt int);

    method public void setNavigationBarContrastEnforced(boolean);

    method public void setNavigationBarDividerColor(@ColorInt int);

    method public void setOnContentApplyWindowInsetsListener(@Nullable android.view.Window.OnContentApplyWindowInsetsListener);

    method public void setPreferMinimalPostProcessing(boolean);

    method public void setReenterTransition(android.transition.Transition);

    method public abstract void setResizingCaptionDrawable(android.graphics.drawable.Drawable);
@@ -54446,6 +54448,10 @@ package android.view { 
    method @Nullable public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback, int);

  }













  public static interface Window.OnContentApplyWindowInsetsListener {













    method @NonNull public android.util.Pair<android.graphics.Insets,android.view.WindowInsets> onContentApplyWindowInsets(@NonNull android.view.WindowInsets);













  }



























  public static interface Window.OnFrameMetricsAvailableListener {















    method public void onFrameMetricsAvailable(android.view.Window, android.view.FrameMetrics, int);















  }

























api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








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













    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")}) public int privateFlags;















  }































}

































core/java/android/inputmethodservice/InputMethodService.java



+8
−9




























Original line number
Diff line number
Diff line








@@ -20,8 +20,8 @@ import static android.view.Display.DEFAULT_DISPLAY;













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.WindowInsets.Type.navigationBars;















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 com.android.internal.util.function.pooled.PooledLambda.obtainMessage;


























@@ -1240,16 +1240,15 @@ 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().getAttributes().setFitWindowInsetsTypes(WindowInsets.Type.statusBars());



























        // IME layout should always be inset by navigation bar, no matter it's current visibility.















        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()));













                        new WindowInsets.Builder(insets).setInsets(













                                navigationBars(), insets.getMaxInsets(navigationBars()))













                                .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
−1




























Original line number
Diff line number
Diff line








@@ -1137,7 +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().getAttributes().setFitWindowInsetsTypes(0 /* types */);















        mWindow.getWindow().addFlags(















                WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED |















                        WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN |

































core/java/android/view/View.java



+68
−20




























Original line number
Diff line number
Diff line








@@ -23,6 +23,10 @@ import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__SI













import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__UNKNOWN_CLASSIFICATION;















import static android.view.ViewRootImpl.NEW_INSETS_MODE_FULL;















import static android.view.WindowInsetsAnimationCallback.DISPATCH_MODE_CONTINUE_ON_SUBTREE;













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













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













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













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















import static android.view.accessibility.AccessibilityEvent.CONTENT_CHANGE_TYPE_UNDEFINED;





























import static java.lang.Math.max;










@@ -97,6 +101,7 @@ import android.util.FloatProperty;













import android.util.LayoutDirection;















import android.util.Log;















import android.util.LongSparseLongArray;













import android.util.Pair;















import android.util.Pools.SynchronizedPool;















import android.util.Property;















import android.util.SparseArray;









@@ -110,6 +115,7 @@ import android.view.AccessibilityIterators.ParagraphTextSegmentIterator;













import android.view.AccessibilityIterators.TextSegmentIterator;















import android.view.AccessibilityIterators.WordTextSegmentIterator;















import android.view.ContextMenu.ContextMenuInfo;













import android.view.Window.OnContentApplyWindowInsetsListener;















import android.view.WindowInsetsAnimationCallback.AnimationBounds;















import android.view.WindowInsetsAnimationCallback.InsetsAnimation;















import android.view.WindowInsetsAnimationCallback.DispatchMode;










@@ -140,6 +146,7 @@ import android.widget.FrameLayout;













import android.widget.ScrollBarDrawable;





























import com.android.internal.R;













import com.android.internal.policy.DecorView;















import com.android.internal.view.TooltipPopup;















import com.android.internal.view.menu.MenuBuilder;















import com.android.internal.widget.ScrollBarUtils;










@@ -1510,6 +1517,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     * Set for framework elements that use FITS_SYSTEM_WINDOWS, to indicate















     * that they are optional and should be skipped if the window has















     * requested system UI flags that ignore those insets for layout.













     * <p>













     * This is only used for support library as of Android R. The framework now uses













     * {@link #PFLAG4_FRAMEWORK_OPTIONAL_FITS_SYSTEM_WINDOWS} such that it can skip the legacy













     * insets path that loses insets information.















     */















    static final int OPTIONAL_FITS_SYSTEM_WINDOWS = 0x00000800;
























@@ -2258,7 +2269,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     * be extended in the future to hold our own class with more than just















     * a Rect. :)















     */













    static final ThreadLocal<Rect> sThreadLocal = new ThreadLocal<Rect>();













    static final ThreadLocal<Rect> sThreadLocal = ThreadLocal.withInitial(Rect::new);





























    /**















     * Map used to store views' tags.










@@ -3420,6 +3431,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     *                          1       PFLAG4_CONTENT_CAPTURE_IMPORTANCE_IS_CACHED















     *                         1        PFLAG4_CONTENT_CAPTURE_IMPORTANCE_CACHED_VALUE















     *                         11       PFLAG4_CONTENT_CAPTURE_IMPORTANCE_MASK













     *                        1         PFLAG4_FRAMEWORK_OPTIONAL_FITS_SYSTEM_WINDOWS















     * |-------|-------|-------|-------|















     */
























@@ -3457,6 +3469,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













            PFLAG4_CONTENT_CAPTURE_IMPORTANCE_IS_CACHED















            | PFLAG4_CONTENT_CAPTURE_IMPORTANCE_CACHED_VALUE;



























    /**













     * @see #OPTIONAL_FITS_SYSTEM_WINDOWS













     */













    static final int PFLAG4_FRAMEWORK_OPTIONAL_FITS_SYSTEM_WINDOWS = 0x000000100;



























    /* End of masks for mPrivateFlags4 */





























    /** @hide */










@@ -11020,23 +11037,22 @@ public class View implements Drawable.Callback, KeyEvent.Callback,



























    private boolean fitSystemWindowsInt(Rect insets) {















        if ((mViewFlags & FITS_SYSTEM_WINDOWS) == FITS_SYSTEM_WINDOWS) {













            mUserPaddingStart = UNDEFINED_PADDING;













            mUserPaddingEnd = UNDEFINED_PADDING;















            Rect localInsets = sThreadLocal.get();













            if (localInsets == null) {













                localInsets = new Rect();













                sThreadLocal.set(localInsets);













            }















            boolean res = computeFitSystemWindows(insets, localInsets);













            mUserPaddingLeftInitial = localInsets.left;













            mUserPaddingRightInitial = localInsets.right;













            internalSetPadding(localInsets.left, localInsets.top,













                    localInsets.right, localInsets.bottom);













            applyInsets(localInsets);















            return res;















        }















        return false;















    }



























    private void applyInsets(Rect insets) {













        mUserPaddingStart = UNDEFINED_PADDING;













        mUserPaddingEnd = UNDEFINED_PADDING;













        mUserPaddingLeftInitial = insets.left;













        mUserPaddingRightInitial = insets.right;













        internalSetPadding(insets.left, insets.top, insets.right, insets.bottom);













    }



























    /**















     * Called when the view should apply {@link WindowInsets} according to its internal policy.















     *









@@ -11063,6 +11079,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     * @return The supplied insets with any applied insets consumed















     */















    public WindowInsets onApplyWindowInsets(WindowInsets insets) {













        if ((mPrivateFlags4 & PFLAG4_FRAMEWORK_OPTIONAL_FITS_SYSTEM_WINDOWS) != 0













                && (mViewFlags & FITS_SYSTEM_WINDOWS) != 0) {













            return onApplyFrameworkOptionalFitSystemWindows(insets);













        }















        if ((mPrivateFlags3 & PFLAG3_FITTING_SYSTEM_WINDOWS) == 0) {















            // We weren't called from within a direct call to fitSystemWindows,















            // call into it as a fallback in case we're in a class that overrides it









@@ -11079,6 +11099,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













        return insets;















    }



























    private WindowInsets onApplyFrameworkOptionalFitSystemWindows(WindowInsets insets) {













        Rect localInsets = sThreadLocal.get();













        WindowInsets result = computeSystemWindowInsets(insets, localInsets);













        applyInsets(localInsets);













        return result;













    }



























    /**















     * Set an {@link OnApplyWindowInsetsListener} to take over the policy for applying















     * window insets to this view. The listener's










@@ -11369,17 +11396,24 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     * @return Insets that should be passed along to views under this one















     */















    public WindowInsets computeSystemWindowInsets(WindowInsets in, Rect outLocalInsets) {













        if ((mViewFlags & OPTIONAL_FITS_SYSTEM_WINDOWS) == 0













                || mAttachInfo == null













                || ((mAttachInfo.mSystemUiVisibility & SYSTEM_UI_LAYOUT_FLAGS) == 0)) {













            outLocalInsets.set(in.getSystemWindowInsetsAsRect());













            return in.consumeSystemWindowInsets().inset(outLocalInsets);













        } else {













        boolean isOptionalFitSystemWindows = (mViewFlags & OPTIONAL_FITS_SYSTEM_WINDOWS) != 0













                || (mPrivateFlags4 & PFLAG4_FRAMEWORK_OPTIONAL_FITS_SYSTEM_WINDOWS) != 0;













        if (isOptionalFitSystemWindows && mAttachInfo != null) {













            OnContentApplyWindowInsetsListener listener =













                    mAttachInfo.mContentOnApplyWindowInsetsListener;













            if (listener == null) {















                // The application wants to take care of fitting system window for















                // the content.















                outLocalInsets.setEmpty();















                return in;















            }













            Pair<Insets, WindowInsets> result = listener.onContentApplyWindowInsets(in);













            outLocalInsets.set(result.first.toRect());













            return result.second;













        } else {













            outLocalInsets.set(in.getSystemWindowInsetsAsRect());













            return in.consumeSystemWindowInsets().inset(outLocalInsets);













        }















    }





























    /**










@@ -11449,7 +11483,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













    }





























    /**













     * For use by PhoneWindow to make its own system window fitting optional.













     * @see #OPTIONAL_FITS_SYSTEM_WINDOWS















     * @hide















     */















    @UnsupportedAppUsage









@@ -11457,6 +11491,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













        setFlags(OPTIONAL_FITS_SYSTEM_WINDOWS, OPTIONAL_FITS_SYSTEM_WINDOWS);















    }



























    /**













     * @see #PFLAG4_OPTIONAL_FITS_SYSTEM_WINDOWS













     * @hide













     */













    public void makeFrameworkOptionalFitsSystemWindows() {













        mPrivateFlags4 |= PFLAG4_FRAMEWORK_OPTIONAL_FITS_SYSTEM_WINDOWS;













    }



























    /**















     * Returns the visibility status for this view.















     *










@@ -28415,6 +28457,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     * window.















     */















    final static class AttachInfo {



























        interface Callbacks {















            void playSoundEffect(int effectId);















            boolean performHapticFeedback(int effectId, boolean always);










@@ -28853,6 +28896,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













         */















        ContentCaptureManager mContentCaptureManager;



























        /**













         * Listener used to fit content on window level.













         */













        OnContentApplyWindowInsetsListener mContentOnApplyWindowInsetsListener;



























        /**















         * Creates a new set of attachment information with the specified















         * events handler and thread.