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

Commit 11f36b80 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 0e4071c7: am 426bece0: am e0df1cf8: am 7ff52939: am f82df78b: Merge "add... 

am 0e4071c7: am 426bece0: am e0df1cf8: am 7ff52939: am f82df78b: Merge "add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"" into jb-mr1.1-docs

* commit '0e4071c7':
  add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"
parents 515c20be 0e4071c7

docs/html/guide/components/activities.jd

+1 −0
Original line number Diff line number Diff line 
page.title=Activities

page.tags="activity","intent"

@jd:body



<div id="qv-wrapper">

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

+3 −0
Original line number Diff line number Diff line
@@ -85,6 +85,9 @@ host names using lowercase letters.</p> 
The subtype can be the asterisk wildcard ({@code *}) to indicate that any 

subtype matches.



<p>It's common for an intent filter to declare a {@code &lt;data>} that includes

only the {@code android:mimeType} attribute.</p>



<p class="note">Note: MIME type matching in the Android framework is

case-sensitive, unlike formal RFC MIME types.  As a result, you should always

specify MIME types using lowercase letters.</p>

docs/html/guide/topics/ui/actionbar.jd

+1 −0
Original line number Diff line number Diff line 
page.title=Action Bar

page.tags="action bar","menu"

parent.title=User Interface

parent.link=index.html

@jd:body

docs/html/training/animation/index.jd

+1 −0
Original line number Diff line number Diff line 
page.title=Adding Animations

page.tags="animation","views","layout","user interface"

trainingnavtop=true

startpage=true

docs/html/training/basics/data-storage/databases.jd

+0 −2
Original line number Diff line number Diff line 
page.title=Saving Data in SQL Databases

parent.title=Data Storage

parent.link=index.html



trainingnavtop=true

previous.title=Saving Data in Files