summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmccormick@google.com <kmccormick@google.com>2012-11-15 09:51:56 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-15 09:51:56 -0800
commit480ac7fca61a29a7a1ca150ea0a583901971f137 (patch)
tree4d27de654db216e0ee9e1f3b5cfdf6bac60270d8
parentc3b6ee6068f7970c2a7f9da6f784adc2e6b2bceb (diff)
parent596d0e3881782096f7a6ea9959e8dc5f07004623 (diff)
downloadframeworks_base-480ac7fca61a29a7a1ca150ea0a583901971f137.zip
frameworks_base-480ac7fca61a29a7a1ca150ea0a583901971f137.tar.gz
frameworks_base-480ac7fca61a29a7a1ca150ea0a583901971f137.tar.bz2
am 596d0e38: am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
* commit '596d0e3881782096f7a6ea9959e8dc5f07004623': Doc Update: Fixing images
-rw-r--r--docs/html/guide/topics/appwidgets/index.jd6
-rw-r--r--docs/html/images/appwidgets/StackWidget.pngbin0 -> 2525 bytes
-rw-r--r--docs/html/images/appwidgets/appwidget.png (renamed from docs/html/images/appwidget.png)bin11818 -> 11818 bytes
-rw-r--r--docs/html/images/appwidgets/appwidget_collections.png (renamed from docs/html/images/appwidget_collections.png)bin43765 -> 43765 bytes
4 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/guide/topics/appwidgets/index.jd b/docs/html/guide/topics/appwidgets/index.jd
index 838ba96..6e6fa28 100644
--- a/docs/html/guide/topics/appwidgets/index.jd
+++ b/docs/html/guide/topics/appwidgets/index.jd
@@ -62,7 +62,7 @@ able to hold other App Widgets is called an App Widget host. The screenshot
below shows
the Music App Widget.</p>
-<img src="{@docRoot}images/appwidget.png" alt="" />
+<img src="{@docRoot}images/appwidgets/appwidget.png" alt="" />
<p>This document describes how to publish an App Widget using an App Widget
provider.</p>
@@ -882,7 +882,7 @@ href="{@docRoot}resources/samples/StackWidget/index.html">StackView Widget
sample</a>:</p>
<p>
-<img src="{@docRoot}resources/images/StackWidget.png" alt="" />
+<img src="{@docRoot}images/appwidgets/StackWidget.png" alt="" />
</p>
<p>This sample consists of a stack of 10 views, which display the values
@@ -1385,7 +1385,7 @@ collections when updates occur. It shows how the App Widget code interacts with
the {@link android.widget.RemoteViewsService.RemoteViewsFactory
RemoteViewsFactory}, and how you can trigger updates:</p>
-<img src="{@docRoot}images/appwidget_collections.png" alt="" />
+<img src="{@docRoot}images/appwidgets/appwidget_collections.png" alt="" />
<p>One feature of App Widgets that use collections is the ability to provide
users with up-to-date content. For example, consider the Android 3.0 Gmail
diff --git a/docs/html/images/appwidgets/StackWidget.png b/docs/html/images/appwidgets/StackWidget.png
new file mode 100644
index 0000000..f2f83a0
--- /dev/null
+++ b/docs/html/images/appwidgets/StackWidget.png
Binary files differ
diff --git a/docs/html/images/appwidget.png b/docs/html/images/appwidgets/appwidget.png
index ab6e3de..ab6e3de 100644
--- a/docs/html/images/appwidget.png
+++ b/docs/html/images/appwidgets/appwidget.png
Binary files differ
diff --git a/docs/html/images/appwidget_collections.png b/docs/html/images/appwidgets/appwidget_collections.png
index 4bce4a7..4bce4a7 100644
--- a/docs/html/images/appwidget_collections.png
+++ b/docs/html/images/appwidgets/appwidget_collections.png
Binary files differ