summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2013-12-17 21:34:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-12-17 21:34:58 +0000
commit731ba04536a07582904b4bf64a9eed896cb93bc5 (patch)
treef294515bc660479b7dbc39f416d3cb7ae859d2ee /docs/html
parent5cdadb48d0e696352c21794861ba533214b06318 (diff)
parentd6fb69933d9376a391dd6551ca6cdb6e11c3198c (diff)
downloadframeworks_base-731ba04536a07582904b4bf64a9eed896cb93bc5.zip
frameworks_base-731ba04536a07582904b4bf64a9eed896cb93bc5.tar.gz
frameworks_base-731ba04536a07582904b4bf64a9eed896cb93bc5.tar.bz2
Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/distribute/googleplay/edu/faq.jd8
-rw-r--r--docs/html/distribute/googleplay/edu/guidelines.jd6
-rw-r--r--docs/html/distribute/googleplay/edu/start.jd15
3 files changed, 17 insertions, 12 deletions
diff --git a/docs/html/distribute/googleplay/edu/faq.jd b/docs/html/distribute/googleplay/edu/faq.jd
index 6afc107..0c3b185 100644
--- a/docs/html/distribute/googleplay/edu/faq.jd
+++ b/docs/html/distribute/googleplay/edu/faq.jd
@@ -258,7 +258,7 @@ excludeFromSuggestions=true
</dt>
<dd>
- If you’d like to reach users of Nexus tablets for schools we encourage you
+ If you’d like to reach tablet users in schools we encourage you
to build a native app for the optimal user experience. Considerations for
building your app and instructions for registering it can be found at
<a href="http://developer.android.com/edu">developer.android.com/edu</a>.
@@ -325,9 +325,9 @@ excludeFromSuggestions=true
</dt>
<dd>
- Nexus 7 is available for shipment now, and the Asus Transformer will be
- available in early 2014. We look forward to welcoming more Android devices
- into the Google in Education family soon.
+ Nexus 7 is available for shipment now, and the Asus Transformer and HP
+ Slate 8 Pro will be available in early 2014. We look forward to welcoming
+ more Android devices into the Google in Education family soon.
</dd>
<dt>
diff --git a/docs/html/distribute/googleplay/edu/guidelines.jd b/docs/html/distribute/googleplay/edu/guidelines.jd
index c4b719b..8427044 100644
--- a/docs/html/distribute/googleplay/edu/guidelines.jd
+++ b/docs/html/distribute/googleplay/edu/guidelines.jd
@@ -208,11 +208,11 @@ Google Play for Education.</p>
<h3 id="devices">Android tablets</h3>
-<p>Google Play for Education uses primarily Nexus 7 devices, so
-your testing can focus on that specific hardware device. You can purchase the
+<p>Google Play for Education offers a range of 7-inch through 10-inch tablets, so
+your testing should focus on those hardware devices. You can purchase the Nexus 7
device from <a href="https://play.google.com/store/devices/details?id=nexus_7_16gb"
target="_android">Google Play</a> and other stores. Although testing on Nexus
-devices is preferred, you can test on other 7-inch (or 10-inch) tablets or virtual
+devices is preferred, you can test on other 7-inch or 10-inch tablets or virtual
devices if you don't have access to Nexus devices.</p>
<h3 id="conditions">Test conditions</h3>
diff --git a/docs/html/distribute/googleplay/edu/start.jd b/docs/html/distribute/googleplay/edu/start.jd
index 01d4406..dbfbb6a 100644
--- a/docs/html/distribute/googleplay/edu/start.jd
+++ b/docs/html/distribute/googleplay/edu/start.jd
@@ -84,11 +84,16 @@ tablets &mdash; a good starting point is the <a
href="{@docRoot}distribute/googleplay/quality/tablet.html">Tablet App Quality
Guidelines</a>. </p>
-<p>Throughout design and development, it's important to have a suitable device
-on which to prototype and test your user experience. It's highly recommended
-that you acquire one or more tablet devices and set up your testing environment
-as early as possible. The recommended hardware device that replicates the Google
-Play for Education environment is the Nexus 7, which is available from <a href="https://play.google.com/store/devices/details?id=nexus_7_16gb" target="_android">Google Play</a> and other stores.</p>
+<p>
+ Throughout design and development, it's important to have suitable devices
+ on which to prototype and test your user experience. It's highly recommended
+ that you acquire 7-inch and 10-inch tablet devices and set up
+ your testing environment as early as possible. The recommended 7-inch
+ hardware device that replicates the Google Play for Education environment is
+ the Nexus 7, which is available from <a href=
+ "https://play.google.com/store/devices/details?id=nexus_7_16gb" target=
+ "_android">Google Play</a> and other stores.
+</p>
<p>Proper testing and quality assurance are key aspects of delivering a great
app for teachers and students. Make sure you set up a <a