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

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

Merge "Fix build."

parents 55d53ac8 37ac0b53
Loading
Loading
Loading
Loading
+2 −8
Original line number Diff line number Diff line
@@ -1038,13 +1038,6 @@
         activity. -->
    <attr name="resizeableActivity" format="boolean" />

    <!-- Tasks rooted at this activity will start up in lock-task mode. That means that they
         cannot be navigated away from until they finish or explicitly release lock-task mode.
         This only works for system privileged activities. An exception will be thrown for
         non-privileged activities that use this attribute.
         @hide -->
    <attr name="lockTaskOnLaunch" format="boolean" />

    <!-- When set installer will extract native libraries. If set to false
         libraries in the apk must be stored and page-aligned.  -->
    <attr name="extractNativeLibs" format="boolean"/>
@@ -1756,7 +1749,8 @@
        <attr name="relinquishTaskIdentity" />
        <attr name="resumeWhilePausing" />
        <attr name="resizeableActivity" />
        <attr name="lockTaskOnLaunch" />
        <!-- @hide This activity will enter lockTask mode immediately if it is privileged -->
        <attr name="lockTaskOnLaunch" format="boolean" />
    </declare-styleable>
    
    <!-- The <code>activity-alias</code> tag declares a new