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

Commit 178d5005 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am b94df620: cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee... 

am b94df620: cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: edit manifest samples to indicate <application> element is always last

* commit 'b94df620':
  cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: edit manifest samples to indicate <application> element is always last
parents 042042b8 b94df620

docs/html/guide/appendix/api-levels.jd

+0 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ documentation for more information about how the system handles this attribute.< 
element might look like this: </p>



<pre>&lt;manifest&gt;

  ...

  &lt;uses-sdk android:minSdkVersion="5" /&gt;

  ...

&lt;/manifest&gt;</pre>

docs/html/guide/developing/eclipse-adt.jd

+0 −2
Original line number Diff line number Diff line
@@ -541,7 +541,6 @@ example library project declares the Activity <code>GameActivity</code>: </p> 
    &lt;activity android:name="GameActivity" /&gt;

    ...

  &lt;/application&gt;

  ...

&lt;/manifest&gt;</pre>
@@ -611,7 +610,6 @@ like this: </p> 
    &lt;activity android:name="com.example.android.tictactoe.library.GameActivity" /&gt;

    ...

  &lt;/application&gt;

  ...

&lt;/manifest&gt;</pre>



<p>For more information about the manifest file, see the documentation for <a

docs/html/guide/developing/other-ide.jd

+0 −2
Original line number Diff line number Diff line
@@ -700,7 +700,6 @@ example library project declares the Activity <code>GameActivity</code>: </p> 
    &lt;activity android:name="GameActivity" /&gt;

    ...

  &lt;/application&gt;

  ...

&lt;/manifest&gt;</pre>



<h4>Updating a library project</h4>
@@ -796,7 +795,6 @@ like this: </p> 
    &lt;activity android:name="com.example.android.tictactoe.library.GameActivity" /&gt;

    ...

  &lt;/application&gt;

  ...

&lt;/manifest&gt;</pre>



<p>For more information about the manifest file, see the documentation for <a

docs/html/guide/practices/screens_support.jd

+1 −1
Original line number Diff line number Diff line
@@ -693,13 +693,13 @@ nine-patch images, which always takes place by default. </p> 


<pre>

&lt;manifest xmlns:android="http://schemas.android.com/apk/res/android"&gt;

    ...

    &lt;supports-screens

        android:smallScreens="true"

        android:normalScreens="true"

        android:largeScreens="true"

        android:xlargeScreens="true"

        android:anyDensity="true" /&gt;

    ...

&lt;/manifest&gt;

</pre>

<!--  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; android:resizeable="true" -->

docs/html/guide/publishing/licensing.jd

+0 −1
Original line number Diff line number Diff line
@@ -784,7 +784,6 @@ android:name="com.android.vending.CHECK_LICENSE"&gt;</code></p> 
<pre>&lt;?xml version="1.0" encoding="utf-8"?&gt;



&lt;manifest xmlns:android="http://schemas.android.com/apk/res/android" ..."&gt;

    ...

    &lt;!-- Devices &gt;= 3 have version of Android Market that supports licensing. --&gt;

    &lt;uses-sdk android:minSdkVersion="3" /&gt;

    &lt;!-- Required permission to check licensing. --&gt;