diff options
| author | Newton Allen <newt@google.com> | 2014-10-02 16:58:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-02 16:58:30 +0000 |
| commit | 58f75627d195082e263f6d6d8e3c46c6d0970e63 (patch) | |
| tree | 60e9421b57f25579ed8c5b7adc1735c885c89b81 /docs | |
| parent | 98bb023a8971d4744fbfc504118b09b04e181e38 (diff) | |
| parent | 94f5155d6c81b5fd3326a91e4a2670bccfddf284 (diff) | |
| download | frameworks_base-58f75627d195082e263f6d6d8e3c46c6d0970e63.zip frameworks_base-58f75627d195082e263f6d6d8e3c46c6d0970e63.tar.gz frameworks_base-58f75627d195082e263f6d6d8e3c46c6d0970e63.tar.bz2 | |
am 94f5155d: am c68aad9f: am d84ce32b: Merge "Fix some documentation typos." into lmp-dev
* commit '94f5155d6c81b5fd3326a91e4a2670bccfddf284':
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 |