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

Commit dfef6b5d authored by Filip Gruszczynski's avatar Filip Gruszczynski Committed by Android (Google) Code Review
Browse files

Merge "Unhide resizeableActivity attribute."

parents 735eeb2c 7d3350dd

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -992,6 +992,7 @@ package android { 
    field public static final int resizeClip = 16843983; // 0x10104cf

    field public static final int resizeMode = 16843619; // 0x1010363

    field public static final int resizeable = 16843405; // 0x101028d

    field public static final int resizeableActivity = 16844022; // 0x10104f6

    field public static final int resource = 16842789; // 0x1010025

    field public static final int restoreAnyVersion = 16843450; // 0x10102ba

    field public static final deprecated int restoreNeedsApplication = 16843421; // 0x101029d

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1084,6 +1084,7 @@ package android { 
    field public static final int resizeClip = 16843983; // 0x10104cf

    field public static final int resizeMode = 16843619; // 0x1010363

    field public static final int resizeable = 16843405; // 0x101028d

    field public static final int resizeableActivity = 16844022; // 0x10104f6

    field public static final int resource = 16842789; // 0x1010025

    field public static final int restoreAnyVersion = 16843450; // 0x10102ba

    field public static final deprecated int restoreNeedsApplication = 16843421; // 0x101029d

core/res/res/values/attrs_manifest.xml

+97 −99
Original line number Diff line number Diff line
@@ -1069,8 +1069,7 @@ 


         <p>NOTE: The value of {@link android.R.attr#screenOrientation} will be ignored for

         resizeable activities as the system doesn't support fixed orientation on a resizeable

         activity.

         @hide -->

         activity. -->

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



    <!-- This value indicates how tasks rooted at this activity will behave in lockTask mode.
@@ -1826,7 +1825,6 @@ 
        <attr name="autoRemoveFromRecents" />

        <attr name="relinquishTaskIdentity" />

        <attr name="resumeWhilePausing" />

        <!-- @hide -->

        <attr name="resizeableActivity" />

        <attr name="lockTaskMode" />

        <attr name="showForAllUsers" />

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -2684,5 +2684,6 @@ 
    <public type="id" name="accessibilityActionSetProgress" />

    <public type="attr" name="activityWidth" />

    <public type="attr" name="activityHeight" />

    <public type="attr" name="resizeableActivity" />



</resources>