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

Commit d2cc56eb authored by Craig Mautner's avatar Craig Mautner
Browse files

resolved conflicts for merge of f8a58208 to master 

Conflicts:
	core/java/android/content/pm/PackageParser.java
	core/res/res/values/attrs_manifest.xml
	core/res/res/values/public.xml

Change-Id: I747772e9dbc7ee1cf8993e574de4b3215f6833b2
parents 80021878 f8a58208

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ package android { 
    field public static final int allContactsName = 16843468; // 0x10102cc

    field public static final int allowBackup = 16843392; // 0x1010280

    field public static final int allowClearUserData = 16842757; // 0x1010005

    field public static final int allowEmbedded = 16843765; // 0x10103f5

    field public static final int allowParallelSyncs = 16843570; // 0x1010332

    field public static final int allowSingleTap = 16843353; // 0x1010259

    field public static final int allowTaskReparenting = 16843268; // 0x1010204

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

+8 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ public class ActivityInfo extends ComponentInfo 
    /**

     * @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

     * {@link android.R.attr#primaryUserOnly} attribute.

     * android.R.attr#primaryUserOnly attribute.

     */

    public static final int FLAG_PRIMARY_USER_ONLY = 0x20000000;

    /**
@@ -209,6 +209,13 @@ public class ActivityInfo extends ComponentInfo 
     * components; it is not applied to activities.

     */

    public static final int FLAG_SINGLE_USER = 0x40000000;

    /**

     * @hide Bit in {@link #flags}: If set, this activity may be launched into an

     * owned ActivityContainer such as that within an ActivityView. If not set and

     * this activity is launched into such a container a SecurityExcception will be

     * thrown. Set from the {@link android.R.attr#allowEmbedded} attribute.

     */

    public static final int FLAG_ALLOW_EMBEDDED = 0x80000000;

    /**

     * Options that have been set in the activity declaration in the

     * manifest.

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

+6 −0
Original line number Diff line number Diff line
@@ -2452,6 +2452,12 @@ public class PackageParser { 
            a.info.flags |= ActivityInfo.FLAG_PERSISTABLE;

        }



        if (sa.getBoolean(

                com.android.internal.R.styleable.AndroidManifestActivity_allowEmbedded,

                false)) {

            a.info.flags |= ActivityInfo.FLAG_ALLOW_EMBEDDED;

        }



        if (!receiver) {

            if (sa.getBoolean(

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

core/res/res/values/attrs_manifest.xml

+9 −1
Original line number Diff line number Diff line
@@ -747,6 +747,13 @@ 
        <flag name="fontScale" value="0x40000000" />

    </attr>



    <!-- Indicate that the activity can be launched as the embedded child of another

         activity. Particularly in the case where the child lives in a container

         such as a Display owned by another activity.



         <p>The default value of this attribute is <code>false</code>. -->

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



    <!-- Descriptive text for the associated data. -->

    <attr name="description" format="reference" />
@@ -1541,6 +1548,7 @@ 
             primary user.  Can only be used with receivers. -->

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

        <attr name="persistable" />

        <attr name="allowEmbedded" />

    </declare-styleable>

    

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

core/res/res/values/public.xml

+2 −1
Original line number Diff line number Diff line
@@ -2094,7 +2094,8 @@ 


  <public type="attr" name="banner" id="0x10103f2" />

  <public type="attr" name="windowSwipeToDismiss" id="0x10103f3" />

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

  <public type="attr" name="isGame" id="0x10103f4" />

  <public type="attr" name="allowEmbedded" id="0x10103f5" />



<!-- ===============================================================

     Resources added in version 21 of the platform