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

Commit f650bad4 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Address API feedback" into rvc-dev am: 2a92d2d4 

Change-Id: I68feea7311a4de7d45905d1e2edcea1cf7ad601c
parents 4827c44b 2a92d2d4

core/java/android/view/WindowManager.java

+1 −1
Original line number Diff line number Diff line
@@ -1587,7 +1587,7 @@ public interface WindowManager extends ViewManager { 
         *

         * {@sample development/samples/ApiDemos/res/layout/overscan_activity.xml complete}

         *

         * @deprecated Overscan areas aren't set by any Android product anymore.

         * @deprecated Overscan areas aren't set by any Android product anymore as of Android 11.

         */

        @Deprecated

        public static final int FLAG_LAYOUT_IN_OVERSCAN = 0x02000000;

core/res/res/values/attrs.xml

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ 
        <attr name="windowFullscreen" format="boolean" />

        <!-- Flag indicating whether this window should extend into overscan region.  Corresponds

             to {@link android.view.WindowManager.LayoutParams#FLAG_LAYOUT_IN_OVERSCAN}.

             @deprecated Overscan areas aren't set by any Android product anymore.

             @deprecated Overscan areas aren't set by any Android product anymore as of Android 11.

             -->

        <attr name="windowOverscan" format="boolean" />

        <!-- Flag indicating whether this is a floating window. -->

core/res/res/values/themes_material.xml

+2 −2
Original line number Diff line number Diff line
@@ -962,7 +962,7 @@ please see themes_device_defaults.xml. 
         the entire screen and extends into the display overscan region.  This theme

         sets {@link android.R.attr#windowFullscreen} and {@link android.R.attr#windowOverscan}

         to true.

         @deprecated Overscan areas aren't set by any Android product anymore.

         @deprecated Overscan areas aren't set by any Android product anymore as of Android 11.

         -->

    <style name="Theme.Material.NoActionBar.Overscan">

        <item name="windowFullscreen">true</item>
@@ -996,7 +996,7 @@ please see themes_device_defaults.xml. 
         the entire screen and extends into the display overscan region.  This theme

         sets {@link android.R.attr#windowFullscreen} and {@link android.R.attr#windowOverscan}

         to true.

         @deprecated Overscan areas aren't set by any Android product anymore.

         @deprecated Overscan areas aren't set by any Android product anymore as of Android 11.

         -->

    <style name="Theme.Material.Light.NoActionBar.Overscan">

        <item name="windowFullscreen">true</item>