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

Commit 9deffecc authored by Quddus Chong's avatar Quddus Chong Committed by Android Git Automerger
Browse files

am 15c3ce77: am 0dfcfdcb: am 23056929: Merge "docs: Updated Google Play... 

am 15c3ce77: am 0dfcfdcb: am 23056929: Merge "docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release." into lmp-docs

* commit '15c3ce77':
  docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release.
parents b503e3f2 15c3ce77

docs/html/gms_navtree_data.js

+21 −22

File changed.

Preview size limit exceeded, changes collapsed.

docs/html/reference/com/google/android/gms/R.attr.html

+974 −808

File changed.

Preview size limit exceeded, changes collapsed.

docs/html/reference/com/google/android/gms/R.color.html

+378 −355
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ 












<html>
@@ -110,7 +111,7 @@ 
href="//fonts.googleapis.com/css?family=Roboto+Condensed">

<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:light,regular,medium,thin,italic,mediumitalic,bold"

  title="roboto">

<link href="/assets/css/default.css?v=2" rel="stylesheet" type="text/css">

<link href="/assets/css/default.css?v=4" rel="stylesheet" type="text/css">
@@ -122,7 +123,7 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
  var metaTags = [];

  var devsite = false;

</script>

<script src="/assets/js/docs.js?v=2" type="text/javascript"></script>

<script src="/assets/js/docs.js?v=3" type="text/javascript"></script>
@@ -148,6 +149,52 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 


<a name="top"></a>



<!-- dialog to prompt lang pref change when loaded from hardcoded URL 

<div id="langMessage" style="display:none">

  <div>

    <div class="lang en">

      <p>You requested a page in English, would you like to proceed with this language setting?</p>

    </div>

    <div class="lang es">

      <p>You requested a page in Spanish (Español), would you like to proceed with this language setting?</p>

    </div>

    <div class="lang ja">

      <p>You requested a page in Japanese (日本語), would you like to proceed with this language setting?</p>

    </div>

    <div class="lang ko">

      <p>You requested a page in Korean (한국어), would you like to proceed with this language setting?</p>

    </div>

    <div class="lang ru">

      <p>You requested a page in Russian (Русский), would you like to proceed with this language setting?</p>

    </div>

    <div class="lang zh-cn">

      <p>You requested a page in Simplified Chinese (简体中文), would you like to proceed with this language setting?</p>

    </div>

    <div class="lang zh-tw">

      <p>You requested a page in Traditional Chinese (繁體中文), would you like to proceed with this language setting?</p>

    </div>

    <a href="#" class="button yes" onclick="return false;">

      <span class="lang en">Yes</span>

      <span class="lang es">Sí</span>

      <span class="lang ja">Yes</span>

      <span class="lang ko">Yes</span>

      <span class="lang ru">Yes</span>

      <span class="lang zh-cn">是的</span>

      <span class="lang zh-tw">没有</span>

    </a>

    <a href="#" class="button" onclick="$('#langMessage').hide();return false;">

      <span class="lang en">No</span>

      <span class="lang es">No</span>

      <span class="lang ja">No</span>

      <span class="lang ko">No</span>

      <span class="lang ru">No</span>

      <span class="lang zh-cn">没有</span>

      <span class="lang zh-tw">没有</span>

    </a>

  </div>

</div> -->





  <!-- Header -->

  <div id="header-wrapper">

    <div id="header">
@@ -228,8 +275,8 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
                <option value="ja">日本語</option>

                <option value="ko">한국어</option>

                <option value="ru">Русский</option>

                <option value="zh-cn">中文 (中国)</option>

                <option value="zh-tw">中文 (台灣)</option>

                <option value="zh-cn">中文（简体)</option>

                <option value="zh-tw">中文（繁體)</option>

            </select>

          </div>

        <script type="text/javascript">
