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

Commit 40e6ac91 authored by Dirk Dougherty's avatar Dirk Dougherty
Browse files

resolved conflicts for merge of 45fed517 to mnc-dev 

Change-Id: I08e44ee778436e5592e73ced82356f015cbdfe74
parents 876677ef 45fed517

docs/html/design/index.jd

+6 −2
Original line number Diff line number Diff line
@@ -41,8 +41,12 @@ footer.hide=1 
    </div>

  </div>

</section>



<section class="dac-section dac-gray dac-small dac-invert"><div class="wrap">

<div class="wrap dac-offset-parent">

  <a class="dac-fab dac-scroll-button" data-scroll-button href="#latest">

    <i class="dac-sprite dac-arrow-down-gray"></i>

  </a>

</div>

<section class="dac-section dac-gray dac-small dac-invert" id="latest"><div class="wrap">

  <h2 class="norule">Latest</h2>

  <div class="resource-widget resource-flow-layout col-16"

       data-query="collection:design/landing/latest"

docs/html/develop/index.jd

+40 −28
Original line number Diff line number Diff line
@@ -9,41 +9,52 @@ tabbedList=1 
excludeFromSuggestions=true

@jd:body



<section class="dac-expand dac-hero dac-light">

    <section class="dac-expand dac-hero dac-blue">

  <div class="wrap">

    <div class="cols dac-hero-content">

      <div class="col-1of2 col-push-1of2 dac-hero-figure">

        <img class="dac-hero-image" src="/images/develop/hero-android-studio-on-device.png">

      </div>

      <div class="col-1of2 col-pull-1of2">

        <h1 class="dac-hero-title">Start!</h1>

        <h1 class="dac-hero-title">Get Started with Android</h1>

        <p class="dac-hero-description">

          Set up your environment and create an app. Build faster with sample projects and templates.

        Everything you need to build incredible app experiences on phones and tablets, Wear, TV, and Auto. </p>



<!--Set up your environment and create an app. Build faster with sample projects and templates.-->

        </p>

        <a class="dac-hero-cta" href="/sdk/index.html">

        <a class="dac-hero-cta" href="{@docRoot}sdk/index.html">

          <span class="dac-sprite dac-auto-chevron"></span>

          Set up Android Studio

        </a><br>

        <a class="dac-hero-cta" href="/training/basics/firstapp/index.html">

        <a class="dac-hero-cta" href="{@docRoot}training/basics/firstapp/index.html">

          <span class="dac-sprite dac-auto-chevron"></span>

          Make your first app

          Build your first app

        </a><br>

        <a class="dac-hero-cta" href="/guide/index.html">

        <a class="dac-hero-cta" href="{@docRoot}guide/index.html">

          <span class="dac-sprite dac-auto-chevron"></span>

          Learn about Android

        </a><br>

        <a class="dac-hero-cta" href="{@docRoot}guide/index.html">

          <span class="dac-sprite dac-auto-chevron"></span>

          Sample projects

        </a><br>

      </div>

    </div>

    <div class="dac-section dac-small">

    <!--<div class="dac-section dac-small">

      <div class="resource-widget resource-flow-layout col-16"

           data-query="collection:develop/landing/mainlinks"

           data-cardSizes="6x2"

           data-maxResults="6"></div>

    </div>

    </div>-->

  </div>

</section>

<div class="wrap dac-offset-parent">

  <a class="dac-fab dac-scroll-button" data-scroll-button href="#latest">

    <i class="dac-sprite dac-arrow-down-gray"></i>

  </a>

</div>



<section class="dac-section dac-gray dac-small dac-invert"><div class="wrap">

<section class="dac-section dac-gray dac-small dac-invert" id="latest"><div class="wrap">

  <h2 class="norule">Latest</h2>

  <div class="resource-widget resource-flow-layout col-16"

       data-query="collection:develop/landing/latest"
@@ -51,6 +62,19 @@ excludeFromSuggestions=true 
       data-maxResults="3"></div>

</div></section>



<section class="dac-section dac-section-light"><div class="wrap">

  <h1 class="dac-section-title">Tools for building apps</h1>

  <div class="dac-section-subtitle">

    Insights into Android's tools and libraries to speed your development.

  </div>

  <div class="resource-widget resource-flow-layout col-16"

       data-query="collection:develop/landing/tools"

       data-cardSizes="6x6"

       data-maxResults="3"

       data-sortOrder="random"></div>

  <ul class="dac-section-links">

  </ul>

