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

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

Merge "Add the persistable attribute for Activities"

parents 5d5902d1 4cfa8dc7

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -865,6 +865,7 @@ package android { 
    field public static final int permissionFlags = 16843719; // 0x10103c7

    field public static final int permissionGroup = 16842762; // 0x101000a

    field public static final int permissionGroupFlags = 16843717; // 0x10103c5

    field public static final int persistable = 16843832; // 0x1010438

    field public static final int persistent = 16842765; // 0x101000d

    field public static final int persistentDrawingCache = 16842990; // 0x10100ee

    field public static final deprecated int phoneNumber = 16843111; // 0x1010167

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

+7 −0
Original line number Diff line number Diff line
@@ -188,6 +188,13 @@ public class ActivityInfo extends ComponentInfo 
     * @see android.app.Activity#setImmersive(boolean)

     */

    public static final int FLAG_IMMERSIVE = 0x0800;

    /**

     * Bit in {@link #flags} indicating that this activity is to be persisted across

     * reboots for display in the Recents list.

     * {@link android.R.attr#persistable}

     * @hide

     */

    public static final int FLAG_PERSISTABLE = 0x1000;

    /**

     * @hide Bit in {@link #flags}: If set, this component will only be seen

     * by the primary user.  Only works with broadcast receivers.  Set from the

core/java/android/content/pm/PackageParser.java

+5 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ import java.util.Iterator; 
import java.util.List;

import java.util.Map;

import java.util.Set;

import java.util.jar.JarEntry;

import java.util.jar.StrictJarFile;

import java.util.zip.ZipEntry;
@@ -2448,6 +2447,11 @@ public class PackageParser { 
            a.info.flags |= ActivityInfo.FLAG_IMMERSIVE;

        }



        if (sa.getBoolean(

                com.android.internal.R.styleable.AndroidManifestActivity_persistable, false)) {

            a.info.flags |= ActivityInfo.FLAG_PERSISTABLE;

        }



        if (!receiver) {

            if (sa.getBoolean(

                    com.android.internal.R.styleable.AndroidManifestActivity_hardwareAccelerated,

core/res/res/values/attrs_manifest.xml

+13 −0
Original line number Diff line number Diff line
@@ -866,6 +866,18 @@ 
    <!-- The name of the logical parent of the activity as it appears in the manifest. -->

    <attr name="parentActivityName" format="string" />



    <!-- Define an activity that will persist across reboots. If such an activity is in the

         Recents list when the device is shut off it will appear in the Recents list when

         the device is next powered on. To be persisted all activities in the task from the

         root activity up to the last activity before a <em>break</em> must be declared with

         the persistable attribute. A <em>break</em> is the first activity after the root

         started with Intent.FLAG_CLEAR_TASK_WHEN_RESET.



         <p>Activities that are declared with the persistable attribute will be provided with a

         forced-persistable Bundle in onCreate() and onSavedInstanceState(), and must only

         be passed a persistable Bundle in their Intent.extras. -->

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



    <!-- The <code>manifest</code> tag is the root of an

         <code>AndroidManifest.xml</code> file,

         describing the contents of an Android package (.apk) file.  One
@@ -1528,6 +1540,7 @@ 
        <!-- @hide This broacast receiver will only receive broadcasts for the

             primary user.  Can only be used with receivers. -->

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

        <attr name="persistable" />

    </declare-styleable>

    

    <!-- The <code>activity-alias</code> tag declares a new

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -2142,6 +2142,7 @@ 
  <public type="attr" name="colorButtonPressed" />

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

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

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



  <public-padding type="dimen" name="l_resource_pad" end="0x01050010" />