@@ -380,31 +427,7 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
        <div class="wrap" style="position:relative;z-index:1">



        

            <a id="helpoutsLink" class="resource resource-card resource-card-6x2x3 resource-card-6x2 helpouts-card"

              href="http://helpouts.google.com/partner/landing/provider/googledevelopers" target="_blank">

              <div class="card-bg helpouts-card-bg"></div>

              <div class="card-info">

                <div class="helpouts-description">

                  <div class="text">Help developers solve problems<br/>

                    <span id="helpoutsLinkText" class="link-color" style="display:block;padding-top:5px;text-align:right">Learn more</span>

                  </div>

                </div>

              </div>

            </a>

            <script>

              var textA = "LEARN MORE";

              var linkA = "http://helpouts.google.com/partner/landing/provider/googledevelopers?utm_source=android_banner1&utm_medium=banner&utm_campaign=android_provider_banner1";

              var textB = "SIGN UP NOW";

              var linkB = "http://helpouts.google.com/partner/landing/provider/googledevelopers?utm_source=android_banner2&utm_medium=banner&utm_campaign=android_provider_banner2";



              if (Math.floor(1/Math.random()) > 1) {

                $("a#helpoutsLink").attr('href', linkA);

                $("span#helpoutsLinkText").text(textA);

              } else {

                $("a#helpoutsLink").attr('href', linkB);

                $("span#helpoutsLinkText").text(textB);

              }

            </script>

        

        



            <ul class="nav-x col-9 develop" style="width:100%">

docs/html/reference/com/google/android/gms/R.drawable.html

+271 −248
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ 












<html>
@@ -110,7 +111,7 @@ 
href="//fonts.googleapis.com/css?family=Roboto+Condensed">

<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:light,regular,medium,thin,italic,mediumitalic,bold"

  title="roboto">

<link href="/assets/css/default.css?v=2" rel="stylesheet" type="text/css">

<link href="/assets/css/default.css?v=4" rel="stylesheet" type="text/css">
@@ -122,7 +123,7 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
  var metaTags = [];

  var devsite = false;

</script>

<script src="/assets/js/docs.js?v=2" type="text/javascript"></script>

<script src="/assets/js/docs.js?v=3" type="text/javascript"></script>
@@ -148,6 +149,52 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 


<a name="top"></a>



<!-- dialog to prompt lang pref change when loaded from hardcoded URL 

<div id="langMessage" style="display:none">

  <div>

    <div class="lang en">

      <p>You requested a page in English, would you like to proceed with this language setting?</p>

    </div>

    <div class="lang es">

      <p>You requested a page in Spanish (Español), would you like to proceed with this language setting?</p>

    </div>

    <div class="lang ja">

      <p>You requested a page in Japanese (日本語), would you like to proceed with this language setting?</p>

    </div>

    <div class="lang ko">

      <p>You requested a page in Korean (한국어), would you like to proceed with this language setting?</p>

    </div>

    <div class="lang ru">

      <p>You requested a page in Russian (Русский), would you like to proceed with this language setting?</p>

    </div>

    <div class="lang zh-cn">

      <p>You requested a page in Simplified Chinese (简体中文), would you like to proceed with this language setting?</p>

    </div>

    <div class="lang zh-tw">

      <p>You requested a page in Traditional Chinese (繁體中文), would you like to proceed with this language setting?</p>

    </div>

    <a href="#" class="button yes" onclick="return false;">

      <span class="lang en">Yes</span>

      <span class="lang es">Sí</span>

      <span class="lang ja">Yes</span>

      <span class="lang ko">Yes</span>

      <span class="lang ru">Yes</span>

      <span class="lang zh-cn">是的</span>

      <span class="lang zh-tw">没有</span>

    </a>

    <a href="#" class="button" onclick="$('#langMessage').hide();return false;">

      <span class="lang en">No</span>

      <span class="lang es">No</span>

      <span class="lang ja">No</span>

      <span class="lang ko">No</span>

      <span class="lang ru">No</span>

      <span class="lang zh-cn">没有</span>

      <span class="lang zh-tw">没有</span>

    </a>

  </div>

</div> -->





  <!-- Header -->

  <div id="header-wrapper">

    <div id="header">
