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

Commit c7da42d7 authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android Git Automerger
Browse files

am f7832a35: am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore... 

am f7832a35: am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs

* commit 'f7832a35':
  Doc change: Update gcore reference docs.
parents 536fa1bb f7832a35

docs/html/gms_navtree_data.js

+2 −2
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ var GMS_NAVTREE_DATA = 
, null ], [ "Classes", null, [ [ "DataBuffer", "reference/com/google/android/gms/common/data/DataBuffer.html", null, null ], [ "DataBufferUtils", "reference/com/google/android/gms/common/data/DataBufferUtils.html", null, null ] ]

, null ] ]

, null ], [ "com.google.android.gms.common.images", "reference/com/google/android/gms/common/images/package-summary.html", [ [ "Interfaces", null, [ [ "ImageManager.OnImageLoadedListener", "reference/com/google/android/gms/common/images/ImageManager.OnImageLoadedListener.html", null, null ] ]

, null ], [ "Classes", null, [ [ "ImageManager", "reference/com/google/android/gms/common/images/ImageManager.html", null, null ], [ "ImageManager.ImageReceiver", "reference/com/google/android/gms/common/images/ImageManager.ImageReceiver.html", null, null ] ]

, null ], [ "Classes", null, [ [ "ImageManager", "reference/com/google/android/gms/common/images/ImageManager.html", null, null ] ]

, null ] ]

, null ], [ "com.google.android.gms.games", "reference/com/google/android/gms/games/package-summary.html", [ [ "Interfaces", null, [ [ "Game", "reference/com/google/android/gms/games/Game.html", null, null ], [ "OnGamesLoadedListener", "reference/com/google/android/gms/games/OnGamesLoadedListener.html", null, null ], [ "OnPlayersLoadedListener", "reference/com/google/android/gms/games/OnPlayersLoadedListener.html", null, null ], [ "OnSignOutCompleteListener", "reference/com/google/android/gms/games/OnSignOutCompleteListener.html", null, null ], [ "Player", "reference/com/google/android/gms/games/Player.html", null, null ], [ "RealTimeSocket", "reference/com/google/android/gms/games/RealTimeSocket.html", null, null ] ]

, null ], [ "Classes", null, [ [ "GameBuffer", "reference/com/google/android/gms/games/GameBuffer.html", null, null ], [ "GameEntity", "reference/com/google/android/gms/games/GameEntity.html", null, null ], [ "GamesActivityResultCodes", "reference/com/google/android/gms/games/GamesActivityResultCodes.html", null, null ], [ "GamesClient", "reference/com/google/android/gms/games/GamesClient.html", null, null ], [ "GamesClient.Builder", "reference/com/google/android/gms/games/GamesClient.Builder.html", null, null ], [ "GamesClientSettings", "reference/com/google/android/gms/games/GamesClientSettings.html", null, null ], [ "PageDirection", "reference/com/google/android/gms/games/PageDirection.html", null, null ], [ "PlayerBuffer", "reference/com/google/android/gms/games/PlayerBuffer.html", null, null ], [ "PlayerEntity", "reference/com/google/android/gms/games/PlayerEntity.html", null, null ] ]

, null ], [ "Classes", null, [ [ "GameBuffer", "reference/com/google/android/gms/games/GameBuffer.html", null, null ], [ "GameEntity", "reference/com/google/android/gms/games/GameEntity.html", null, null ], [ "GamesActivityResultCodes", "reference/com/google/android/gms/games/GamesActivityResultCodes.html", null, null ], [ "GamesClient", "reference/com/google/android/gms/games/GamesClient.html", null, null ], [ "GamesClient.Builder", "reference/com/google/android/gms/games/GamesClient.Builder.html", null, null ], [ "PageDirection", "reference/com/google/android/gms/games/PageDirection.html", null, null ], [ "PlayerBuffer", "reference/com/google/android/gms/games/PlayerBuffer.html", null, null ], [ "PlayerEntity", "reference/com/google/android/gms/games/PlayerEntity.html", null, null ] ]

, null ] ]

, null ], [ "com.google.android.gms.games.achievement", "reference/com/google/android/gms/games/achievement/package-summary.html", [ [ "Interfaces", null, [ [ "Achievement", "reference/com/google/android/gms/games/achievement/Achievement.html", null, null ], [ "OnAchievementsLoadedListener", "reference/com/google/android/gms/games/achievement/OnAchievementsLoadedListener.html", null, null ], [ "OnAchievementUpdatedListener", "reference/com/google/android/gms/games/achievement/OnAchievementUpdatedListener.html", null, null ] ]

, null ], [ "Classes", null, [ [ "AchievementBuffer", "reference/com/google/android/gms/games/achievement/AchievementBuffer.html", null, null ] ]

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

+133 −134

File changed.

Preview size limit exceeded, changes collapsed.

docs/html/reference/com/google/android/gms/appstate/AppState.html

+6 −6
Original line number Diff line number Diff line
@@ -995,7 +995,7 @@ From interface 
  <div class="jd-tagdata jd-tagdescr"><p></p></div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Returns</h5>

      <ul class="nolist"><li>the conflict data. Only valid if <code><a href="/reference/com/google/android/gms/appstate/AppState.html#hasConflict()">hasConflict()</a></code> is <code>true</code>.

      <ul class="nolist"><li>The conflict data. Only valid if <code><a href="/reference/com/google/android/gms/appstate/AppState.html#hasConflict()">hasConflict()</a></code> is <code>true</code>.

</li></ul>

  </div>
@@ -1029,7 +1029,7 @@ From interface 
  <div class="jd-tagdata jd-tagdescr"><p></p></div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Returns</h5>

      <ul class="nolist"><li>the latest known version of conflicting data from the server.

      <ul class="nolist"><li>The latest known version of conflicting data from the server.

</li></ul>

  </div>
@@ -1063,7 +1063,7 @@ From interface 
  <div class="jd-tagdata jd-tagdescr"><p></p></div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Returns</h5>

      <ul class="nolist"><li>the key associated with this app state blob.

      <ul class="nolist"><li>The key associated with this app state blob.

</li></ul>

  </div>
@@ -1097,7 +1097,7 @@ From interface 
  <div class="jd-tagdata jd-tagdescr"><p></p></div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Returns</h5>

      <ul class="nolist"><li>the local data for this app state blob, or null if none present.

      <ul class="nolist"><li>The local data for this app state blob, or null if none present.

</li></ul>

  </div>
@@ -1131,7 +1131,7 @@ From interface 
  <div class="jd-tagdata jd-tagdescr"><p></p></div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Returns</h5>

      <ul class="nolist"><li>the local version of the app state data.

      <ul class="nolist"><li>The local version of the app state data.

</li></ul>

  </div>
@@ -1165,7 +1165,7 @@ From interface 
  <div class="jd-tagdata jd-tagdescr"><p></p></div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Returns</h5>

      <ul class="nolist"><li>whether or not this app state has conflict data to resolve.

      <ul class="nolist"><li>Whether or not this app state has conflict data to resolve.

</li></ul>

  </div>

docs/html/reference/com/google/android/gms/appstate/AppStateBuffer.html

+13 −7
Original line number Diff line number Diff line
@@ -1278,13 +1278,19 @@ From interface 
  <div class="jd-tagdata jd-tagdescr"><p>Get the item at the specified position. Note that the objects returned from subsequent

 invocations of this method for the same position may not be identical objects, but will be

 equal in value. In other words:



 <pre>

 <code>

 buffer.get(i) == buffer.get(i) may return false.

 buffer.get(i).equals(buffer.get(i)) will return true.

 </code>

 </pre></p></div>

 <p>

 <code>buffer.get(i) == buffer.get(i)</code> may return false.

 <p>

 <code>buffer.get(i).equals(buffer.get(i))</code> will return true.</p></div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Parameters</h5>

      <table class="jd-tagtable">

        <tr>

          <th>position</td>

          <td>The position of the item to retrieve.</td>

        </tr>

      </table>

  </div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Returns</h5>

      <ul class="nolist"><li>the item at <code>position</code> in this buffer.

docs/html/reference/com/google/android/gms/appstate/AppStateClient.Builder.html

+9 −5
Original line number Diff line number Diff line
@@ -1146,16 +1146,16 @@ From class 
      <table class="jd-tagtable">

        <tr>

          <th>context</td>

          <td>the context to use for the connection.</td>

          <td>The context to use for the connection.</td>

        </tr>

        <tr>

          <th>connectedListener</td>

          <td>the listener where the results of the asynchronous

          <td>The listener where the results of the asynchronous

            <code><a href="/reference/com/google/android/gms/appstate/AppStateClient.html#connect()">connect()</a></code> call are delivered.</td>

        </tr>

        <tr>

          <th>connectionFailedListener</td>

          <td>the listener which will be notified if the connection

          <td>The listener which will be notified if the connection

            attempt fails.

</td>

        </tr>
@@ -1262,10 +1262,14 @@ From class 
        <tr>

          <th>accountName</td>

          <td>The account name on the device that should be used by this

            <code><a href="/reference/com/google/android/gms/appstate/AppStateClient.html">AppStateClient</a></code>. Must be non-null.

</td>

            <code><a href="/reference/com/google/android/gms/appstate/AppStateClient.html">AppStateClient</a></code>. Must be non-null.</td>

        </tr>

      </table>

  </div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Returns</h5>

      <ul class="nolist"><li>This Builder.

</li></ul>

  </div>



    </div>