Skip to content

Commit 580f014

Browse files
scottamainscottamain
committed
docs: add camera and design, remove users
update title names for many lessons Change-Id: I7a3d30bcb9786a351c04f05fcee39bb42954d2e8
1 parent fc3f8e6 commit 580f014

29 files changed

+88
-56
lines changed

‎docs/html/resources/resources_toc.cs‎

Lines changed: 47 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<span class="en">Orientation</span>
99
</a>
1010
</li>
11-
11+
1212
<li class="toggle-list">
1313
<div><a href="<?cs var:toroot ?>training/multiscreen/index.html">
1414
<span class="en">Designing for Multiple Screens</span>
@@ -96,42 +96,43 @@
9696
</li>
9797
</ul>
9898
</li>
99-
99+
100+
100101
<li class="toggle-list">
101-
<div><a href="<?cs var:toroot ?>training/id-auth/index.html">
102-
<span class="en">Identifying Users</span>
102+
<div><a href="<?cs var:toroot ?>training/sharing/index.html">
103+
<span class="en">Sharing Content</span>
103104
</a></div>
104105
<ul>
105-
<li><a href="<?cs var:toroot ?>training/id-auth/identify.html">
106-
<span class="en">Identifying Your User</span>
106+
<li><a href="<?cs var:toroot ?>training/sharing/send.html">
107+
<span class="en">Sending Content to Other Apps</span>
107108
</a>
108109
</li>
109-
<li><a href="<?cs var:toroot ?>training/id-auth/authenticate.html">
110-
<span class="en">Authenticating to OAuth2 Services</span>
110+
<li><a href="<?cs var:toroot ?>training/sharing/receive.html">
111+
<span class="en">Receiving Content from Other Apps</span>
111112
</a>
112113
</li>
113-
<li><a href="<?cs var:toroot ?>training/id-auth/custom_auth.html">
114-
<span class="en">Creating a Custom Account Type</span>
114+
<li><a href="<?cs var:toroot ?>training/sharing/shareaction.html">
115+
<span class="en">Adding an Easy Share Action</span>
115116
</a>
116117
</li>
117118
</ul>
118119
</li>
119120

120121
<li class="toggle-list">
121-
<div><a href="<?cs var:toroot ?>training/sharing/index.html">
122-
<span class="en">Sharing Content</span>
122+
<div><a href="<?cs var:toroot ?>training/camera/index.html">
123+
<span class="en">Capturing Photos</span>
123124
</a></div>
124125
<ul>
125-
<li><a href="<?cs var:toroot ?>training/sharing/send.html">
126-
<span class="en">Sending Content to Other Apps</span>
126+
<li><a href="<?cs var:toroot ?>training/camera/photobasics.html">
127+
<span class="en">Taking Photos Simply</span>
127128
</a>
128129
</li>
129-
<li><a href="<?cs var:toroot ?>training/sharing/receive.html">
130-
<span class="en">Receiving Content from Other Apps</span>
130+
<li><a href="<?cs var:toroot ?>training/camera/videobasics.html">
131+
<span class="en">Recording Videos Simply</span>
131132
</a>
132133
</li>
133-
<li><a href="<?cs var:toroot ?>training/sharing/shareaction.html">
134-
<span class="en">Adding an Easy Share Action</span>
134+
<li><a href="<?cs var:toroot ?>training/camera/cameradirect.html">
135+
<span class="en">Controlling the Camera</span>
135136
</a>
136137
</li>
137138
</ul>
@@ -184,6 +185,34 @@
184185
</li>
185186
</ul>
186187
</li>
188+
189+
<li class="toggle-list">
190+
<div><a href="<?cs var:toroot ?>training/design-navigation/index.html">
191+
<span class="en">Designing Effective Navigation</span>
192+
</a></div>
193+
<ul>
194+
<li><a href="<?cs var:toroot ?>training/design-navigation/screen-planning.html">
195+
<span class="en">Planning Screens and Their Relationships</span>
196+
</a>
197+
</li>
198+
<li><a href="<?cs var:toroot ?>training/design-navigation/multiple-sizes.html">
199+
<span class="en">Planning for Multiple Touchscreen Sizes</span>
200+
</a>
201+
</li>
202+
<li><a href="<?cs var:toroot ?>training/design-navigation/descendant-lateral.html">
203+
<span class="en">Providing Descendant and Lateral Navigation</span>
204+
</a>
205+
</li>
206+
<li><a href="<?cs var:toroot ?>training/design-navigation/ancestral-temporal.html">
207+
<span class="en">Providing Ancestral and Temporal Navigation</span>
208+
</a>
209+
</li>
210+
<li><a href="<?cs var:toroot ?>training/design-navigation/wireframing.html">
211+
<span class="en">Putting it All Together: Wireframing the Example App</span>
212+
</a>
213+
</li>
214+
</ul>
215+
</li>
187216
</ul>
188217
</li>
189218

