summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorsmain@google.com <smain@google.com>2014-10-19 00:08:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-19 00:08:43 +0000
commita5704a0896ce9d7b229d33f587e982ce26ca9301 (patch)
tree76c84b993b9b5e6f9f39aa6b79ff80f556e1a294 /docs
parenta525b72ea6aad7443e4761758cba118c503ff3a1 (diff)
parentf3e585ab20be006c8d5f3a033f9ade8a9dc6b55f (diff)
downloadframeworks_base-a5704a0896ce9d7b229d33f587e982ce26ca9301.zip
frameworks_base-a5704a0896ce9d7b229d33f587e982ce26ca9301.tar.gz
frameworks_base-a5704a0896ce9d7b229d33f587e982ce26ca9301.tar.bz2
am f3e585ab: Merge "add glare effect to screenshot and add 1x version with srcset" into lmp-dev
* commit 'f3e585ab20be006c8d5f3a033f9ade8a9dc6b55f': add glare effect to screenshot and add 1x version with srcset
Diffstat (limited to 'docs')
-rw-r--r--docs/html/about/versions/lollipop.jd4
-rw-r--r--docs/html/images/versions/recents_screen.pngbin490653 -> 146321 bytes
-rw-r--r--docs/html/images/versions/recents_screen_2x.pngbin0 -> 491677 bytes
3 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/about/versions/lollipop.jd b/docs/html/about/versions/lollipop.jd
index d94d799..2d4072b 100644
--- a/docs/html/about/versions/lollipop.jd
+++ b/docs/html/about/versions/lollipop.jd
@@ -142,7 +142,7 @@ video apps and games to display smooth synchronized content.</p>
-<img src="{@docRoot}images/versions/recents_screen.png" style="float:right; margin:0 0 40px 60px" width="300" height="521" />
+<img src="{@docRoot}images/versions/recents_screen_2x.png" srcset="{@docRoot}images/versions/recents_screen.png 1x, {@docRoot}images/versions/recents_screen_2x.png 2x" style="float:right; margin:0 0 40px 60px" width="300" height="521" />
<h2 id="Documents">Document-centric apps</h2>
@@ -267,4 +267,4 @@ Android 4.2.</p>
<img src="{@docRoot}images/versions/battery_historian.png" srcset="{@docRoot}images/versions/battery_historian@2x.png 2x" alt="" width="760" height="462" />
<p class="img-caption">Battery Historian is a new tool to convert the statistics from <code>dumpsys batterystats</code> into a visualization for battery-related debugging. You can find it at <a href="https://github.com/google/battery-historian"
->https://github.com/google/battery-historian</a>.</p> \ No newline at end of file
+>https://github.com/google/battery-historian</a>.</p>
diff --git a/docs/html/images/versions/recents_screen.png b/docs/html/images/versions/recents_screen.png
index a6619c5..04d4d74 100644
--- a/docs/html/images/versions/recents_screen.png
+++ b/docs/html/images/versions/recents_screen.png
Binary files differ
diff --git a/docs/html/images/versions/recents_screen_2x.png b/docs/html/images/versions/recents_screen_2x.png
new file mode 100644
index 0000000..127f69a
--- /dev/null
+++ b/docs/html/images/versions/recents_screen_2x.png
Binary files differ