diff options
author | Newton Allen <newt@google.com> | 2014-10-02 19:43:39 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-02 19:43:39 +0000 |
commit | df2b8a1cb98f55dfa3ecd3c73a58a4e2ce7a325c (patch) | |
tree | 51e570c68b8907ba71b0366452825991fe998aa6 /docs | |
parent | 746bf3b9b4815dcdb25610402a878b0322618293 (diff) | |
parent | 58f75627d195082e263f6d6d8e3c46c6d0970e63 (diff) | |
download | frameworks_base-df2b8a1cb98f55dfa3ecd3c73a58a4e2ce7a325c.zip frameworks_base-df2b8a1cb98f55dfa3ecd3c73a58a4e2ce7a325c.tar.gz frameworks_base-df2b8a1cb98f55dfa3ecd3c73a58a4e2ce7a325c.tar.bz2 |
am 58f75627: am 94f5155d: am c68aad9f: am d84ce32b: Merge "Fix some documentation typos." into lmp-dev
* commit '58f75627d195082e263f6d6d8e3c46c6d0970e63':
Fix some documentation typos.
Diffstat (limited to 'docs')
-rw-r--r-- | docs/html/guide/topics/resources/drawable-resource.jd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/guide/topics/resources/drawable-resource.jd b/docs/html/guide/topics/resources/drawable-resource.jd index dee28fe..06bd2d0 100644 --- a/docs/html/guide/topics/resources/drawable-resource.jd +++ b/docs/html/guide/topics/resources/drawable-resource.jd @@ -67,7 +67,7 @@ android:drawable="@color/green"}).</p> <h2 id="Bitmap">Bitmap</h2> -<p>A bitmap image. Android supports bitmap files in a three formats: +<p>A bitmap image. Android supports bitmap files in three formats: {@code .png} (preferred), {@code .jpg} (acceptable), {@code .gif} (discouraged).</p> <p>You can reference a bitmap file directly, using the filename as the resource ID, or create an |