‎docs/html/training/camera/cameradirect.jd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
page.title=Controlling the Camera
2-
parent.title=Capturing Photos with the Camera
2+
parent.title=Capturing Photos
33
parent.link=index.html
44

55
trainingnavtop=true

‎docs/html/training/camera/index.jd‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
page.title=Capturing Photos with the Camera
1+
page.title=Capturing Photos
22

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

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

‎docs/html/training/camera/photobasics.jd‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
page.title=Taking Photos Simply
2-
parent.title=Capturing Photos with the Camera
2+
parent.title=Capturing Photos
33
parent.link=index.html
44

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

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

‎docs/html/training/camera/videobasics.jd‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
page.title=Recording Videos Simply
2-
parent.title=Capturing Photos with the Camera
2+
parent.title=Capturing Photos
33
parent.link=index.html
44

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

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

‎docs/html/training/design-navigation/ancestral-temporal.jd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
page.title=Providing Ancestral and Temporal Navigation
2-
parent.title=Designing Effective and Intuitive App Navigation
2+
parent.title=Designing Effective Navigation
33
parent.link=index.html
44

55
trainingnavtop=true

‎docs/html/training/design-navigation/descendant-lateral.jd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
page.title=Providing Descendant and Lateral Navigation
2-
parent.title=Designing Effective and Intuitive App Navigation
2+
parent.title=Designing Effective Navigation
33
parent.link=index.html
44

55
trainingnavtop=true

‎docs/html/training/design-navigation/index.jd‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
page.title=Designing Effective and Intuitive App Navigation
1+
page.title=Designing Effective Navigation
22

33
trainingnavtop=true
44
startpage=true
5-
next.title=Planning Screens and their Relationships
5+
next.title=Planning Screens and Their Relationships
66
next.link=screen-planning.html
77

88
@jd:body
@@ -30,7 +30,8 @@ next.link=screen-planning.html
3030

3131

3232
<dl>
33-
<dt><strong><a href="screen-planning.html">Planning Screens and their Relationships</a></strong></dt>
33+
<dt><strong><a href="screen-planning.html">Planning Screens and Their
34+
Relationships</a></strong></dt>
3435
<dd>Learn how to choose which screens your application should contain. Also learn how to choose which screens should be directly reachable from others. This lesson introduces a hypothetical news application to serve as an example for later lessons.</dd>
3536

3637
<dt><strong><a href="multiple-sizes.html">Planning for Multiple Touchscreen Sizes</a></strong></dt>
@@ -42,6 +43,6 @@ next.link=screen-planning.html
4243
<dt><strong><a href="ancestral-temporal.html">Providing Ancestral and Temporal Navigation</a></strong></dt>
4344
<dd>Learn how to allow users to navigate upwards in the content hierarchy. Also learn about best practices for the BACK button and temporal navigation, or navigation to previous screens that may not be hierarchically related.</dd>
4445

45-
<dt><strong><a href="wireframing.html">Putting it All Together: Wireframing the Example Application</a></strong></dt>
46+
<dt><strong><a href="wireframing.html">Putting it All Together: Wireframing the Example App</a></strong></dt>
4647
<dd>Learn how to create screen wireframes (low-fidelity graphic mockups) representing the screens in a news application based on the desired information model. These wireframes utilize navigational elements discussed in previous lessons to demonstrate intuitive and efficient navigation.</dd>
4748
</dl>

‎docs/html/training/design-navigation/multiple-sizes.jd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
page.title=Planning for Multiple Touchscreen Sizes
2-
parent.title=Designing Effective and Intuitive App Navigation
2+
parent.title=Designing Effective Navigation
33
parent.link=index.html
44

55
trainingnavtop=true
6-
previous.title=Planning Screens and their Relationships
6+
previous.title=Planning Screens and Their Relationships
77
previous.link=screen-planning.html
88
next.title=Providing Descendant and Lateral Navigation
99
next.link=descendant-lateral.html

‎docs/html/training/design-navigation/screen-planning.jd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
page.title=Planning Screens and their Relationships
2-
parent.title=Designing Effective and Intuitive App Navigation
1+
page.title=Planning Screens and Their Relationships
2+
parent.title=Designing Effective Navigation
33
parent.link=index.html
44

55
trainingnavtop=true

0 commit comments

Comments
 (0)