From 85dea528866217d4b3d40a1162c00c4e836504aa Mon Sep 17 00:00:00 2001 From: Dirk Dougherty Date: Thu, 21 May 2015 14:20:25 -0700 Subject: Doc change: updated images, landings, and ndk updates. Change-Id: If128f8394438471365db6f7c0a42e6b38d25d250 --- Android.mk | 2 +- docs/html-ndk/ndk/guides/guides_toc.cs | 21 +++++- docs/html-ndk/ndk/index.jd | 73 +++++++++++++++--- docs/html/develop/index.jd | 9 ++- docs/html/google/index.jd | 4 +- docs/html/guide/index.jd | 11 +-- docs/html/images/cards/course-nanodegree-lg_2x.jpg | Bin 0 -> 8160 bytes docs/html/images/cards/course-nanodegree_2x.jpg | Bin 0 -> 5445 bytes docs/html/images/cards/course-ud837_2x.jpg | Bin 0 -> 47496 bytes docs/html/images/cards/course-ud855_2x.jpg | Bin 0 -> 63103 bytes docs/html/images/cards/course-ud862_2x.jpg | Bin 0 -> 67377 bytes docs/html/images/cards/course-ud867_2x.jpg | Bin 0 -> 36606 bytes docs/html/images/cards/course-ud875_2x.jpg | Bin 0 -> 38976 bytes docs/html/images/cards/course-ud876_2x.jpg | Bin 0 -> 38613 bytes docs/html/images/home/devices-hero_620px_2x.png | Bin 0 -> 1209764 bytes docs/html/index.jd | 28 ++++++- docs/html/jd_collections.js | 9 ++- docs/html/jd_extras.js | 84 +++++++++++++++++++++ docs/html/preview/index.jd | 28 ++++--- 19 files changed, 226 insertions(+), 43 deletions(-) create mode 100644 docs/html/images/cards/course-nanodegree-lg_2x.jpg create mode 100644 docs/html/images/cards/course-nanodegree_2x.jpg create mode 100644 docs/html/images/cards/course-ud837_2x.jpg create mode 100644 docs/html/images/cards/course-ud855_2x.jpg create mode 100644 docs/html/images/cards/course-ud862_2x.jpg create mode 100644 docs/html/images/cards/course-ud867_2x.jpg create mode 100644 docs/html/images/cards/course-ud875_2x.jpg create mode 100644 docs/html/images/cards/course-ud876_2x.jpg create mode 100644 docs/html/images/home/devices-hero_620px_2x.png diff --git a/Android.mk b/Android.mk index 449ae1b..184392a 100644 --- a/Android.mk +++ b/Android.mk @@ -1010,7 +1010,7 @@ LOCAL_DROIDDOC_OPTIONS:= \ -hdf android.hasSamples true \ -samplesdir $(samples_dir) -LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-ndk +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk include $(BUILD_DROIDDOC) diff --git a/docs/html-ndk/ndk/guides/guides_toc.cs b/docs/html-ndk/ndk/guides/guides_toc.cs index e6bc199..bfb4ea9 100644 --- a/docs/html-ndk/ndk/guides/guides_toc.cs +++ b/docs/html-ndk/ndk/guides/guides_toc.cs @@ -6,10 +6,25 @@ localized titles are added in the language order specified below. ?> - diff --git a/docs/html-ndk/ndk/index.jd b/docs/html-ndk/ndk/index.jd index f1c5ce6..6723ed7 100644 --- a/docs/html-ndk/ndk/index.jd +++ b/docs/html-ndk/ndk/index.jd @@ -1,15 +1,68 @@ +page.title=Android NDK +page.tags="ndk, native, c, c++", +meta.tags="ndk, native, c++" fullpage=true -page.viewport_width=970 -excludeFromSuggestions=true -page.metaDescription=The official Android NDK developer web site. -page.customHeadTag= - +section.landing=true +header.hide=1 +footer.hide=1 @jd:body +
+
+
+
+

Android NDK

+

+ The Android NDK is a toolset that lets you implement parts of your app using native code languages such as C and C++. For certain types of apps, this can help you reuse existing code libraries written in those languages. +

+ + + + Get Started +
+
+
+ + public class MyActivity extends Activity {
+   /**
+   * Native method implemented in C/C++
+   */
+   public native void computerFoo();
+ } +
+
+
+
+ +
+ + + +
+
+

Latest

+
+
+ +
+

Something else

+
+ Placeholder +
-

SUPER FANCY NDK LANDING PAGE

