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

Commit 1716baa6 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Rename flag and attribute per API council" into lmp-dev

parents e6ab031e 7f72f537

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8278,7 +8278,6 @@ package android.content.pm { 
    field public static final int DOCUMENT_LAUNCH_INTO_EXISTING = 1; // 0x1

    field public static final int DOCUMENT_LAUNCH_NEVER = 3; // 0x3

    field public static final int DOCUMENT_LAUNCH_NONE = 0; // 0x0

    field public static final int DO_NOT_PERSIST = 1; // 0x1

    field public static final int FLAG_ALLOW_TASK_REPARENTING = 64; // 0x40

    field public static final int FLAG_ALWAYS_RETAIN_TASK_STATE = 8; // 0x8

    field public static final int FLAG_AUTO_REMOVE_FROM_RECENTS = 8192; // 0x2000
@@ -8298,6 +8297,7 @@ package android.content.pm { 
    field public static final int LAUNCH_SINGLE_TASK = 2; // 0x2

    field public static final int LAUNCH_SINGLE_TOP = 1; // 0x1

    field public static final int PERSIST_ACROSS_REBOOTS = 2; // 0x2

    field public static final int PERSIST_NEVER = 1; // 0x1

    field public static final int PERSIST_ROOT_ONLY = 0; // 0x0

    field public static final int SCREEN_ORIENTATION_BEHIND = 3; // 0x3

    field public static final int SCREEN_ORIENTATION_FULL_SENSOR = 10; // 0xa

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

+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ public class ActivityInfo extends ComponentInfo 
     * Constant corresponding to <code>doNotPersist</code> in

     * the {@link android.R.attr#persistableMode} attribute.

     */

    public static final int DO_NOT_PERSIST = 1;

    public static final int PERSIST_NEVER = 1;

    /**

     * Constant corresponding to <code>persistAcrossReboots</code> in

     * the {@link android.R.attr#persistableMode} attribute.
@@ -667,7 +667,7 @@ public class ActivityInfo extends ComponentInfo 
    private String persistableModeToString() {

        switch(persistableMode) {

            case PERSIST_ROOT_ONLY: return "PERSIST_ROOT_ONLY";

            case DO_NOT_PERSIST: return "DO_NOT_PERSIST";

            case PERSIST_NEVER: return "PERSIST_NEVER";

            case PERSIST_ACROSS_REBOOTS: return "PERSIST_ACROSS_REBOOTS";

            default: return "UNKNOWN=" + persistableMode;

        }

core/res/res/values/attrs_manifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -905,7 +905,7 @@ 
        <enum name="persistRootOnly" value="0" />

        <!-- If this activity forms the root of a task then that task will not be persisted

             across reboots -->

        <enum name="doNotPersist" value="1" />

        <enum name="persistNever" value="1" />

        <!-- If this activity forms the root of a task then the task and this activity will

             be persisted across reboots. If the activity above this activity is also

             tagged with the attribute <code>"persist"</code> then it will be persisted as well.