</div></section>



<section class="dac-section dac-light"><div class="wrap">

  <h1 class="dac-section-title">Android performance patterns</h1>
@@ -69,21 +93,8 @@ excludeFromSuggestions=true 
  </ul>

</div></section>



<section class="dac-section dac-section-light"><div class="wrap">

  <h1 class="dac-section-title">Tools for building apps</h1>

  <div class="dac-section-subtitle">

    Insights into Android's tools and libraries to speed your development.

  </div>

  <div class="resource-widget resource-flow-layout col-16"

       data-query="collection:develop/landing/tools"

       data-cardSizes="6x6"

       data-maxResults="3"></div>

  <ul class="dac-section-links">

  </ul>

</div></section>



<section class="dac-section dac-light"><div class="wrap">

  <h1 class="dac-section-title">Ubiquitous computing</h1>

<section class="dac-section dac-gray"><div class="wrap">

  <h1 class="dac-section-title">Ubiquitous computing on Android</h1>

  <div class="dac-section-subtitle">

    Opening up new stuff.

  </div>
@@ -107,9 +118,10 @@ excludeFromSuggestions=true 
  </ul>

</div></section>



<section class="dac-section dac-gray"><div class="wrap">

  <h1 class="dac-section-title">Courses</h1>

  <div class="dac-section-subtitle">Free online courses from Android experts that bring you step-by-step to building your own apps.</div>

<section class="dac-section dac-light"><div class="wrap">

  <h1 class="dac-section-title">Online Courses</h1>

  <div class="dac-section-subtitle">Free online courses from Android

    experts that bring you step-by-step to building your own apps.</div>

  <div class="resource-widget resource-flow-layout col-16"

       data-query="collection:develop/landing/courses"

       data-cardSizes="6x6"

docs/html/distribute/engage/ads.jd

0 → 100644
+58 −0
Original line number Diff line number Diff line 
page.title=Drive engagement with AdWords Ads

page.metaDescription=Keep users coming back. AdWords offers re-engagement tools to help your app stay top of mind with users.

page.tags="engagement, adwords"

page.image=images/cards/adwords_2x.jpg

@jd:body



<p>Successful apps keep users coming back again and again. AdWords offers app

re-engagement tools to help your app stay top of  mind with users who’ve

already installed it on their phone. AdWords can remind them of key features

and encourage them to try your app again, or help them complete an activity

they didn't know your app could handle.</p>



<p>

  <a href="https://support.google.com/adwords/answer/6032073">Get started with AdWords mobile

  app engagement campaigns</a>.

</p>



<div>

 <div class="figure-left" style="width:46%;">

   <h3>From search</h3>

   <img src="/images/distribute/promote_ads.png">

    <p class="figure-caption">Add deep links to your app, then bring users straight

    to relevant app content when they’re searching.</p>

  </div>

  <div class="figure-right" style="width:46%;">

    <h3>From apps</h3>

    <img src="/images/distribute/promote_ads_inapp.png">

    <p class="figure-caption">Use remarketing and deep links to bring users to just the right

    place in your app to re-engage and convert, from other apps and games they love.</p>

  </div>

</div>



<h3 id="tips">Tips</h2>



<ul>

  <li> Track what users do in your app after they click an ad, by installing the

    AdWords <a href="https://developers.google.com/app-conversion-tracking/">conversion tracking

    SDK</a>.

  <li> Advertise a compelling reason for users to re-engage with your app, such as a

    reminder or a special offer.

  <li> <a href="https://developers.google.com/app-indexing/webmasters/app">Add deep links</a> to

    your app and bring users directly to the most relevant and interesting

    parts of your app, where they can easily take action.

  <li> Re-engage with your app users across the Display Network with remarketing lists

and search with keywords.

  <li> Use remarketing lists to target high value users so that you can drive more

conversions in your app.

</ul>



<h2 id="related_resources">Related resources</h2>



<div class="resource-widget resource-flow-layout col-13" 

  data-query="collection:distribute/engage/reengage"

  data-sortorder="-timestamp"

  data-cardsizes="9x3"

  data-maxresults="6">

</div>

docs/html/distribute/engage/appindexing.jd

0 → 100644
+61 −0
Original line number Diff line number Diff line 
page.title=Bring Users from Google Search

page.metaDescription=Use search to bring your existing users back into your app.

