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

Commit a851023d authored by Aurimas Liutikas's avatar Aurimas Liutikas Committed by android-build-merger
Browse files

Merge \\\\"Correct parentActivity example in Activity Element docs.\\\\" into... 

Merge \\\\"Correct parentActivity example in Activity Element docs.\\\\" into mnc-io-docs am: 893413e5 am: ce2e9d87 am: 3f1741a1
am: a6513dad

Change-Id: Ia272ca12ba69f5bfd787757bf1177b9301ca1f65
parents 1ed2c5d5 a6513dad

docs/html/guide/topics/manifest/activity-element.jd

+1 −1
Original line number Diff line number Diff line
@@ -714,7 +714,7 @@ For example:</p> 
&lt;activity

    android:name="com.example.app.ChildActivity"

    android:label="@string/title_child_activity"

    android:parentActivityName="com.example.myfirstapp.MainActivity" >

    android:parentActivityName="com.example.app.MainActivity" >

    &lt;!-- Parent activity meta-data to support API level 4+ -->

    &lt;meta-data

        android:name="android.support.PARENT_ACTIVITY"