summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/html/about/dashboards/index.jd50
-rw-r--r--docs/html/training/wearables/apps/index.jd2
-rw-r--r--docs/html/training/wearables/apps/layouts.jd1
-rw-r--r--docs/html/training/wearables/apps/packaging.jd2
-rw-r--r--docs/html/training/wearables/data-layer/assets.jd4
-rw-r--r--docs/html/training/wearables/data-layer/data-items.jd2
6 files changed, 30 insertions, 31 deletions
diff --git a/docs/html/about/dashboards/index.jd b/docs/html/about/dashboards/index.jd
index 32b9c9e..2a2417a 100644
--- a/docs/html/about/dashboards/index.jd
+++ b/docs/html/about/dashboards/index.jd
@@ -64,7 +64,7 @@ Platform Versions</a>.</p>
</div>
-<p style="clear:both"><em>Data collected during a 7-day period ending on June 4, 2014.
+<p style="clear:both"><em>Data collected during a 7-day period ending on July 7, 2014.
<br/>Any versions with less than 0.1% distribution are not shown.</em>
</p>
@@ -95,7 +95,7 @@ Screens</a>.</p>
</div>
-<p style="clear:both"><em>Data collected during a 7-day period ending on June 4, 2014.
+<p style="clear:both"><em>Data collected during a 7-day period ending on July 7, 2014.
<br/>Any screen configurations with less than 0.1% distribution are not shown.</em></p>
@@ -114,7 +114,7 @@ support for any lower version (for example, support for version 2.0 also implies
<img alt="" style="float:right"
-src="//chart.googleapis.com/chart?chs=400x250&cht=p&chd=t%3A0.1%2C83.6%2C16.3&chf=bg%2Cs%2C00000000&chl=GL%201.1%20only%7CGL%202.0%7CGL%203.0&chco=c4df9b%2C6fad0c" />
+src="//chart.googleapis.com/chart?chs=400x250&cht=p&chd=t%3A0.1%2C81.7%2C18.2&chf=bg%2Cs%2C00000000&chl=GL%201.1%20only%7CGL%202.0%7CGL%203.0&chco=c4df9b%2C6fad0c" />
<p>To declare which version of OpenGL ES your application requires, you should use the {@code
android:glEsVersion} attribute of the <a
@@ -136,17 +136,17 @@ uses.</p>
</tr>
<tr>
<td>2.0</th>
-<td>83.6%</td>
+<td>81.7%</td>
</tr>
<tr>
<td>3.0</th>
-<td>16.3%</td>
+<td>18.2%</td>
</tr>
</table>
-<p style="clear:both"><em>Data collected during a 7-day period ending on June 4, 2014</em></p>
+<p style="clear:both"><em>Data collected during a 7-day period ending on July 7, 2014</em></p>
@@ -164,42 +164,42 @@ uses.</p>
var VERSION_DATA =
[
{
- "chart": "//chart.googleapis.com/chart?chl=Froyo%7CGingerbread%7CIce%20Cream%20Sandwich%7CJelly%20Bean%7CKitKat&chf=bg%2Cs%2C00000000&chd=t%3A0.8%2C14.9%2C12.3%2C58.4%2C13.6&chco=c4df9b%2C6fad0c&cht=p&chs=500x250",
+ "chart": "//chart.googleapis.com/chart?cht=p&chs=500x250&chf=bg%2Cs%2C00000000&chd=t%3A0.7%2C13.5%2C11.4%2C56.5%2C17.9&chco=c4df9b%2C6fad0c&chl=Froyo%7CGingerbread%7CIce%20Cream%20Sandwich%7CJelly%20Bean%7CKitKat",
"data": [
{
"api": 8,
"name": "Froyo",
- "perc": "0.8"
+ "perc": "0.7"
},
{
"api": 10,
"name": "Gingerbread",
- "perc": "14.9"
+ "perc": "13.5"
},
{
"api": 15,
"name": "Ice Cream Sandwich",
- "perc": "12.3"
+ "perc": "11.4"
},
{
"api": 16,
"name": "Jelly Bean",
- "perc": "29.0"
+ "perc": "27.8"
},
{
"api": 17,
"name": "Jelly Bean",
- "perc": "19.1"
+ "perc": "19.7"
},
{
"api": 18,
"name": "Jelly Bean",
- "perc": "10.3"
+ "perc": "9.0"
},
{
"api": 19,
"name": "KitKat",
- "perc": "13.6"
+ "perc": "17.9"
}
]
}
@@ -216,27 +216,27 @@ var SCREEN_DATA =
"Large": {
"hdpi": "0.6",
"ldpi": "0.6",
- "mdpi": "4.4",
- "tvdpi": "1.6",
+ "mdpi": "4.5",
+ "tvdpi": "1.7",
"xhdpi": "0.6"
},
"Normal": {
- "hdpi": "34.2",
- "mdpi": "12.0",
- "xhdpi": "19.6",
- "xxhdpi": "14.6"
+ "hdpi": "34.5",
+ "mdpi": "11.4",
+ "xhdpi": "19.4",
+ "xxhdpi": "15.3"
},
"Small": {
- "ldpi": "7.2"
+ "ldpi": "6.8"
},
"Xlarge": {
"hdpi": "0.3",
- "mdpi": "4.0",
- "xhdpi": "0.3"
+ "mdpi": "3.9",
+ "xhdpi": "0.4"
}
},
- "densitychart": "//chart.googleapis.com/chart?chl=ldpi%7Cmdpi%7Ctvdpi%7Chdpi%7Cxhdpi%7Cxxhdpi&chf=bg%2Cs%2C00000000&chd=t%3A7.8%2C20.4%2C1.6%2C35.1%2C20.5%2C14.6&chco=c4df9b%2C6fad0c&cht=p&chs=400x250",
- "layoutchart": "//chart.googleapis.com/chart?chl=Xlarge%7CLarge%7CNormal%7CSmall&chf=bg%2Cs%2C00000000&chd=t%3A4.6%2C7.8%2C80.4%2C7.2&chco=c4df9b%2C6fad0c&cht=p&chs=400x250"
+ "densitychart": "//chart.googleapis.com/chart?cht=p&chs=400x250&chf=bg%2Cs%2C00000000&chd=t%3A7.4%2C19.8%2C1.7%2C35.4%2C20.4%2C15.3&chco=c4df9b%2C6fad0c&chl=ldpi%7Cmdpi%7Ctvdpi%7Chdpi%7Cxhdpi%7Cxxhdpi",
+ "layoutchart": "//chart.googleapis.com/chart?cht=p&chs=400x250&chf=bg%2Cs%2C00000000&chd=t%3A4.6%2C8.0%2C80.6%2C6.8&chco=c4df9b%2C6fad0c&chl=Xlarge%7CLarge%7CNormal%7CSmall"
}
];
diff --git a/docs/html/training/wearables/apps/index.jd b/docs/html/training/wearables/apps/index.jd
index a0d02fb..7d961b7 100644
--- a/docs/html/training/wearables/apps/index.jd
+++ b/docs/html/training/wearables/apps/index.jd
@@ -69,6 +69,6 @@ in ADT. The rest of this training assumes you're using Android Studio.
<dd>Learn how to package a wearable app inside a
handheld app. This allows the system to install the wearable app automatically when
users install the companion handheld app from the Google Play store.</dd>
- <dt><a href="{@docRoot}training/wearables/apps/packaging.html">Debugging over Bluetooth</a></dt>
+ <dt><a href="{@docRoot}training/wearables/apps/bt-debugging.html">Debugging over Bluetooth</a></dt>
<dd>Learn how to debug your wearable over Bluetooth instead of USB.</dd>
</dl> \ No newline at end of file
diff --git a/docs/html/training/wearables/apps/layouts.jd b/docs/html/training/wearables/apps/layouts.jd
index cdd7d12..e9eacd3 100644
--- a/docs/html/training/wearables/apps/layouts.jd
+++ b/docs/html/training/wearables/apps/layouts.jd
@@ -11,7 +11,6 @@ page.title=Creating Custom Layouts
<li><a href="#UiLibrary">Create Layouts with the Wearable UI Library</li>
</ol>
-<!--STOPSHIP: link these -->
<h2>You should also read</h2>
<ul>
<li><a href="{@docRoot}design/wear/index.html">Android Wear Design Principles</a></li>
diff --git a/docs/html/training/wearables/apps/packaging.jd b/docs/html/training/wearables/apps/packaging.jd
index ea29c9d..3660099 100644
--- a/docs/html/training/wearables/apps/packaging.jd
+++ b/docs/html/training/wearables/apps/packaging.jd
@@ -34,7 +34,7 @@ Android Studio directly to the wearable is required.</p>
<pre>
dependencies {
compile 'com.google.android.gms:play-services:5.0.+@aar'
- compile files('../../prebuilt-libs/android-support-v4.jar')
+ compile 'com.android.support:support-v4:20.0.+''
<b>wearApp project(':wearable')</b>
}
</pre>
diff --git a/docs/html/training/wearables/data-layer/assets.jd b/docs/html/training/wearables/data-layer/assets.jd
index 73ebb73..52ccbb0 100644
--- a/docs/html/training/wearables/data-layer/assets.jd
+++ b/docs/html/training/wearables/data-layer/assets.jd
@@ -91,8 +91,8 @@ public void onDataChanged(DataEventBuffer dataEvents) {
for (DataEvent event : dataEvents) {
if (event.getType() == DataEvent.TYPE_CHANGED &&
event.getDataItem().getUri().getPath().equals("/image")) {
- BundleDataItem bundleDataItem = BundleDataItem.fromDataItem(dataItem);
- Asset profileAsset = bundleDataItem.getData().getParcelable("profileImage");
+ DataMapItem dataMapItem = DataMapItem.fromDataItem(dataItem);
+ Asset profileAsset = dataMapItem.getDataMap().getAsset("profileImage");
Bitmap bitmap = loadBitmapFromAsset(profileAsset);
// Do something with the bitmap
}
diff --git a/docs/html/training/wearables/data-layer/data-items.jd b/docs/html/training/wearables/data-layer/data-items.jd
index c39e37a..63c32ea 100644
--- a/docs/html/training/wearables/data-layer/data-items.jd
+++ b/docs/html/training/wearables/data-layer/data-items.jd
@@ -120,5 +120,5 @@ public void onDataChanged(DataEventBuffer dataEvents) {
<p>
This is just a snippet that requires more implementation details. Learn about
how to implement a full listener service or activity in
-<a href="{@docRoot}training/wearables/data-layer/listeners.html">Listening for Data Layer Events</a>.
+<a href="{@docRoot}training/wearables/data-layer/events.html">Listening for Data Layer Events</a>.
</p> \ No newline at end of file
generated by cgit v1.1 at 2025-01-16 15:57:44 +0000