summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/basics/what-is-android.jd
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-11-18 14:08:08 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-11-18 14:08:08 -0800
commitafcd516e3e6378aaf97ff44b0b9ea233223ded65 (patch)
tree120a8280f87840ec89e31f53bb8fd5618b0409ba /docs/html/guide/basics/what-is-android.jd
parent00ecac957c4a5d2df132640ff418280d969e7d83 (diff)
parent8d86952068750b1b3c3f8cac967e2b5fcb1a83ae (diff)
downloadframeworks_base-afcd516e3e6378aaf97ff44b0b9ea233223ded65.zip
frameworks_base-afcd516e3e6378aaf97ff44b0b9ea233223ded65.tar.gz
frameworks_base-afcd516e3e6378aaf97ff44b0b9ea233223ded65.tar.bz2
Merge change Iaae72f66 into eclair-sdk
* changes: docs: misc edits to samples page and intro docs make samples page accessible from offline version instead of redirecting to the user filesystem and include instructions for creating projects based on the sample apps. fix a link and add some content to the What is android doc.
Diffstat (limited to 'docs/html/guide/basics/what-is-android.jd')
-rw-r--r--docs/html/guide/basics/what-is-android.jd8
1 files changed, 7 insertions, 1 deletions
diff --git a/docs/html/guide/basics/what-is-android.jd b/docs/html/guide/basics/what-is-android.jd
index b75321b..668e62e 100644
--- a/docs/html/guide/basics/what-is-android.jd
+++ b/docs/html/guide/basics/what-is-android.jd
@@ -3,7 +3,7 @@ page.title=What is Android?
<p>Android is a software stack for mobile devices that includes an operating
system, middleware and key applications. The <a
-href="http://code.google.com/android/download.html">Android SDK</a>
+href="http://developer.android.com/sdk/index.html">Android SDK</a>
provides the tools and APIs necessary to begin developing applications on the
Android platform using the Java programming language.</p>
@@ -48,6 +48,12 @@ others. All applications are written using the Java programming language.</p>
<a name="application_framework" id="application_framework"></a>
<h2>Application Framework</h2>
+<p>By providing an open development platform, Android
+offers developers the ability to build extremely rich and innovative
+applications. Developers are free to take advantage of the
+device hardware, access location information, run background services, set alarms,
+add notifications to the status bar, and much, much more. </p>
+
<p>Developers have full access to the same framework APIs used by the core
applications. The application architecture is designed to simplify the reuse
of components; any application can publish its capabilities and any other