am 580f0146: docs: add camera and design, remove users update title names for many lessons (5f0df1b8) · Commits · e / os / android_frameworks_base

docs/html/resources/resources_toc.cs

+47 −18

Original line number	Diff line number	Diff line
		@@ -97,41 +97,42 @@
		</ul>
		</li>


		<li class="toggle-list">
		<div><a href="<?cs var:toroot ?>training/id-auth/index.html">
		<span class="en">Identifying Users</span>
		<div><a href="<?cs var:toroot ?>training/sharing/index.html">
		<span class="en">Sharing Content</span>
		</a></div>
		<ul>
		<li><a href="<?cs var:toroot ?>training/id-auth/identify.html">
		<span class="en">Identifying Your User</span>
		<li><a href="<?cs var:toroot ?>training/sharing/send.html">
		<span class="en">Sending Content to Other Apps</span>
		</a>
		</li>
		<li><a href="<?cs var:toroot ?>training/id-auth/authenticate.html">
		<span class="en">Authenticating to OAuth2 Services</span>
		<li><a href="<?cs var:toroot ?>training/sharing/receive.html">
		<span class="en">Receiving Content from Other Apps</span>
		</a>
		</li>
		<li><a href="<?cs var:toroot ?>training/id-auth/custom_auth.html">
		<span class="en">Creating a Custom Account Type</span>
		<li><a href="<?cs var:toroot ?>training/sharing/shareaction.html">
		<span class="en">Adding an Easy Share Action</span>
		</a>
		</li>
		</ul>
		</li>

		<li class="toggle-list">
		<div><a href="<?cs var:toroot ?>training/sharing/index.html">
		<span class="en">Sharing Content</span>
		<div><a href="<?cs var:toroot ?>training/camera/index.html">
		<span class="en">Capturing Photos</span>
		</a></div>
		<ul>
		<li><a href="<?cs var:toroot ?>training/sharing/send.html">
		<span class="en">Sending Content to Other Apps</span>
		<li><a href="<?cs var:toroot ?>training/camera/photobasics.html">
		<span class="en">Taking Photos Simply</span>
		</a>
		</li>
		<li><a href="<?cs var:toroot ?>training/sharing/receive.html">
		<span class="en">Receiving Content from Other Apps</span>
		<li><a href="<?cs var:toroot ?>training/camera/videobasics.html">
		<span class="en">Recording Videos Simply</span>
		</a>
		</li>
		<li><a href="<?cs var:toroot ?>training/sharing/shareaction.html">
		<span class="en">Adding an Easy Share Action</span>
		<li><a href="<?cs var:toroot ?>training/camera/cameradirect.html">
		<span class="en">Controlling the Camera</span>
		</a>
		</li>
		</ul>
		@@ -184,6 +185,34 @@
		</li>
		</ul>
		</li>

		<li class="toggle-list">
		<div><a href="<?cs var:toroot ?>training/design-navigation/index.html">
		<span class="en">Designing Effective Navigation</span>
		</a></div>
		<ul>
		<li><a href="<?cs var:toroot ?>training/design-navigation/screen-planning.html">
		<span class="en">Planning Screens and Their Relationships</span>
		</a>
		</li>
		<li><a href="<?cs var:toroot ?>training/design-navigation/multiple-sizes.html">
		<span class="en">Planning for Multiple Touchscreen Sizes</span>
		</a>
		</li>
		<li><a href="<?cs var:toroot ?>training/design-navigation/descendant-lateral.html">
		<span class="en">Providing Descendant and Lateral Navigation</span>
		</a>
		</li>
		<li><a href="<?cs var:toroot ?>training/design-navigation/ancestral-temporal.html">
		<span class="en">Providing Ancestral and Temporal Navigation</span>
		</a>
		</li>
		<li><a href="<?cs var:toroot ?>training/design-navigation/wireframing.html">
		<span class="en">Putting it All Together: Wireframing the Example App</span>
		</a>
		</li>
		</ul>
		</li>
		</ul>
		</li>

docs/html/training/camera/cameradirect.jd

+1 −1

Original line number	Diff line number	Diff line
		page.title=Controlling the Camera
		parent.title=Capturing Photos with the Camera
		parent.title=Capturing Photos
		parent.link=index.html

		trainingnavtop=true

docs/html/training/camera/index.jd

+3 −2

Original line number	Diff line number	Diff line
		page.title=Capturing Photos with the Camera
		page.title=Capturing Photos

		trainingnavtop=true
		startpage=true
		@@ -28,7 +28,8 @@ next.link=photobasics.html
		<h2>Try it out</h2>

		<div class="download-box">
		<a href="{@docRoot}shareables/training/PhotoIntentActivity.zip" class="button">Download the sample</a>
		<a href="http://developer.android.com/shareables/training/PhotoIntentActivity.zip"
		class="button">Download the sample</a>
		<p class="filename">PhotoIntentActivity.zip</p>
		</div>

docs/html/training/camera/photobasics.jd

+3 −2

Original line number	Diff line number	Diff line
		page.title=Taking Photos Simply
		parent.title=Capturing Photos with the Camera
		parent.title=Capturing Photos
		parent.link=index.html

		trainingnavtop=true
		@@ -31,7 +31,8 @@ next.link=videobasics.html

		<h2>Try it out</h2>
		<div class="download-box">
		<a href="{@docRoot}shareables/training/PhotoIntentActivity.zip" class="button">Download the
		<a href="http://developer.android.com/shareables/training/PhotoIntentActivity.zip"
		class="button">Download the
		sample</a>
		<p class="filename">PhotoIntentActivity.zip</p>
		</div>

docs/html/training/camera/videobasics.jd

+3 −3

Original line number	Diff line number	Diff line
		page.title=Recording Videos Simply
		parent.title=Capturing Photos with the Camera
		parent.title=Capturing Photos
		parent.link=index.html

		trainingnavtop=true
		@@ -31,8 +31,8 @@ next.link=cameradirect.html
		<h2>Try it out</h2>

		<div class="download-box">
		<a href="{@docRoot}shareables/training/PhotoIntentActivity.zip" class="button">Download the
		sample</a>
		<a href="http://developer.android.com/shareables/training/PhotoIntentActivity.zip"
		class="button">Download the sample</a>
		<p class="filename">PhotoIntentActivity.zip</p>
		</div>
		</div>