Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \\\"Correct parentActivity example in Activity Element docs.\\\" into mnc-io-docs am: 893413e50c am: ce2e9d8716

Browse Source 
am: 3f1741a19c

Change-Id: I0dd154fa1d66744136fe646a338387b004f7b827
This commit is contained in:
Aurimas Liutikas
2016-06-14 01:08:22 +00:00
committed by android-build-merger
parent 193efc8bd0 3f1741a19c
commit a6513dad1b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/html/guide/topics/manifest/activity-element.jd
View File

@@ -714,7 +714,7 @@ For example:</p>
&lt;activity &lt;activity
android:name="com.example.app.ChildActivity" android:name="com.example.app.ChildActivity"
android:label="@string/title_child_activity" 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;!-- Parent activity meta-data to support API level 4+ -->
&lt;meta-data &lt;meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"