Merge "NDK filesizes and hashes updated" into klp-modular-docs
diff --git a/docs/html/distribute/googleplay/edu/about.jd b/docs/html/distribute/googleplay/edu/about.jd
index 60d9402..469b899 100644
--- a/docs/html/distribute/googleplay/edu/about.jd
+++ b/docs/html/distribute/googleplay/edu/about.jd
@@ -21,16 +21,6 @@
directly to classrooms and schools.
</p>
-
-<div class="resource-widget resource-flow-layout col-13" style="height:323px"
- data-query="collection:distribute/googleplay/gpfe/highlight"
- data-sortOrder="-timestamp"
- data-cardSizes="18x6,"
- data-maxResults="1"></div>
-
-
-<!-- <div class="center-img"><img src="{@docRoot}images/gp-edu-hero14.jpg" class="" /></div> -->
-
<p>
If you have an educational app, include it in Google Play for Education.
Google Play for Education can help your innovative educational apps gain
diff --git a/docs/html/distribute/googleplay/edu/start.jd b/docs/html/distribute/googleplay/edu/start.jd
index 136611c..067a15f 100644
--- a/docs/html/distribute/googleplay/edu/start.jd
+++ b/docs/html/distribute/googleplay/edu/start.jd
@@ -1,4 +1,4 @@
-page.title=Publish Android Apps for Education
+page.title=Publish Apps
page.image=/distribute/images/play-education.jpg
meta.tags="education", "guidelines", "quality"
page.tags="education", "addendum"
diff --git a/docs/html/distribute/googleplay/edu/videos.jd b/docs/html/distribute/googleplay/edu/videos.jd
new file mode 100644
index 0000000..ca4da7a
--- /dev/null
+++ b/docs/html/distribute/googleplay/edu/videos.jd
@@ -0,0 +1,30 @@
+page.title=Video Resources
+page.image=http://i1.ytimg.com/vi/vzvpcEffvaE/maxresdefault.jpg
+meta.tags="education"
+page.tags="education"
+page.metaDescription=Watch video resources from Google and successful educational developers.
+
+@jd:body
+
+<p>
+With Google Play for Education, bringing your app to the classroom has never been easier. However,
+you may want to familiarize yourself with some best practices before diving in.
+To help you visualize what a great education app might look like, what Google Play for Education is all
+about, and how to achieve success with the platform, here is a selection of recent videos from
+Google and successful educational developers.
+</p>
+
+<h2>Developer Stories</h2>
+<div style="margin-top:20px" class="resource-widget resource-flow-layout wrap col-13
+ no-section" data-query="collection:distribute/edu/videos/stories" data-resourcestyle="card"
+ data-maxresults="6" data-cardsizes="18x12x2"></div>
+
+<h2>Best Practices</h2>
+<div style="margin-top:20px" class="resource-widget resource-flow-layout wrap col-13
+ no-section" data-query="collection:distribute/edu/videos/bestpractices" data-resourcestyle="card"
+ data-maxresults="6" data-cardsizes="18x6, 6x6, 6x6, 6x6"></div>
+
+<h2>Teacher/Classroom Experience</h2>
+<div style="margin-top:20px" class="resource-widget resource-flow-layout wrap col-13
+ no-section" data-query="collection:distribute/edu/videos/experience" data-resourcestyle="card"
+ data-maxresults="6" data-cardsizes="18x12x2"></div>
\ No newline at end of file
diff --git a/docs/html/distribute/googleplay/googleplay_toc.cs b/docs/html/distribute/googleplay/googleplay_toc.cs
index 36e424a..45464c7 100644
--- a/docs/html/distribute/googleplay/googleplay_toc.cs
+++ b/docs/html/distribute/googleplay/googleplay_toc.cs
@@ -18,24 +18,24 @@
</div>
</li>
<li class="nav-section">
- <div class="nav-section empty" style="font-weight:normal"><a href="<?cs var:toroot?>distribute/googleplay/edu/about.html">
+ <div class="nav-section-header" style="font-weight:normal"><a href="<?cs var:toroot?>distribute/googleplay/edu/about.html">
<span class="en">Google Play for Education</span>
</a>
</div>
- </li>
- <li class="nav-section">
- <div class="nav-section empty" style="font-weight:normal"><a href="<?cs var:toroot?>distribute/googleplay/edu/start.html">
- <span class="en">Publish Android Apps for Education</span>
- </a>
- </div>
+ <ul>
+ <li><a href="<?cs var:toroot?>distribute/googleplay/edu/start.html">
+ <span class="en">Publish Apps</span>
+ </a></li>
+ <li><a href="<?cs var:toroot?>distribute/googleplay/edu/videos.html">
+ <span class="en">Video Resources</span>
+ </a></li>
+ </ul>
</li>
</ul>
-
<script type="text/javascript">
<!--
buildToggleLists();
changeNavLang(getLangPref());
//-->
-</script>
-
+</script>
\ No newline at end of file
diff --git a/docs/html/guide/topics/ui/declaring-layout.jd b/docs/html/guide/topics/ui/declaring-layout.jd
index 6586c2f..40ae81e 100644
--- a/docs/html/guide/topics/ui/declaring-layout.jd
+++ b/docs/html/guide/topics/ui/declaring-layout.jd
@@ -88,8 +88,8 @@
<pre>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:orientation="vertical" >
<TextView android:id="@+id/text"
android:layout_width="wrap_content"
@@ -215,14 +215,14 @@
<ul>
<li><var>wrap_content</var> tells your view to size itself to the dimensions
required by its content</li>
- <li><var>fill_parent</var> (renamed <var>match_parent</var> in API Level 8)
+ <li><var>match_parent</var> (named <var>fill_parent</var> before API Level 8)
tells your view to become as big as its parent view group will allow.</li>
</ul>
<p>In general, specifying a layout width and height using absolute units such as
pixels is not recommended. Instead, using relative measurements such as
density-independent pixel units (<var>dp</var>), <var>wrap_content</var>, or
-<var>fill_parent</var>, is a better approach, because it helps ensure that
+<var>match_parent</var>, is a better approach, because it helps ensure that
your application will display properly across a variety of device screen sizes.
The accepted measurement types are defined in the
<a href="{@docRoot}guide/topics/resources/available-resources.html#dimension">
diff --git a/docs/html/guide/topics/ui/layout/grid.jd b/docs/html/guide/topics/ui/layout/grid.jd
index 52f453b..c2f1321 100644
--- a/docs/html/guide/topics/ui/layout/grid.jd
+++ b/docs/html/guide/topics/ui/layout/grid.jd
@@ -41,8 +41,8 @@
<pre>
<?xml version="1.0" encoding="utf-8"?>
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:stretchColumns="1">
<TableRow>
<TextView
@@ -82,8 +82,8 @@
<pre>
<?xml version="1.0" encoding="utf-8"?>
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:stretchColumns="1">
<TableRow>
diff --git a/docs/html/guide/topics/ui/layout/gridview.jd b/docs/html/guide/topics/ui/layout/gridview.jd
index bc189c4..b7dd94d 100644
--- a/docs/html/guide/topics/ui/layout/gridview.jd
+++ b/docs/html/guide/topics/ui/layout/gridview.jd
@@ -43,10 +43,10 @@
<li>Open the <code>res/layout/main.xml</code> file and insert the following:
<pre>
<?xml version="1.0" encoding="utf-8"?>
-<GridView xmlns:android="http://schemas.android.com/apk/res/android"
+<GridView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/gridview"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:columnWidth="90dp"
android:numColumns="auto_fit"
android:verticalSpacing="10dp"
diff --git a/docs/html/guide/topics/ui/layout/linear.jd b/docs/html/guide/topics/ui/layout/linear.jd
index 444dc71..fb55165 100644
--- a/docs/html/guide/topics/ui/layout/linear.jd
+++ b/docs/html/guide/topics/ui/layout/linear.jd
@@ -82,21 +82,21 @@
<pre>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:orientation="vertical" >
<EditText
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/to" />
<EditText
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/subject" />
<EditText
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="top"
diff --git a/docs/html/guide/topics/ui/layout/relative.jd b/docs/html/guide/topics/ui/layout/relative.jd
index 65c5617..145c838 100644
--- a/docs/html/guide/topics/ui/layout/relative.jd
+++ b/docs/html/guide/topics/ui/layout/relative.jd
@@ -82,13 +82,13 @@
<pre>
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:paddingLeft="16dp"
android:paddingRight="16dp" >
<EditText
android:id="@+id/name"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/reminder" />
<Spinner
@@ -114,4 +114,4 @@
</pre>
<p>For details about all the layout attributes available to each child view of a {@link
-android.widget.RelativeLayout}, see {@link android.widget.RelativeLayout.LayoutParams}.</p>
\ No newline at end of file
+android.widget.RelativeLayout}, see {@link android.widget.RelativeLayout.LayoutParams}.</p>
diff --git a/docs/html/jd_collections.js b/docs/html/jd_collections.js
index cd49ace..852db1f 100644
--- a/docs/html/jd_collections.js
+++ b/docs/html/jd_collections.js
@@ -7,12 +7,26 @@
"sdk/installing/studio.html"
]
},
- "index/devices": {
+ "distribute/edu/videos/stories": {
"title": "",
"resources": [
- "wear/index.html",
- "tv/index.html",
- "auto/index.html"
+ "https://www.youtube.com/watch?v=Idu7VcTTXfk",
+ "https://www.youtube.com/watch?v=iokH4SAIfRw"
+ ]
+ },
+ "distribute/edu/videos/bestpractices": {
+ "title": "",
+ "resources": [
+ "https://www.youtube.com/watch?v=iulXz8QTD1g",
+ "https://www.youtube.com/watch?v=IKhU180eJMo",
+ "https://www.youtube.com/watch?v=_AZ6UcPz-_g",
+ "https://www.youtube.com/watch?v=Eh2adsAyTKc"
+ ]
+ },
+ "distribute/edu/videos/experience": {
+ "title": "",
+ "resources": [
+ "http://youtu.be/vzvpcEffvaE"
]
},
"launch/static": {
@@ -45,7 +59,7 @@
"resources": [
"distribute/googleplay/edu/about.html",
"distribute/googleplay/edu/start.html",
- "https://developers.google.com/edu/faq"
+ "distribute/googleplay/edu/videos.html"
]
},
"distribute/essentials": {
diff --git a/docs/html/jd_extras.js b/docs/html/jd_extras.js
index dccdf7e..a4302ef 100644
--- a/docs/html/jd_extras.js
+++ b/docs/html/jd_extras.js
@@ -15,6 +15,90 @@
DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([
{
+ "title":"Quizlet Developer Story",
+ "titleFriendly":"",
+ "summary":"Quizlet is an extremely popular online learning tool for students. See how they optimized for the classroom with Android and the power of Google Play for Education.",
+ "url":"https://www.youtube.com/watch?v=Idu7VcTTXfk",
+ "group":"",
+ "keywords": [],
+ "tags": [
+ "#gpfe",
+ "#googleplay"
+ ],
+ "image":"http://i1.ytimg.com/vi/Idu7VcTTXfk/maxresdefault.jpg",
+ "type":"video"
+ },
+ {
+ "title":"Whats New in Google Play",
+ "titleFriendly":"",
+ "summary":"Learn about the vision and philosophy behind Google Play for Education",
+ "url":"https://www.youtube.com/watch?v=IKhU180eJMo",
+ "group":"",
+ "keywords": [],
+ "tags": [
+ "#gpfe",
+ "#googleplay"
+ ],
+ "image":"http://i1.ytimg.com/vi/IKhU180eJMo/maxresdefault.jpg",
+ "type":"video"
+ },
+ {
+ "title":"ClassDojo Developer Story",
+ "titleFriendly":"",
+ "summary":"ClassDojo is a classroom tool that helps teachers improve behavior in their classrooms quickly and easily. See how they optimized for the classroom with Android and the power of Google Play for Education.",
+ "url":"https://www.youtube.com/watch?v=iokH4SAIfRw",
+ "group":"",
+ "keywords": [],
+ "tags": [
+ "#gpfe",
+ "#googleplay"
+ ],
+ "image":"http://i1.ytimg.com/vi/iokH4SAIfRw/maxresdefault.jpg",
+ "type":"video"
+ },
+ {
+ "title":"5 Tips for Succeeding",
+ "titleFriendly":"",
+ "summary":"See inspirational ways of using technology in the classroom.",
+ "url":"https://www.youtube.com/watch?v=Eh2adsAyTKc",
+ "group":"",
+ "keywords": [],
+ "tags": [
+ "#gpfe",
+ "#googleplay"
+ ],
+ "image":"http://i1.ytimg.com/vi/Eh2adsAyTKc/maxresdefault.jpg",
+ "type":"video"
+ },
+ {
+ "title":"Optimizing Apps for Education",
+ "titleFriendly":"",
+ "summary":"Learn how to optimize your app for teachers and students.",
+ "url":"https://www.youtube.com/watch?v=_AZ6UcPz-_g",
+ "group":"",
+ "keywords": [],
+ "tags": [
+ "#gpfe",
+ "#googleplay"
+ ],
+ "image":"http://i1.ytimg.com/vi/_AZ6UcPz-_g/maxresdefault.jpg",
+ "type":"video"
+ },
+ {
+ "title":"Ideas and Tools for Building Innovative Education Apps",
+ "titleFriendly":"",
+ "summary":"Are you hungry to build an awesome app for education but don't quite know where to start? Come hear about apps that teachers want, and the APIs you're going to need to build them! In particular, we'll talk about app ideas that combine APIs for Google Drive, Google Login, Android Single Task Mode and more to build transformative Educational apps that will delight educators and kids in and out of the classroom.",
+ "url":"https://www.youtube.com/watch?v=iulXz8QTD1g",
+ "group":"",
+ "keywords": [],
+ "tags": [
+ "#gpfe",
+ "#googleplay"
+ ],
+ "image":"http://i1.ytimg.com/vi/iulXz8QTD1g/maxresdefault.jpg",
+ "type":"video"
+ },
+ {
"title":"Developer Registration",
"titleFriendly":"",
"summary":"Additional information about the registration process.",
@@ -699,10 +783,10 @@
"url": "http://youtu.be/vzvpcEffvaE",
"timestamp": 1383243492000,
"image": "http://i1.ytimg.com/vi/vzvpcEffvaE/maxresdefault.jpg",
- "title": "Introducing Google Play for Education",
- "summary": "Google Play for Education is a destination where schools can find great, teacher-approved, educational content—from videos and books, to educational apps—all in one place. Teachers can filter content by subject matter, grade and other criteria. Bulk purchase and instant distribution let educators bring your apps directly to classrooms and schools.",
+ "title": "Introducing Tablets with Google Play for Education",
+ "summary": "Schools in Hillsborough, New Jersey were among the first to try out Nexus 7 tablets with Google Play for Education. See the difference it made for students, teachers, and administrators.",
"keywords": [],
- "type": "youtube",
+ "type": "video",
"titleFriendly": ""
},
{
diff --git a/docs/html/preview/material/ui-widgets.jd b/docs/html/preview/material/ui-widgets.jd
index 31604d6..2266815 100644
--- a/docs/html/preview/material/ui-widgets.jd
+++ b/docs/html/preview/material/ui-widgets.jd
@@ -171,10 +171,10 @@
<p>Here's how to specify properties of <code>CardView</code>:</p>
<ul>
- <li>To set the corner radius in your layouts, use the <code>android:cardCornerRadius</code>
+ <li>To set the corner radius in your layouts, use the <code>card_view:cardCornerRadius</code>
attribute.</li>
<li>To set the corner radius in your code, use the <code>CardView.setRadius</code> method.</li>
- <li>To set the background color of a card, use the <code>android:cardBackgroundColor</code>
+ <li>To set the background color of a card, use the <code>card_view:cardBackgroundColor</code>
attribute.</li>
</ul>