Skip to content

Commit 9aa41fd

Browse files
committed
Doc change: add video to platform highlights and fix a few things.
Change-Id: I788ecbfaba0ce4be9b718e2223dafebc451425bf
1 parent cd815fc commit 9aa41fd

File tree

3 files changed

+32
-24
lines changed

3 files changed

+32
-24
lines changed

docs/html/sdk/android-4.0-highlights.jd

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ page.title=Android 4.0 Platform Highlights
1414
}
1515
#jd-content div.video {
1616
float:right;
17-
padding:0 60px 40px;
1817
margin-top:-15px;
1918
}
2019
#jd-content table.columns {
@@ -37,18 +36,12 @@ page.title=Android 4.0 Platform Highlights
3736
font-weight:bold;
3837
}
3938
</style>
40-
<!--
41-
<div class="video" style="border:1px solid gray;width:250px;height:180px;margin:1.5em">
42-
<object width="278" height="180">
43-
<xparam name="movie" value="http://www.youtube.com/v/Jx3pdWBlZ34?hl=en&fs=1"></param>
44-
<xparam name="allowFullScreen" value="true"></param><param name="allowscriptaccess"
45-
value="always"></param>
46-
ICS CONSUMER VIDEO [ziwang]
47-
<embed xsrc="http://www.youtube.com/v/Jx3pdWBlZ34?hl=en&fs=1" type="application/x-shockwave-flash"
48-
allowscriptaccess="always" allowfullscreen="true" width="278" height="180"></embed>
49-
</object>
39+
40+
<div class="video" style="margin:1.5em 0 1.5em 1.5em">
41+
<iframe width="380" height="223" src="http://www.youtube.com/embed/-F_ke3rxopc?hd=1" frameborder="0"
42+
allowfullscreen></iframe>
5043
</div>
51-
-->
44+
5245
<p>Welcome to Android 4.0!</p>
5346

5447
<p>Android 4.0 delivers a refined, unified UI for phones and tablets and introduces innovative features for users and developers. This document provides a glimpse of the many new features and technologies that make Android 4.0 simple, beautiful, and beyond smart. <!--For technical details about
@@ -178,9 +171,9 @@ responses and manage the list from the Settings app.</p>
178171
<p style="margin-top:1em;margin-bottom:.75em;"><strong>Swipe to dismiss
179172
notifications, tasks, and browser tabs</strong></p>
180173

181-
<p>Android 4.0 makes managing notifications, recent apps, and browoser tabs even
174+
<p>Android 4.0 makes managing notifications, recent apps, and brwoser tabs even
182175
easier. Users can now dismiss individual notifications, apps from the Recent
183-
Apps list, and browser tabs lists with a simple swipe of a finger. </p>
176+
Apps list, and browser tabs with a simple swipe of a finger. </p>
184177

185178
<div style="padding-top:0em;">
186179
<div style="margin-right:1em;float:right;margin-left:1em;margin-top:1.5em;margin-bottom:0;padding-bottom:0;width:200px">
@@ -300,15 +293,15 @@ profiles</strong></p>
300293
linked together and integrated for easy accessibility. At the center is a new
301294
<strong>People app</strong> that offers richer profile information, including a
302295
large profile picture, phone numbers, addresses and accounts, status updates,
303-
and a new button for connecting on integrated social networks. </p>
296+
events, and a new button for connecting on integrated social networks. </p>
304297

305298
<p>The user's own contact information is stored in a new <strong>"Me"
306299
profile</strong>, allowing easier sharing with apps and people. All of the
307300
user's integrated contacts are displayed in an easy to manage list, including
308301
controls over which contacts are shown from any integrated account or social
309302
network. Wherever the user navigates across the system, tapping a profile photo
310-
displays Quick Contacts, with shortcuts to phone numbers, text messaging, and
311-
more. </p>
303+
displays Quick Contacts, with large profile pictures, shortcuts to phone numbers,
304+
text messaging, and more. </p>
312305

313306

314307
<p style="margin-top:1em;margin-bottom:.75em;"><strong>Unified calendar, visual
@@ -343,7 +336,7 @@ inbox. </p>
343336
<p style="margin-top:1em;margin-bottom:.75em;"><strong>Rich and versatile camera
344337
capabilities</strong></p>
345338

346-
<p>The Camera app includes many new features let users capture special moments
339+
<p>The Camera app includes many new features that let users capture special moments
347340
with great photos and videos. After capturing images, they can edit and share
348341
them easily with friemds. </p>
349342

@@ -405,7 +398,15 @@ to locate the image they want, then tap to load it in Gallery. </p>
405398

