diff options
author | Scott Main <smain@google.com> | 2014-02-20 21:27:47 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-20 21:27:47 +0000 |
commit | 83b6e4b937a2197198cefffecca94c919f9aa8cf (patch) | |
tree | c882d91ee8763622ff0d3149092973b92d570587 | |
parent | 2f2c0e75af6c1a52e067903d0cf9aa4cddd4e37e (diff) | |
parent | 5ef8d14d38654e6309babf46f64f5a296df5c169 (diff) | |
download | frameworks_base-83b6e4b937a2197198cefffecca94c919f9aa8cf.zip frameworks_base-83b6e4b937a2197198cefffecca94c919f9aa8cf.tar.gz frameworks_base-83b6e4b937a2197198cefffecca94c919f9aa8cf.tar.bz2 |
am 5ef8d14d: am 72eff55b: am d43ad2f3: am 4c68c4ed: am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs
* commit '5ef8d14d38654e6309babf46f64f5a296df5c169':
update intent examples for maps bug: 12661490 bug: 12957723
-rw-r--r-- | docs/html/guide/components/intents-common.jd | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/docs/html/guide/components/intents-common.jd b/docs/html/guide/components/intents-common.jd index f09ef9f..506cf9d 100644 --- a/docs/html/guide/components/intents-common.jd +++ b/docs/html/guide/components/intents-common.jd @@ -880,13 +880,17 @@ the location information in the intent data with one of the schemes defined belo (closest) zoom level is 23. <p>Example: <code>"geo:47.6,-122.3?z=11"</code> </dd> - <dt><code>geo:0,0?q=lat,lng(label)</code></dt> - <dd>Show the map at the given longitude and latitude with a string label. - <p>Example: <code>"geo:0,0?q=34.99,-106.61(Treasure)"</code> - </dd> + <dt><code>geo:0,0?q=lat,lng(label)</code></dt> + <dd>Show the map at the given longitude and latitude with a string label. + <p>Example: <code>"geo:0,0?q=34.99,-106.61(Treasure)"</code> + </dd> <dt><code>geo:0,0?q=my+street+address</code></dt> <dd>Show the location for "my street address" (may be a specific address or location query). - <p>Example: <code>"geo:0,0?q=1600+amphitheatre+parkway+ca"</code> + <p>Example: <code>"geo:0,0?q=1600+Amphitheatre+Parkway%2C+CA"</code></p> + <p class="note"><strong>Note:</strong> All strings passed in the {@code geo} URI must + be encoded. For example, the string {@code 1st & Pike, Seattle} should become + {@code 1st%20%26%20Pike%2C%20Seattle}. Spaces in the string can be encoded with + {@code %20} or replaced with the plus sign ({@code +}).</p> </dd> </dl> </dd> |