page.image=images/cards/adwords_2x.jpg

page.tags="engagement, search"

@jd:body



<p>Use the features of Google Search for Android to drive the use of your apps: </p>



<ul>

<li>Once users have installed your app, search can bring them back with <strong>deep-links</strong> direct to your app. </li>

  <li>When users use <strong>voice commands</strong> to ask Google to perform a task, your app can be one of those

completing the task.</li>



<li>You can also take advantage of <strong>Google Now</strong> to

display cards for event, flight, hotel, and restaurant reservations you notify

to users’ gmail addresses, and bring users back from the email linked to the

card.</li>

</ul>



<p>Start now by <a href="https://developers.google.com/app-indexing/">indexing your app</a>, then take advantage of <a href="https://developers.google.com/voice-actions/">Voice Actions</a>, the <a href="https://developers.google.com/app-indexing/webmasters/appindexingapi">App Indexing API</a>, and <a href="https://developers.google.com/schemas/now/cards">Google Now Cards</a>.</p>





<h2 id="help_users_find_your_information">Help Users Find Your Information</h2>



<p>Re-engage with your users with deep-links displayed in search results, links

that take users directly to content within your app.</p>





<div style="margin-top:1.5em;margin-left:24px">

<img src="{@docRoot}images/distribute/more-app-engagement.png">

</div>

<h2 id="empower_users_in_your_app">Empower your users to get things done in your app</h2>



<p>Brings your users into your app to take action with voice actions such as “Ok

Google, play a song” with the music app of choice, or “Ok Google, search for

hotels in Maui on TripAdvisor” in the TripAdvisor app.</p>



<div style="margin-top:1em">

<img src="{@docRoot}images/distribute/music-action.png">

</div>





<h2 id="assist_your_users">Assist your users where and when they need it</h2>



<div class="figure">

<img src="https://developers.google.com/schemas/images/now_eventconfirmation.png">

</div>



<p>Inform your users of their reservations with cards created from structured data

markup delivered in Gmail notifications. Cards also lead users quickly back to

your email message, for further engagement.</p>



<h2 style="clear:both" id="related-resources">Related Resources</h2>



<div class="resource-widget resource-flow-layout col-13"

  data-query="collection:distribute/engage/appindexing"

  data-sortOrder="-timestamp"

  data-cardSizes="9x3"

  data-maxResults="6"></div>

docs/html/distribute/engage/deep-linking.jd

+17 −18
Original line number Diff line number Diff line
@@ -26,27 +26,26 @@ page.image=images/cards/google-search_2x.png 
  before accessing the resource.

</p>



<div style="padding:2em, auto;width:550px;">

  <div style="float:right; width:260px; padding-left:1em;">

    <img src="{@docRoot}images/gp-engage-5.jpg" class="border-img">

    <p class="img-caption">



<div style="inline-block">



<div class="col-5">

    <img src="{@docRoot}images/gp-engage-5.jpg">

    <p class="figure-caption">

      G+ Post with Deep Link to Buy

    </p>

</div>



  <div style="width:260px;float:left;">

    <img src="{@docRoot}images/gp-engage-6.jpg" class="border-img">

    <p class="img-caption">

<div class="col-5">

    <img src="{@docRoot}images/gp-engage-6.jpg">

    <p class="figure-caption">

      Purchase page within app

    </p>

</div>

</div>





<div class="headerLine">

<h2>Deep Linking from Google Search &mdash; App Indexing</h2>

</div>



<h2 style="clear:both">Deep Linking from Google Search &mdash; App Indexing</h2>



<div style="float:right;">

  <img src="/images/gp-listing-4.jpg" style="padding-top:1em;padding-left:2em;">
@@ -65,15 +64,15 @@ page.image=images/cards/google-search_2x.png 
  content</a>.

</p>



<div class="clearfloat" style="margin-top:2em;"></div>



<div style="float:right;width:340px;padding-left:2em;">

  <img src="/images/gp-ads-linking2.jpg" style="padding-top:1em;">

</div>



<div class="headerLine ">

<h2>Deep Linking from Google Ads</h2>

<h2 style="clear:both" style="padding-top:2em">Deep Linking from Google Ads</h2>





<div class="col-5" style="float:right">

  <img src="{@docRoot}images/gp-ads-linking2.jpg" >

</div>



<p>

  Ads can remind users about the apps they already have.

</p>