406399
<p style="margin-top:1em;margin-bottom:.75em;"><strong>Live Effects for transforming video</strong></p>
407400

408-
<p>Live Effects is a collection of graphical transformations that add interest and fun to videos captured in the Camera app. For example, users can change the background behind them to any stock or custom image, for just the right setting when shooting video or using Google Talk video chat. Also available is Silly Faces, a set of morphing effects that use state-of-the-art face recognition and GPU filters to add great effects facial features during video capture. For example, you can use effects such as small eyes, big mouth, big nose, face squeeze, and more. Outside of the Camera app, Live Effects is available during video chat in the Google Talk app.</p>
401+
<p>Live Effects is a collection of graphical transformations that add interest
402+
and fun to videos captured in the Camera app. For example, users can change the
403+
background behind them to any stock or custom image, for just the right setting
404+
when shooting video or using Google Talk video chat. Also available is Silly
405+
Faces, a set of morphing effects that use state-of-the-art face recognition and
406+
GPU filters to add great effects to facial features during video capture. For
407+
example, you can use effects such as small eyes, big mouth, big nose, face
408+
squeeze, and more. Outside of the Camera app, Live Effects is available during
409+
video chat in the Google Talk app.</p>
409410

410411
<div style="padding-top:0em;">
411412
<div style="margsin-right:.8em;float:left;width:186px;padding-top:1em;">
@@ -418,7 +419,10 @@ to locate the image they want, then tap to load it in Gallery. </p>
418419

419420
<p style="margin-top:1em;margin-bottom:.75em;"><strong>Sharing with screenshots</strong></p>
420421

421-
<p>Users can now share what's on their screens more easily by taking screenshots. Hardware buttons let them snap a <strong>screenshot</strong> and store it locally. Afterward, they can view, edit, and share the screen shot in Gallery or a similar app.</p>
422+
<p>Users can now share what's on their screens more easily by taking
423+
screenshots. Hardware buttons let them snap a <strong>screenshot</strong> and
424+
store it locally. Afterward, they can view, edit, and share the screen shot in
425+
Gallery or a similar app.</p>
422426

423427

424428
<h3 id="cloud" style="color:#172861">Cloud-connected experience</h3>
@@ -435,14 +439,18 @@ to locate the image they want, then tap to load it in Gallery. </p>
435439
</div>
436440
</div>
437441

438-
<p>Android has always been cloud-connected, letting users browse the web and sync photos, apps, games, email, and contacts &mdash; wherever they are and across all of their devices. Android 4.0 adds new browsing and email capabilities to let users take even more with them and keep communication organized.</p>
442+
<p>Android has always been cloud-connected, letting users browse the web and
443+
sync photos, apps, games, email, and contacts &mdash; wherever they are and
444+
across all of their devices. Android 4.0 adds new browsing and email
445+
capabilities to let users take even more with them and keep communication
446+
organized.</p>
439447

440448

441449
<p style="margin-top:1em;margin-bottom:.75em;"><strong>Powerful web
442450
browsing</strong></p>
443451

444452
<p>The Android Browser offers an experience that’s as rich and convenient as a
445-
desktop browser. It lets users instantly and manage <strong>sync Google Chrome
453+
desktop browser. It lets users instantly sync and manage <strong>Google Chrome
446454
bookmarks</strong> from all of their accounts, jump to their favorite content
447455
faster, and even save it for reading later in case there's no network
448456
available.</p>
@@ -641,7 +649,7 @@ auto-complete, to keep the most relevant contacts ranked closest to the top.</p>
641649

642650
<p>Applications can also let users set up a social connection to a contact from
643651
the People app. When the user touches Add Connection in a contact, the app
644-
broadcasts a public intent that other apps can handle, displaying any UI needed
652+
sends a public intent that other apps can handle, displaying any UI needed
645653
to create the social connection.</p>
646654

647655
<p>Building on the social API, developers can add powerful new interactions that
@@ -659,7 +667,7 @@ entries from the database, including events contributed by other applications,
659667
and handle the display of event alerts and reminders. Using the calendar
660668
provider, applications can take advantage of event data sourced from a variety
661669
of apps and protocols, to offer innovative ways of viewing and managing a user’s
662-
events. Apps can also use of calendar data to improve the relevance of their
670+
events. Apps can also use calendar data to improve the relevance of their
663671
other content.</p>
664672

665673
<p>For lighter-weight access to calendar services, the Calendar app defines a
10.5 KB
Loading
821 Bytes
Loading

0 commit comments

Comments
 (0)