+
    +
  • + + Overview and Usage +
    • +
  • + + User Guide +
    • -

    Welcome to the placeholder text for the NDK. Here, you'll find all of the details you need to -combine the power of native code with Android flexibility and compatibility. The documents here -help you get started, introduce some key concepts that you should know when using the NDK, and then -provide a variety of other information that you'll find helpful while developing your app.

    +
+

diff --git a/docs/html/develop/index.jd b/docs/html/develop/index.jd index f516677..4ba0b09 100644 --- a/docs/html/develop/index.jd +++ b/docs/html/develop/index.jd @@ -9,7 +9,7 @@ tabbedList=1 excludeFromSuggestions=true @jd:body -
+
@@ -25,7 +25,7 @@ excludeFromSuggestions=true Set up Android Studio
- + Build your first app
@@ -117,12 +117,13 @@ excludeFromSuggestions=true
-
+

Online Courses

Free online courses from Android experts that bring you step-by-step to building your own apps.
+ data-maxResults="6">
diff --git a/docs/html/google/index.jd b/docs/html/google/index.jd index 9df09e1..e7a5167 100644 --- a/docs/html/google/index.jd +++ b/docs/html/google/index.jd @@ -67,8 +67,8 @@ footer.hide=1
-
-

Latest

+
+

Videos

-
- -
+
+
+

Apps provide multiple entry points

@@ -45,7 +45,7 @@ for an action that other apps may invoke.

-
+

Apps adapt to different devices

@@ -69,7 +69,8 @@ that feature.

