summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Scott Main <smain@google.com> 2013-01-08 20:18:35 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2013-01-08 20:18:35 -0800
commit782b0f7141972e0535f1e905d650073f4e7f55dd (patch)
tree8df9d318a9ddb08da5b97e3c102460f0b97572a0
parent2b8603c200843bc50768e2281fb1e2a953316e0c (diff)
parent4459827f7db379031e658b2153aac1f7c882adc6 (diff)
am 4459827f: am 25505f95: am cdf5106a: docs: a few doc bugs
* commit '4459827f7db379031e658b2153aac1f7c882adc6': docs: a few doc bugs
-rw-r--r--core/java/android/app/Activity.java2
-rw-r--r--docs/html/distribute/googleplay/promote/badges.jd4
-rw-r--r--docs/html/training/sharing/send.jd2
3 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 4f3f2451a912..e96b4752e26b 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -2838,7 +2838,7 @@ public class Activity extends ContextThemeWrapper
* item has been selected.
* <p>
* It is not safe to hold onto the context menu after this method returns.
- * {@inheritDoc}
+ *
*/
public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
}
diff --git a/docs/html/distribute/googleplay/promote/badges.jd b/docs/html/distribute/googleplay/promote/badges.jd
index c084e2c9775b..0027f5906029 100644
--- a/docs/html/distribute/googleplay/promote/badges.jd
+++ b/docs/html/distribute/googleplay/promote/badges.jd
@@ -61,7 +61,7 @@ var APP_LANGS = ['it','pt-br','pt-pt','nl','ko','ja','fr','es','es-419','en','de
// variables for creating 'try it out' demo button
var imagePath = "https://developer.android.com/images/brand/"
-var linkStart = "<a href=\"http://play.google.com/store/";
+var linkStart = "<a href=\"https://play.google.com/store/";
var imageStart = "\">\n"
+ " <img alt=\"";
// leaves opening for the alt text value
@@ -70,7 +70,7 @@ var imageSrc = "\"\n src=\"" + imagePath;
var imageEnd = ".png\" />\n</a>";
// variables for creating code snippet
-var linkStartCode = "&lt;a href=\"http://play.google.com/store/";
+var linkStartCode = "&lt;a href=\"https://play.google.com/store/";
var imageStartCode = "\"&gt;\n"
+ " &lt;img alt=\"";
// leaves opening for the alt text value
diff --git a/docs/html/training/sharing/send.jd b/docs/html/training/sharing/send.jd
index 15b38e50dc9b..9cb8eac6af10 100644
--- a/docs/html/training/sharing/send.jd
+++ b/docs/html/training/sharing/send.jd
@@ -95,7 +95,7 @@ Intent sendIntent = new Intent();
sendIntent.setAction(Intent.ACTION_SEND);
sendIntent.putExtra(Intent.EXTRA_TEXT, &quot;This is my text to send.&quot;);
sendIntent.setType(&quot;text/plain&quot;);
-startActivity(<strong>Intent.createChooser(sendIntent, getResources().getText(R.string.send_to)</strong>);
+startActivity(<strong>Intent.createChooser(sendIntent, getResources().getText(R.string.send_to))</strong>);
</pre>
<p>The resulting dialog is shown in figure 1.</p>