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

Commit c276b618 authored by Sebastien Hertz's avatar Sebastien Hertz Committed by Android Git Automerger
Browse files

am 837b140c: resolved conflicts for merge of f44baef1 to lmp-mr1-dev-plus-aosp 

* commit '837b140c':
  cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
parents 8caccd4c 837b140c

docs/html/gms_navtree_data.js

+4 −4
Original line number Diff line number Diff line
@@ -71,12 +71,12 @@ var GMS_NAVTREE_DATA = 
, null ], [ "com.google.android.gms.drive.widget", "reference/com/google/android/gms/drive/widget/package-summary.html", [ [ "Classes", null, [ [ "DataBufferAdapter", "reference/com/google/android/gms/drive/widget/DataBufferAdapter.html", null, null ] ]

, null ] ]

, null ], [ "com.google.android.gms.fitness", "reference/com/google/android/gms/fitness/package-summary.html", [ [ "Interfaces", null, [ [ "BleApi", "reference/com/google/android/gms/fitness/BleApi.html", null, null ], [ "ConfigApi", "reference/com/google/android/gms/fitness/ConfigApi.html", null, null ], [ "HistoryApi", "reference/com/google/android/gms/fitness/HistoryApi.html", null, null ], [ "RecordingApi", "reference/com/google/android/gms/fitness/RecordingApi.html", null, null ], [ "SensorsApi", "reference/com/google/android/gms/fitness/SensorsApi.html", null, null ], [ "SessionsApi", "reference/com/google/android/gms/fitness/SessionsApi.html", null, null ] ]

, null ], [ "Classes", null, [ [ "Fitness", "reference/com/google/android/gms/fitness/Fitness.html", null, null ], [ "FitnessActivities", "reference/com/google/android/gms/fitness/FitnessActivities.html", null, null ], [ "FitnessIntents", "reference/com/google/android/gms/fitness/FitnessIntents.html", null, null ], [ "FitnessScopes", "reference/com/google/android/gms/fitness/FitnessScopes.html", null, null ], [ "FitnessStatusCodes", "reference/com/google/android/gms/fitness/FitnessStatusCodes.html", null, null ], [ "ViewDataIntentBuilder", "reference/com/google/android/gms/fitness/ViewDataIntentBuilder.html", null, null ], [ "ViewSessionIntentBuilder", "reference/com/google/android/gms/fitness/ViewSessionIntentBuilder.html", null, null ] ]

, null ], [ "Classes", null, [ [ "Fitness", "reference/com/google/android/gms/fitness/Fitness.html", null, null ], [ "FitnessActivities", "reference/com/google/android/gms/fitness/FitnessActivities.html", null, null ], [ "FitnessStatusCodes", "reference/com/google/android/gms/fitness/FitnessStatusCodes.html", null, null ], [ "HistoryApi.ViewIntentBuilder", "reference/com/google/android/gms/fitness/HistoryApi.ViewIntentBuilder.html", null, null ], [ "SessionsApi.ViewIntentBuilder", "reference/com/google/android/gms/fitness/SessionsApi.ViewIntentBuilder.html", null, null ] ]

, null ] ]

, null ], [ "com.google.android.gms.fitness.data", "reference/com/google/android/gms/fitness/data/package-summary.html", [ [ "Classes", null, [ [ "AggregateDataTypes", "reference/com/google/android/gms/fitness/data/AggregateDataTypes.html", null, null ], [ "BleDevice", "reference/com/google/android/gms/fitness/data/BleDevice.html", null, null ], [ "Bucket", "reference/com/google/android/gms/fitness/data/Bucket.html", null, null ], [ "DataPoint", "reference/com/google/android/gms/fitness/data/DataPoint.html", null, null ], [ "DataSet", "reference/com/google/android/gms/fitness/data/DataSet.html", null, null ], [ "DataSource", "reference/com/google/android/gms/fitness/data/DataSource.html", null, null ], [ "DataSource.Builder", "reference/com/google/android/gms/fitness/data/DataSource.Builder.html", null, null ], [ "DataType", "reference/com/google/android/gms/fitness/data/DataType.html", null, null ], [ "DataTypes", "reference/com/google/android/gms/fitness/data/DataTypes.html", null, null ], [ "Device", "reference/com/google/android/gms/fitness/data/Device.html", null, null ], [ "Field", "reference/com/google/android/gms/fitness/data/Field.html", null, null ], [ "Fields", "reference/com/google/android/gms/fitness/data/Fields.html", null, null ], [ "Session", "reference/com/google/android/gms/fitness/data/Session.html", null, null ], [ "Session.Builder", "reference/com/google/android/gms/fitness/data/Session.Builder.html", null, null ], [ "Subscription", "reference/com/google/android/gms/fitness/data/Subscription.html", null, null ], [ "Value", "reference/com/google/android/gms/fitness/data/Value.html", null, null ] ]

, null ], [ "com.google.android.gms.fitness.data", "reference/com/google/android/gms/fitness/data/package-summary.html", [ [ "Classes", null, [ [ "BleDevice", "reference/com/google/android/gms/fitness/data/BleDevice.html", null, null ], [ "Bucket", "reference/com/google/android/gms/fitness/data/Bucket.html", null, null ], [ "DataPoint", "reference/com/google/android/gms/fitness/data/DataPoint.html", null, null ], [ "DataSet", "reference/com/google/android/gms/fitness/data/DataSet.html", null, null ], [ "DataSource", "reference/com/google/android/gms/fitness/data/DataSource.html", null, null ], [ "DataSource.Builder", "reference/com/google/android/gms/fitness/data/DataSource.Builder.html", null, null ], [ "DataType", "reference/com/google/android/gms/fitness/data/DataType.html", null, null ], [ "Device", "reference/com/google/android/gms/fitness/data/Device.html", null, null ], [ "Field", "reference/com/google/android/gms/fitness/data/Field.html", null, null ], [ "Session", "reference/com/google/android/gms/fitness/data/Session.html", null, null ], [ "Session.Builder", "reference/com/google/android/gms/fitness/data/Session.Builder.html", null, null ], [ "Subscription", "reference/com/google/android/gms/fitness/data/Subscription.html", null, null ], [ "Value", "reference/com/google/android/gms/fitness/data/Value.html", null, null ] ]

, null ] ]

, null ], [ "com.google.android.gms.fitness.request", "reference/com/google/android/gms/fitness/request/package-summary.html", [ [ "Interfaces", null, [ [ "BleScanCallback", "reference/com/google/android/gms/fitness/request/BleScanCallback.html", null, null ], [ "DataSourceListener", "reference/com/google/android/gms/fitness/request/DataSourceListener.html", null, null ] ]

, null ], [ "Classes", null, [ [ "DataDeleteRequest", "reference/com/google/android/gms/fitness/request/DataDeleteRequest.html", null, null ], [ "DataDeleteRequest.Builder", "reference/com/google/android/gms/fitness/request/DataDeleteRequest.Builder.html", null, null ], [ "DataInsertRequest", "reference/com/google/android/gms/fitness/request/DataInsertRequest.html", null, null ], [ "DataInsertRequest.Builder", "reference/com/google/android/gms/fitness/request/DataInsertRequest.Builder.html", null, null ], [ "DataReadRequest", "reference/com/google/android/gms/fitness/request/DataReadRequest.html", null, null ], [ "DataReadRequest.Builder", "reference/com/google/android/gms/fitness/request/DataReadRequest.Builder.html", null, null ], [ "DataSourcesRequest", "reference/com/google/android/gms/fitness/request/DataSourcesRequest.html", null, null ], [ "DataSourcesRequest.Builder", "reference/com/google/android/gms/fitness/request/DataSourcesRequest.Builder.html", null, null ], [ "DataTypeCreateRequest", "reference/com/google/android/gms/fitness/request/DataTypeCreateRequest.html", null, null ], [ "DataTypeCreateRequest.Builder", "reference/com/google/android/gms/fitness/request/DataTypeCreateRequest.Builder.html", null, null ], [ "SensorRequest", "reference/com/google/android/gms/fitness/request/SensorRequest.html", null, null ], [ "SensorRequest.Builder", "reference/com/google/android/gms/fitness/request/SensorRequest.Builder.html", null, null ], [ "SessionInsertRequest", "reference/com/google/android/gms/fitness/request/SessionInsertRequest.html", null, null ], [ "SessionInsertRequest.Builder", "reference/com/google/android/gms/fitness/request/SessionInsertRequest.Builder.html", null, null ], [ "SessionReadRequest", "reference/com/google/android/gms/fitness/request/SessionReadRequest.html", null, null ], [ "SessionReadRequest.Builder", "reference/com/google/android/gms/fitness/request/SessionReadRequest.Builder.html", null, null ], [ "StartBleScanRequest", "reference/com/google/android/gms/fitness/request/StartBleScanRequest.html", null, null ], [ "StartBleScanRequest.Builder", "reference/com/google/android/gms/fitness/request/StartBleScanRequest.Builder.html", null, null ], [ "UnclaimBleDeviceRequest", "reference/com/google/android/gms/fitness/request/UnclaimBleDeviceRequest.html", null, null ] ]

, null ], [ "com.google.android.gms.fitness.request", "reference/com/google/android/gms/fitness/request/package-summary.html", [ [ "Interfaces", null, [ [ "OnDataPointListener", "reference/com/google/android/gms/fitness/request/OnDataPointListener.html", null, null ] ]

, null ], [ "Classes", null, [ [ "BleScanCallback", "reference/com/google/android/gms/fitness/request/BleScanCallback.html", null, null ], [ "DataDeleteRequest", "reference/com/google/android/gms/fitness/request/DataDeleteRequest.html", null, null ], [ "DataDeleteRequest.Builder", "reference/com/google/android/gms/fitness/request/DataDeleteRequest.Builder.html", null, null ], [ "DataReadRequest", "reference/com/google/android/gms/fitness/request/DataReadRequest.html", null, null ], [ "DataReadRequest.Builder", "reference/com/google/android/gms/fitness/request/DataReadRequest.Builder.html", null, null ], [ "DataSourcesRequest", "reference/com/google/android/gms/fitness/request/DataSourcesRequest.html", null, null ], [ "DataSourcesRequest.Builder", "reference/com/google/android/gms/fitness/request/DataSourcesRequest.Builder.html", null, null ], [ "DataTypeCreateRequest", "reference/com/google/android/gms/fitness/request/DataTypeCreateRequest.html", null, null ], [ "DataTypeCreateRequest.Builder", "reference/com/google/android/gms/fitness/request/DataTypeCreateRequest.Builder.html", null, null ], [ "SensorRequest", "reference/com/google/android/gms/fitness/request/SensorRequest.html", null, null ], [ "SensorRequest.Builder", "reference/com/google/android/gms/fitness/request/SensorRequest.Builder.html", null, null ], [ "SessionInsertRequest", "reference/com/google/android/gms/fitness/request/SessionInsertRequest.html", null, null ], [ "SessionInsertRequest.Builder", "reference/com/google/android/gms/fitness/request/SessionInsertRequest.Builder.html", null, null ], [ "SessionReadRequest", "reference/com/google/android/gms/fitness/request/SessionReadRequest.html", null, null ], [ "SessionReadRequest.Builder", "reference/com/google/android/gms/fitness/request/SessionReadRequest.Builder.html", null, null ], [ "StartBleScanRequest", "reference/com/google/android/gms/fitness/request/StartBleScanRequest.html", null, null ], [ "StartBleScanRequest.Builder", "reference/com/google/android/gms/fitness/request/StartBleScanRequest.Builder.html", null, null ] ]

, null ] ]

, null ], [ "com.google.android.gms.fitness.result", "reference/com/google/android/gms/fitness/result/package-summary.html", [ [ "Classes", null, [ [ "BleDevicesResult", "reference/com/google/android/gms/fitness/result/BleDevicesResult.html", null, null ], [ "DataReadResult", "reference/com/google/android/gms/fitness/result/DataReadResult.html", null, null ], [ "DataSourcesResult", "reference/com/google/android/gms/fitness/result/DataSourcesResult.html", null, null ], [ "DataTypeResult", "reference/com/google/android/gms/fitness/result/DataTypeResult.html", null, null ], [ "ListSubscriptionsResult", "reference/com/google/android/gms/fitness/result/ListSubscriptionsResult.html", null, null ], [ "SessionReadResult", "reference/com/google/android/gms/fitness/result/SessionReadResult.html", null, null ], [ "SessionStopResult", "reference/com/google/android/gms/fitness/result/SessionStopResult.html", null, null ] ]

, null ] ]