Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4459827f authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 25505f95: am cdf5106a: docs: a few doc bugs 

* commit '25505f95':
  docs: a few doc bugs
parents 8429f43b 25505f95

core/java/android/app/Activity.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {

    }

docs/html/distribute/googleplay/promote/badges.jd

+2 −2
Original line number Diff line number Diff line
@@ -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

docs/html/training/sharing/send.jd

+1 −1
Original line number Diff line number Diff line
@@ -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>