-
+
+
diff --git a/docs/html/images/cards/course-nanodegree-lg_2x.jpg b/docs/html/images/cards/course-nanodegree-lg_2x.jpg new file mode 100644 index 0000000..c32769b Binary files /dev/null and b/docs/html/images/cards/course-nanodegree-lg_2x.jpg differ diff --git a/docs/html/images/cards/course-nanodegree_2x.jpg b/docs/html/images/cards/course-nanodegree_2x.jpg new file mode 100644 index 0000000..db3702b Binary files /dev/null and b/docs/html/images/cards/course-nanodegree_2x.jpg differ diff --git a/docs/html/images/cards/course-ud837_2x.jpg b/docs/html/images/cards/course-ud837_2x.jpg new file mode 100644 index 0000000..2dfcabf Binary files /dev/null and b/docs/html/images/cards/course-ud837_2x.jpg differ diff --git a/docs/html/images/cards/course-ud855_2x.jpg b/docs/html/images/cards/course-ud855_2x.jpg new file mode 100644 index 0000000..bc9c3ee Binary files /dev/null and b/docs/html/images/cards/course-ud855_2x.jpg differ diff --git a/docs/html/images/cards/course-ud862_2x.jpg b/docs/html/images/cards/course-ud862_2x.jpg new file mode 100644 index 0000000..d3e77ff Binary files /dev/null and b/docs/html/images/cards/course-ud862_2x.jpg differ diff --git a/docs/html/images/cards/course-ud867_2x.jpg b/docs/html/images/cards/course-ud867_2x.jpg new file mode 100644 index 0000000..2467efb Binary files /dev/null and b/docs/html/images/cards/course-ud867_2x.jpg differ diff --git a/docs/html/images/cards/course-ud875_2x.jpg b/docs/html/images/cards/course-ud875_2x.jpg new file mode 100644 index 0000000..b7fc8cc Binary files /dev/null and b/docs/html/images/cards/course-ud875_2x.jpg differ diff --git a/docs/html/images/cards/course-ud876_2x.jpg b/docs/html/images/cards/course-ud876_2x.jpg new file mode 100644 index 0000000..5f27246 Binary files /dev/null and b/docs/html/images/cards/course-ud876_2x.jpg differ diff --git a/docs/html/images/home/devices-hero_620px_2x.png b/docs/html/images/home/devices-hero_620px_2x.png new file mode 100644 index 0000000..273706e Binary files /dev/null and b/docs/html/images/home/devices-hero_620px_2x.png differ diff --git a/docs/html/index.jd b/docs/html/index.jd index c0a5b4b..70274eb 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -5,8 +5,32 @@ page.customHeadTag= -
+ + +
diff --git a/docs/html/jd_collections.js b/docs/html/jd_collections.js index 4950d97..421f87a 100644 --- a/docs/html/jd_collections.js +++ b/docs/html/jd_collections.js @@ -150,7 +150,14 @@ var RESOURCE_COLLECTIONS = { "resources": [ "https://www.udacity.com/course/ux-design-for-mobile-developers--ud849", "https://www.udacity.com/course/developing-android-apps--ud853", - "https://www.udacity.com/course/android-performance--ud825" + "https://www.udacity.com/course/android-performance--ud825", + "https://www.udacity.com/android-nanodegree", + "https://www.udacity.com/course/advanced-android-app-development--ud855", + "https://www.udacity.com/course/android-ubiquitous-computing--ud875", + "https://www.udacity.com/course/google-play-services--ud876", + "https://www.udacity.com/course/android-design-for-developers--ud862", + "https://www.udacity.com/course/android-development-for-beginners--ud837", + "https://www.udacity.com/course/gradle-for-android-and-java--ud867" ] }, "preview/landing/herolinks": { diff --git a/docs/html/jd_extras.js b/docs/html/jd_extras.js index f318668..6f6d31d 100644 --- a/docs/html/jd_extras.js +++ b/docs/html/jd_extras.js @@ -2652,6 +2652,90 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([ "type":"online course" }, { + "title":"Enroll in the Android Nanodegree", + "titleFriendly":"", + "summary":"Sign up to learn about Android and receive a certification of your efforts.", + "url":"https://www.udacity.com/android-nanodegree", + "group":"", + "keywords": ["nanodegree"], + "tags": ["courses"], + "image":"images/cards/course-nanodegree-lg.jpg", + "lang":"en", + "type":"online course" + }, + { + "title":"Advanced Android App Development", + "titleFriendly":"", + "summary":"Productionize and publish your apps.", + "url":"https://www.udacity.com/course/advanced-android-app-development--ud855", + "group":"", + "keywords": ["android, experts"], + "tags": ["courses"], + "image":"images/cards/course-ud855.jpg", + "lang":"en", + "type":"online course" + }, + { + "title":"Android Ubiquitous Computing", + "titleFriendly":"", + "summary":"Extend your apps to Wear, TV, and Auto.", + "url":"https://www.udacity.com/course/android-ubiquitous-computing--ud875", + "group":"", + "keywords": ["wear, tv, auto"], + "tags": ["courses"], + "image":"images/cards/course-ud875.jpg", + "lang":"en", + "type":"online course" + }, + { + "title":"Google Play Services", + "titleFriendly":"", + "summary":"Use Google APIs to improve your apps.", + "url":"https://www.udacity.com/course/google-play-services--ud876", + "group":"", + "keywords": ["google, play services, google services"], + "tags": ["courses"], + "image":"images/cards/course-ud876.jpg", + "lang":"en", + "type":"online course" + }, + { + "title":"Android Design for Developers", + "titleFriendly":"", + "summary":"Learn how to make your apps material.", + "url":"https://www.udacity.com/course/android-design-for-developers--ud862", + "group":"", + "keywords": ["design, pure, material"], + "tags": ["courses"], + "image":"images/cards/course-ud862.jpg", + "lang":"en", + "type":"online course" + }, + { + "title":"Android Development for Beginners", + "titleFriendly":"", + "summary":"Make your first Android app, even if you don't write code.", + "url":"https://www.udacity.com/course/android-development-for-beginners--ud837", + "group":"", + "keywords": ["firstapp",], + "tags": ["courses"], + "image":"images/cards/course-ud837.jpg", + "lang":"en", + "type":"online course" + }, + { + "title":"Gradle for Android and Java", + "titleFriendly":"", + "summary":"Build better apps through automation", + "url":"https://www.udacity.com/course/gradle-for-android-and-java--ud867", + "group":"", + "keywords": ["gradle","studio", "sdk"], + "tags": ["courses"], + "image":"images/cards/course-ud867.jpg", + "lang":"en", + "type":"online course" + }, + { "title":"Watch Faces for Android Wear", "titleFriendly":"", "summary":"Watch faces let you customize the most prominent UI feature of Android wearables. The API is simple enough for rapid development and flexible enough to build something awesome.", diff --git a/docs/html/preview/index.jd b/docs/html/preview/index.jd index 3b5fdbd..da7b5ea 100644 --- a/docs/html/preview/index.jd +++ b/docs/html/preview/index.jd @@ -1,32 +1,29 @@ -page.title=M Developer Preview -page.tags=preview -meta.tags="preview" +page.title=Android M Developer Preview +page.tags="preview", +meta.tags="preview, M preview" fullpage=true -page.viewport_width=970 section.landing=true header.hide=1 footer.hide=1 @jd:body -
+
-
- +
+
-
-

M Developer Preview

+
+

Android M Developer Preview

- Get ready for the next official release of the platform. The preview program gives - you an advance look at new APIs, features, and behaviors coming to Android. - Test your apps and give us feedback! + Get ready for the next version of Android. Test your apps on Nexus 5, 6, 9, and + Player. Explore what's new — a runtime permissions model, power saving Volta features, and new assist technology.

- + - Get started + Get Started!
-
@@ -38,6 +35,7 @@ footer.hide=1
+
-- cgit v1.1