@@ -228,8 +275,8 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
                <option value="ja">日本語</option>

                <option value="ko">한국어</option>

                <option value="ru">Русский</option>

                <option value="zh-cn">中文 (中国)</option>

                <option value="zh-tw">中文 (台灣)</option>

                <option value="zh-cn">中文（简体)</option>

                <option value="zh-tw">中文（繁體)</option>

            </select>

          </div>

        <script type="text/javascript">
@@ -380,31 +427,7 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
        <div class="wrap" style="position:relative;z-index:1">



        

            <a id="helpoutsLink" class="resource resource-card resource-card-6x2x3 resource-card-6x2 helpouts-card"

              href="http://helpouts.google.com/partner/landing/provider/googledevelopers" target="_blank">

              <div class="card-bg helpouts-card-bg"></div>

              <div class="card-info">

                <div class="helpouts-description">

                  <div class="text">Help developers solve problems<br/>

                    <span id="helpoutsLinkText" class="link-color" style="display:block;padding-top:5px;text-align:right">Learn more</span>

                  </div>

                </div>

              </div>

            </a>

            <script>

              var textA = "LEARN MORE";

              var linkA = "http://helpouts.google.com/partner/landing/provider/googledevelopers?utm_source=android_banner1&utm_medium=banner&utm_campaign=android_provider_banner1";

              var textB = "SIGN UP NOW";

              var linkB = "http://helpouts.google.com/partner/landing/provider/googledevelopers?utm_source=android_banner2&utm_medium=banner&utm_campaign=android_provider_banner2";



              if (Math.floor(1/Math.random()) > 1) {

                $("a#helpoutsLink").attr('href', linkA);

                $("span#helpoutsLinkText").text(textA);

              } else {

                $("a#helpoutsLink").attr('href', linkB);

                $("span#helpoutsLinkText").text(textB);

              }

            </script>

        

        



            <ul class="nav-x col-9 develop" style="width:100%">

docs/html/reference/com/google/android/gms/R.html

+103 −63
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ 












<html>
@@ -110,7 +111,7 @@ 
href="//fonts.googleapis.com/css?family=Roboto+Condensed">

<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:light,regular,medium,thin,italic,mediumitalic,bold"

  title="roboto">

<link href="/assets/css/default.css?v=2" rel="stylesheet" type="text/css">

<link href="/assets/css/default.css?v=4" rel="stylesheet" type="text/css">
@@ -122,7 +123,7 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
  var metaTags = [];

  var devsite = false;

</script>

<script src="/assets/js/docs.js?v=2" type="text/javascript"></script>

<script src="/assets/js/docs.js?v=3" type="text/javascript"></script>
@@ -148,6 +149,52 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 


<a name="top"></a>



<!-- dialog to prompt lang pref change when loaded from hardcoded URL 

<div id="langMessage" style="display:none">

  <div>

    <div class="lang en">

      <p>You requested a page in English, would you like to proceed with this language setting?</p>

    </div>

    <div class="lang es">

      <p>You requested a page in Spanish (Español), would you like to proceed with this language setting?</p>

    </div>

    <div class="lang ja">

      <p>You requested a page in Japanese (日本語), would you like to proceed with this language setting?</p>

    </div>

    <div class="lang ko">

      <p>You requested a page in Korean (한국어), would you like to proceed with this language setting?</p>

    </div>

    <div class="lang ru">

      <p>You requested a page in Russian (Русский), would you like to proceed with this language setting?</p>

    </div>

    <div class="lang zh-cn">

      <p>You requested a page in Simplified Chinese (简体中文), would you like to proceed with this language setting?</p>

    </div>

    <div class="lang zh-tw">

      <p>You requested a page in Traditional Chinese (繁體中文), would you like to proceed with this language setting?</p>

    </div>

    <a href="#" class="button yes" onclick="return false;">

      <span class="lang en">Yes</span>

      <span class="lang es">Sí</span>

      <span class="lang ja">Yes</span>

      <span class="lang ko">Yes</span>

      <span class="lang ru">Yes</span>

      <span class="lang zh-cn">是的</span>

      <span class="lang zh-tw">没有</span>

    </a>

    <a href="#" class="button" onclick="$('#langMessage').hide();return false;">

      <span class="lang en">No</span>

      <span class="lang es">No</span>

      <span class="lang ja">No</span>

      <span class="lang ko">No</span>

      <span class="lang ru">No</span>

      <span class="lang zh-cn">没有</span>

      <span class="lang zh-tw">没有</span>

    </a>

  </div>

