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

Commit ad575295 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "@hide ActivityInfo.resizeable."

parents 35fa2bc2 4aab1bba

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -8432,7 +8432,6 @@ package android.content.pm { 
    field public java.lang.String parentActivityName;

    field public java.lang.String permission;

    field public int persistableMode;

    field public boolean resizeable;

    field public int screenOrientation;

    field public int softInputMode;

    field public java.lang.String targetActivity;

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -8640,7 +8640,6 @@ package android.content.pm { 
    field public java.lang.String parentActivityName;

    field public java.lang.String permission;

    field public int persistableMode;

    field public boolean resizeable;

    field public int screenOrientation;

    field public int softInputMode;

    field public java.lang.String targetActivity;

core/java/android/content/pm/ActivityInfo.java

+1 −0
Original line number Diff line number Diff line
@@ -644,6 +644,7 @@ public class ActivityInfo extends ComponentInfo 
    /**

     * Value indicating if the activity is resizeable to any dimension.

     * See {@link android.R.attr#resizeableActivity}.

     * @hide

     */

    public boolean resizeable;

core/res/res/values/attrs_manifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -1017,7 +1017,7 @@ 
         at the same time.



         <p>The default value is <code>false</code> for applications with

         <code>targetSdkVersion</code> lesser than {@link android.os.Build.VERSION_CODE#MNC} and

         <code>targetSdkVersion</code> lesser than {@link android.os.Build.VERSION_CODES#MNC} and

         <code>true</code> otherwise.



         <p>NOTE: A task's root activity value is applied to all additional activities launched in