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

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

am c5663c9f: am 8154d293: am 58c68d77: Merge "Doc change: Updated reference... 

am c5663c9f: am 8154d293: am 58c68d77: Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs

* commit 'c5663c9f':
  Doc change: Updated reference docs for Google Play Services 3.2.
parents c5a5d20b c5663c9f

docs/html/gms_navtree_data.js

+3 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ var GMS_NAVTREE_DATA = 
, null ], [ "com.google.android.gms.location", "reference/com/google/android/gms/location/package-summary.html", [ [ "Interfaces", null, [ [ "Geofence", "reference/com/google/android/gms/location/Geofence.html", null, null ], [ "LocationClient.OnAddGeofencesResultListener", "reference/com/google/android/gms/location/LocationClient.OnAddGeofencesResultListener.html", null, null ], [ "LocationClient.OnRemoveGeofencesResultListener", "reference/com/google/android/gms/location/LocationClient.OnRemoveGeofencesResultListener.html", null, null ], [ "LocationListener", "reference/com/google/android/gms/location/LocationListener.html", null, null ] ]

, null ], [ "Classes", null, [ [ "ActivityRecognitionClient", "reference/com/google/android/gms/location/ActivityRecognitionClient.html", null, null ], [ "ActivityRecognitionResult", "reference/com/google/android/gms/location/ActivityRecognitionResult.html", null, null ], [ "DetectedActivity", "reference/com/google/android/gms/location/DetectedActivity.html", null, null ], [ "Geofence.Builder", "reference/com/google/android/gms/location/Geofence.Builder.html", null, null ], [ "LocationClient", "reference/com/google/android/gms/location/LocationClient.html", null, null ], [ "LocationRequest", "reference/com/google/android/gms/location/LocationRequest.html", null, null ], [ "LocationStatusCodes", "reference/com/google/android/gms/location/LocationStatusCodes.html", null, null ] ]

, null ] ]

, null ], [ "com.google.android.gms.maps", "reference/com/google/android/gms/maps/package-summary.html", [ [ "Interfaces", null, [ [ "GoogleMap.CancelableCallback", "reference/com/google/android/gms/maps/GoogleMap.CancelableCallback.html", null, null ], [ "GoogleMap.InfoWindowAdapter", "reference/com/google/android/gms/maps/GoogleMap.InfoWindowAdapter.html", null, null ], [ "GoogleMap.OnCameraChangeListener", "reference/com/google/android/gms/maps/GoogleMap.OnCameraChangeListener.html", null, null ], [ "GoogleMap.OnInfoWindowClickListener", "reference/com/google/android/gms/maps/GoogleMap.OnInfoWindowClickListener.html", null, null ], [ "GoogleMap.OnMapClickListener", "reference/com/google/android/gms/maps/GoogleMap.OnMapClickListener.html", null, null ], [ "GoogleMap.OnMapLongClickListener", "reference/com/google/android/gms/maps/GoogleMap.OnMapLongClickListener.html", null, null ], [ "GoogleMap.OnMarkerClickListener", "reference/com/google/android/gms/maps/GoogleMap.OnMarkerClickListener.html", null, null ], [ "GoogleMap.OnMarkerDragListener", "reference/com/google/android/gms/maps/GoogleMap.OnMarkerDragListener.html", null, null ], [ "GoogleMap.OnMyLocationChangeListener", "reference/com/google/android/gms/maps/GoogleMap.OnMyLocationChangeListener.html", null, null ], [ "LocationSource", "reference/com/google/android/gms/maps/LocationSource.html", null, null ], [ "LocationSource.OnLocationChangedListener", "reference/com/google/android/gms/maps/LocationSource.OnLocationChangedListener.html", null, null ] ]

, null ], [ "com.google.android.gms.maps", "reference/com/google/android/gms/maps/package-summary.html", [ [ "Interfaces", null, [ [ "GoogleMap.CancelableCallback", "reference/com/google/android/gms/maps/GoogleMap.CancelableCallback.html", null, null ], [ "GoogleMap.InfoWindowAdapter", "reference/com/google/android/gms/maps/GoogleMap.InfoWindowAdapter.html", null, null ], [ "GoogleMap.OnCameraChangeListener", "reference/com/google/android/gms/maps/GoogleMap.OnCameraChangeListener.html", null, null ], [ "GoogleMap.OnInfoWindowClickListener", "reference/com/google/android/gms/maps/GoogleMap.OnInfoWindowClickListener.html", null, null ], [ "GoogleMap.OnMapClickListener", "reference/com/google/android/gms/maps/GoogleMap.OnMapClickListener.html", null, null ], [ "GoogleMap.OnMapLongClickListener", "reference/com/google/android/gms/maps/GoogleMap.OnMapLongClickListener.html", null, null ], [ "GoogleMap.OnMarkerClickListener", "reference/com/google/android/gms/maps/GoogleMap.OnMarkerClickListener.html", null, null ], [ "GoogleMap.OnMarkerDragListener", "reference/com/google/android/gms/maps/GoogleMap.OnMarkerDragListener.html", null, null ], [ "GoogleMap.OnMyLocationButtonClickListener", "reference/com/google/android/gms/maps/GoogleMap.OnMyLocationButtonClickListener.html", null, null ], [ "GoogleMap.OnMyLocationChangeListener", "reference/com/google/android/gms/maps/GoogleMap.OnMyLocationChangeListener.html", null, null ], [ "GoogleMap.SnapshotReadyCallback", "reference/com/google/android/gms/maps/GoogleMap.SnapshotReadyCallback.html", null, null ], [ "LocationSource", "reference/com/google/android/gms/maps/LocationSource.html", null, null ], [ "LocationSource.OnLocationChangedListener", "reference/com/google/android/gms/maps/LocationSource.OnLocationChangedListener.html", null, null ] ]

, null ], [ "Classes", null, [ [ "CameraUpdate", "reference/com/google/android/gms/maps/CameraUpdate.html", null, null ], [ "CameraUpdateFactory", "reference/com/google/android/gms/maps/CameraUpdateFactory.html", null, null ], [ "GoogleMap", "reference/com/google/android/gms/maps/GoogleMap.html", null, null ], [ "GoogleMapOptions", "reference/com/google/android/gms/maps/GoogleMapOptions.html", null, null ], [ "MapFragment", "reference/com/google/android/gms/maps/MapFragment.html", null, null ], [ "MapsInitializer", "reference/com/google/android/gms/maps/MapsInitializer.html", null, null ], [ "MapView", "reference/com/google/android/gms/maps/MapView.html", null, null ], [ "Projection", "reference/com/google/android/gms/maps/Projection.html", null, null ], [ "SupportMapFragment", "reference/com/google/android/gms/maps/SupportMapFragment.html", null, null ], [ "UiSettings", "reference/com/google/android/gms/maps/UiSettings.html", null, null ] ]

, null ] ]

, null ], [ "com.google.android.gms.maps.model", "reference/com/google/android/gms/maps/model/package-summary.html", [ [ "Interfaces", null, [ [ "TileProvider", "reference/com/google/android/gms/maps/model/TileProvider.html", null, null ] ]
@@ -47,8 +47,8 @@ var GMS_NAVTREE_DATA = 
, null ], [ "com.google.android.gms.panorama", "reference/com/google/android/gms/panorama/package-summary.html", [ [ "Interfaces", null, [ [ "PanoramaClient.OnPanoramaInfoLoadedListener", "reference/com/google/android/gms/panorama/PanoramaClient.OnPanoramaInfoLoadedListener.html", null, null ] ]

, null ], [ "Classes", null, [ [ "PanoramaClient", "reference/com/google/android/gms/panorama/PanoramaClient.html", null, null ] ]

, null ] ]

, null ], [ "com.google.android.gms.plus", "reference/com/google/android/gms/plus/package-summary.html", [ [ "Interfaces", null, [ [ "PlusClient.OnAccessRevokedListener", "reference/com/google/android/gms/plus/PlusClient.OnAccessRevokedListener.html", null, null ], [ "PlusClient.OnMomentsLoadedListener", "reference/com/google/android/gms/plus/PlusClient.OnMomentsLoadedListener.html", null, null ], [ "PlusClient.OnPeopleLoadedListener", "reference/com/google/android/gms/plus/PlusClient.OnPeopleLoadedListener.html", null, null ], [ "PlusClient.OnPersonLoadedListener", "reference/com/google/android/gms/plus/PlusClient.OnPersonLoadedListener.html", null, null ], [ "PlusOneButton.OnPlusOneClickListener", "reference/com/google/android/gms/plus/PlusOneButton.OnPlusOneClickListener.html", null, null ] ]

, null ], [ "Classes", null, [ [ "GooglePlusUtil", "reference/com/google/android/gms/plus/GooglePlusUtil.html", null, null ], [ "PlusClient", "reference/com/google/android/gms/plus/PlusClient.html", null, null ], [ "PlusClient.Builder", "reference/com/google/android/gms/plus/PlusClient.Builder.html", null, null ], [ "PlusOneButton", "reference/com/google/android/gms/plus/PlusOneButton.html", null, null ], [ "PlusShare", "reference/com/google/android/gms/plus/PlusShare.html", null, null ], [ "PlusShare.Builder", "reference/com/google/android/gms/plus/PlusShare.Builder.html", null, null ] ]

, null ], [ "com.google.android.gms.plus", "reference/com/google/android/gms/plus/package-summary.html", [ [ "Interfaces", null, [ [ "PlusClient.OnAccessRevokedListener", "reference/com/google/android/gms/plus/PlusClient.OnAccessRevokedListener.html", null, null ], [ "PlusClient.OnMomentsLoadedListener", "reference/com/google/android/gms/plus/PlusClient.OnMomentsLoadedListener.html", null, null ], [ "PlusClient.OnPeopleLoadedListener", "reference/com/google/android/gms/plus/PlusClient.OnPeopleLoadedListener.html", null, null ], [ "PlusClient.OnPersonLoadedListener", "reference/com/google/android/gms/plus/PlusClient.OnPersonLoadedListener.html", null, null ], [ "PlusClient.OrderBy", "reference/com/google/android/gms/plus/PlusClient.OrderBy.html", null, null ], [ "PlusOneButton.OnPlusOneClickListener", "reference/com/google/android/gms/plus/PlusOneButton.OnPlusOneClickListener.html", null, null ] ]

, null ], [ "Classes", null, [ [ "PlusClient", "reference/com/google/android/gms/plus/PlusClient.html", null, null ], [ "PlusClient.Builder", "reference/com/google/android/gms/plus/PlusClient.Builder.html", null, null ], [ "PlusOneButton", "reference/com/google/android/gms/plus/PlusOneButton.html", null, null ], [ "PlusShare", "reference/com/google/android/gms/plus/PlusShare.html", null, null ], [ "PlusShare.Builder", "reference/com/google/android/gms/plus/PlusShare.Builder.html", null, null ] ]

, null ] ]

, null ], [ "com.google.android.gms.plus.model.moments", "reference/com/google/android/gms/plus/model/moments/package-summary.html", [ [ "Interfaces", null, [ [ "ItemScope", "reference/com/google/android/gms/plus/model/moments/ItemScope.html", null, null ], [ "Moment", "reference/com/google/android/gms/plus/model/moments/Moment.html", null, null ] ]

, null ], [ "Classes", null, [ [ "ItemScope.Builder", "reference/com/google/android/gms/plus/model/moments/ItemScope.Builder.html", null, null ], [ "Moment.Builder", "reference/com/google/android/gms/plus/model/moments/Moment.Builder.html", null, null ], [ "MomentBuffer", "reference/com/google/android/gms/plus/model/moments/MomentBuffer.html", null, null ] ]

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

+857 −48

File changed.

Preview size limit exceeded, changes collapsed.

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

+7 −7
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ Summary: 




  

    extends Object<br/>

    extends <a href="http://developer.android.com/reference/java/lang/Object.html">Object</a><br/>
@@ -701,7 +701,7 @@ Summary: 


    <tr>

         	

        <td colspan="2" class="jd-inheritance-class-cell">java.lang.Object</td>

        <td colspan="2" class="jd-inheritance-class-cell"><a href="http://developer.android.com/reference/java/lang/Object.html">java.lang.Object</a></td>

    </tr>
@@ -962,7 +962,7 @@ Summary: 
          class="jd-expando-trigger-img" /></a>

From class



  java.lang.Object

  <a href="http://developer.android.com/reference/java/lang/Object.html">java.lang.Object</a>



<div id="inherited-methods-java.lang.Object">

  <div id="inherited-methods-java.lang.Object-list"
@@ -981,7 +981,7 @@ From class 
            

            

            

            Object</nobr>

            <a href="http://developer.android.com/reference/java/lang/Object.html">Object</a></nobr>

        </td>

        <td class="jd-linkcol" width="100%"><nobr>

        <span class="sympad">clone</span>()</nobr>
@@ -1000,7 +1000,7 @@ From class 
            boolean</nobr>

        </td>

        <td class="jd-linkcol" width="100%"><nobr>

        <span class="sympad">equals</span>(Object arg0)</nobr>

        <span class="sympad">equals</span>(<a href="http://developer.android.com/reference/java/lang/Object.html">Object</a> arg0)</nobr>

        

  </td></tr>
@@ -1029,7 +1029,7 @@ From class 
            final

            

            

            Class&lt;?&gt;</nobr>

            <a href="http://developer.android.com/reference/java/lang/Class.html">Class</a>&lt;?&gt;</nobr>

        </td>

        <td class="jd-linkcol" width="100%"><nobr>

        <span class="sympad">getClass</span>()</nobr>
@@ -1093,7 +1093,7 @@ From class 
            

            

            

            String</nobr>

            <a href="http://developer.android.com/reference/java/lang/String.html">String</a></nobr>

        </td>

        <td class="jd-linkcol" width="100%"><nobr>

        <span class="sympad">toString</span>()</nobr>

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

+7 −7
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ Summary: 




  

    extends Object<br/>

    extends <a href="http://developer.android.com/reference/java/lang/Object.html">Object</a><br/>
@@ -701,7 +701,7 @@ Summary: 


    <tr>

         	

        <td colspan="2" class="jd-inheritance-class-cell">java.lang.Object</td>

        <td colspan="2" class="jd-inheritance-class-cell"><a href="http://developer.android.com/reference/java/lang/Object.html">java.lang.Object</a></td>

    </tr>
@@ -1093,7 +1093,7 @@ Summary: 
          class="jd-expando-trigger-img" /></a>

From class



  java.lang.Object

  <a href="http://developer.android.com/reference/java/lang/Object.html">java.lang.Object</a>



<div id="inherited-methods-java.lang.Object">

  <div id="inherited-methods-java.lang.Object-list"
@@ -1112,7 +1112,7 @@ From class 
            

            

            

            Object</nobr>

            <a href="http://developer.android.com/reference/java/lang/Object.html">Object</a></nobr>

        </td>

        <td class="jd-linkcol" width="100%"><nobr>

        <span class="sympad">clone</span>()</nobr>
@@ -1131,7 +1131,7 @@ From class 
            boolean</nobr>

        </td>

        <td class="jd-linkcol" width="100%"><nobr>

        <span class="sympad">equals</span>(Object arg0)</nobr>

        <span class="sympad">equals</span>(<a href="http://developer.android.com/reference/java/lang/Object.html">Object</a> arg0)</nobr>

        

  </td></tr>
@@ -1160,7 +1160,7 @@ From class 
            final

            

            

            Class&lt;?&gt;</nobr>

            <a href="http://developer.android.com/reference/java/lang/Class.html">Class</a>&lt;?&gt;</nobr>

        </td>

        <td class="jd-linkcol" width="100%"><nobr>

        <span class="sympad">getClass</span>()</nobr>
@@ -1224,7 +1224,7 @@ From class 
            

            

            

            String</nobr>

            <a href="http://developer.android.com/reference/java/lang/String.html">String</a></nobr>

        </td>

        <td class="jd-linkcol" width="100%"><nobr>

        <span class="sympad">toString</span>()</nobr>

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

+7 −7
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ Summary: 




  

    extends Object<br/>

    extends <a href="http://developer.android.com/reference/java/lang/Object.html">Object</a><br/>
@@ -701,7 +701,7 @@ Summary: 


    <tr>

         	

        <td colspan="2" class="jd-inheritance-class-cell">java.lang.Object</td>

        <td colspan="2" class="jd-inheritance-class-cell"><a href="http://developer.android.com/reference/java/lang/Object.html">java.lang.Object</a></td>

    </tr>
@@ -900,7 +900,7 @@ Summary: 
          class="jd-expando-trigger-img" /></a>

From class



  java.lang.Object

  <a href="http://developer.android.com/reference/java/lang/Object.html">java.lang.Object</a>



<div id="inherited-methods-java.lang.Object">

  <div id="inherited-methods-java.lang.Object-list"
@@ -919,7 +919,7 @@ From class 
            

            

            

            Object</nobr>

            <a href="http://developer.android.com/reference/java/lang/Object.html">Object</a></nobr>

        </td>

        <td class="jd-linkcol" width="100%"><nobr>

        <span class="sympad">clone</span>()</nobr>
@@ -938,7 +938,7 @@ From class 
            boolean</nobr>

        </td>

        <td class="jd-linkcol" width="100%"><nobr>

        <span class="sympad">equals</span>(Object arg0)</nobr>

        <span class="sympad">equals</span>(<a href="http://developer.android.com/reference/java/lang/Object.html">Object</a> arg0)</nobr>

        

  </td></tr>
@@ -967,7 +967,7 @@ From class 
            final

            

            

            Class&lt;?&gt;</nobr>

            <a href="http://developer.android.com/reference/java/lang/Class.html">Class</a>&lt;?&gt;</nobr>

        </td>

        <td class="jd-linkcol" width="100%"><nobr>

        <span class="sympad">getClass</span>()</nobr>
@@ -1031,7 +1031,7 @@ From class 
            

            

            

            String</nobr>

            <a href="http://developer.android.com/reference/java/lang/String.html">String</a></nobr>

        </td>

        <td class="jd-linkcol" width="100%"><nobr>

        <span class="sympad">toString</span>()</nobr>