</div> -->





  <!-- Header -->

  <div id="header-wrapper">

    <div id="header">
@@ -228,8 +275,8 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
                <option value="ja">日本語</option>

                <option value="ko">한국어</option>

                <option value="ru">Русский</option>

                <option value="zh-cn">中文 (中国)</option>

                <option value="zh-tw">中文 (台灣)</option>

                <option value="zh-cn">中文（简体)</option>

                <option value="zh-tw">中文（繁體)</option>

            </select>

          </div>

        <script type="text/javascript">
@@ -380,31 +427,7 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
        <div class="wrap" style="position:relative;z-index:1">



        

            <a id="helpoutsLink" class="resource resource-card resource-card-6x2x3 resource-card-6x2 helpouts-card"

              href="http://helpouts.google.com/partner/landing/provider/googledevelopers" target="_blank">

              <div class="card-bg helpouts-card-bg"></div>

              <div class="card-info">

                <div class="helpouts-description">

                  <div class="text">Help developers solve problems<br/>

                    <span id="helpoutsLinkText" class="link-color" style="display:block;padding-top:5px;text-align:right">Learn more</span>

                  </div>

                </div>

              </div>

            </a>

            <script>

              var textA = "LEARN MORE";

              var linkA = "http://helpouts.google.com/partner/landing/provider/googledevelopers?utm_source=android_banner1&utm_medium=banner&utm_campaign=android_provider_banner1";

              var textB = "SIGN UP NOW";

              var linkB = "http://helpouts.google.com/partner/landing/provider/googledevelopers?utm_source=android_banner2&utm_medium=banner&utm_campaign=android_provider_banner2";



              if (Math.floor(1/Math.random()) > 1) {

                $("a#helpoutsLink").attr('href', linkA);

                $("span#helpoutsLinkText").text(textA);

              } else {

                $("a#helpoutsLink").attr('href', linkB);

                $("span#helpoutsLinkText").text(textB);

              }

            </script>

        

        



            <ul class="nav-x col-9 develop" style="width:100%">
@@ -982,7 +1005,7 @@ Summary: 
         

        

        class</nobr></td>

      <td class="jd-linkcol"><a href="/reference/com/google/android/gms/R.string.html">R.string</a></td>

      <td class="jd-linkcol"><a href="/reference/com/google/android/gms/R.raw.html">R.raw</a></td>

      <td class="jd-descrcol" width="100%">

        &nbsp;
@@ -999,7 +1022,7 @@ Summary: 
         

        

        class</nobr></td>

      <td class="jd-linkcol"><a href="/reference/com/google/android/gms/R.style.html">R.style</a></td>

      <td class="jd-linkcol"><a href="/reference/com/google/android/gms/R.string.html">R.string</a></td>

      <td class="jd-descrcol" width="100%">

        &nbsp;
@@ -1015,6 +1038,23 @@ Summary: 
         

         

        

        class</nobr></td>

      <td class="jd-linkcol"><a href="/reference/com/google/android/gms/R.style.html">R.style</a></td>

      <td class="jd-descrcol" width="100%">

        &nbsp;

        

    



      </td>

    </tr>

    

    

    <tr class="alt-color api apilevel-" >

      <td class="jd-typecol"><nobr>

        

         

         

        

        class</nobr></td>

      <td class="jd-linkcol"><a href="/reference/com/google/android/gms/R.styleable.html">R.styleable</a></td>

      <td class="jd-descrcol" width="100%">