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

Commit 837b140c authored by Sebastien Hertz's avatar Sebastien Hertz
Browse files

resolved conflicts for merge of f44baef1 to lmp-mr1-dev-plus-aosp 

Change-Id: I754fa19727d0c1db7ca2110b7cae51c9f7c15e00
parents 1b9813ad f44baef1

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 ] ]

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

+626 −78

File changed.

Preview size limit exceeded, changes collapsed.

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

+297 −29
Original line number Diff line number Diff line
@@ -72,6 +72,17 @@
@@ -113,6 +124,8 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
</script>

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







<script>

  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -128,7 +141,7 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
</head>



<body class="gc-documentation google

  develop" itemscope itemtype="http://schema.org/Article">

  develop reference" itemscope itemtype="http://schema.org/Article">

  <div id="doc-api-level" class="" style="display:none"></div>

  <a name="top"></a>
@@ -138,6 +151,10 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
  <!-- Header -->

  <div id="header-wrapper">

    <div id="header">









      <div class="wrap" id="header-wrap">

        <div class="col-3 logo">

          <a href="/index.html">
@@ -360,7 +377,36 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
  

    <!-- Secondary x-nav -->

    <div id="nav-x">

        <div class="wrap">

        <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%">

                <li class="training"><a href="/training/index.html"

                  zh-tw-lang="訓練課程"
@@ -775,6 +821,9 @@ Summary: 
  











</div><!-- end header -->



<div id="naMessage"></div>
@@ -863,7 +912,12 @@ Summary: 
          

          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -874,7 +928,12 @@ Summary: 
          

          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -885,7 +944,12 @@ Summary: 
          

          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -896,7 +960,12 @@ Summary: 
          

          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -907,7 +976,12 @@ Summary: 
          

          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -918,7 +992,12 @@ Summary: 
          

          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -929,7 +1008,12 @@ Summary: 
          

          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -940,7 +1024,12 @@ Summary: 
          

          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -951,7 +1040,12 @@ Summary: 
          

          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -962,7 +1056,12 @@ Summary: 
          

          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -973,7 +1072,12 @@ Summary: 
          

          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -984,7 +1088,12 @@ Summary: 
          

          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -995,7 +1104,12 @@ Summary: 


          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -1006,7 +1120,12 @@ Summary: 


          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -1017,7 +1136,12 @@ Summary: 


          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -1028,7 +1152,12 @@ Summary: 


          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -1039,7 +1168,12 @@ Summary: 


          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -1050,7 +1184,12 @@ Summary: 


          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -1061,7 +1200,12 @@ Summary: 


          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -1072,7 +1216,12 @@ Summary: 


          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -1083,7 +1232,12 @@ Summary: 


          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -1094,7 +1248,12 @@ Summary: 


          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -1105,7 +1264,12 @@ Summary: 


          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -1116,7 +1280,12 @@ Summary: 


          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -1127,7 +1296,12 @@ Summary: 


          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -1138,7 +1312,12 @@ Summary: 


          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -1149,7 +1328,12 @@ Summary: 


          int</nobr></td>

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

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

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









          </td>

      </tr>
@@ -1455,6 +1639,9 @@ From class 
      </div>

    <div class="jd-details-descr">

      







  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -1483,6 +1670,9 @@ From class 
      </div>

    <div class="jd-details-descr">

      







  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -1511,6 +1701,9 @@ From class 
      </div>

    <div class="jd-details-descr">

      







  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -1539,6 +1732,9 @@ From class 
      </div>

    <div class="jd-details-descr">

      







  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -1567,6 +1763,9 @@ From class 
      </div>

    <div class="jd-details-descr">

      







  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -1595,6 +1794,9 @@ From class 
      </div>

    <div class="jd-details-descr">

      







  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -1623,6 +1825,9 @@ From class 
      </div>

    <div class="jd-details-descr">

      







  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -1651,6 +1856,9 @@ From class 
      </div>

    <div class="jd-details-descr">

      







  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -1679,6 +1887,9 @@ From class 
      </div>

    <div class="jd-details-descr">

      







  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -1707,6 +1918,9 @@ From class 
      </div>

    <div class="jd-details-descr">

      







  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -1735,6 +1949,9 @@ From class 
      </div>

    <div class="jd-details-descr">

      







  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -1763,6 +1980,9 @@ From class 
      </div>

    <div class="jd-details-descr">

      







  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -1791,6 +2011,9 @@ From class 
      </div>

    <div class="jd-details-descr">









  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -1819,6 +2042,9 @@ From class 
      </div>

    <div class="jd-details-descr">









  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -1847,6 +2073,9 @@ From class 
      </div>

    <div class="jd-details-descr">









  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -1875,6 +2104,9 @@ From class 
      </div>

    <div class="jd-details-descr">









  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -1903,6 +2135,9 @@ From class 
      </div>

    <div class="jd-details-descr">









  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -1931,6 +2166,9 @@ From class 
      </div>

    <div class="jd-details-descr">









  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -1959,6 +2197,9 @@ From class 
      </div>

    <div class="jd-details-descr">









  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -1987,6 +2228,9 @@ From class 
      </div>

    <div class="jd-details-descr">









  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -2015,6 +2259,9 @@ From class 
      </div>

    <div class="jd-details-descr">









  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -2043,6 +2290,9 @@ From class 
      </div>

    <div class="jd-details-descr">









  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -2071,6 +2321,9 @@ From class 
      </div>

    <div class="jd-details-descr">









  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -2099,6 +2352,9 @@ From class 
      </div>

    <div class="jd-details-descr">









  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -2127,6 +2383,9 @@ From class 
      </div>

    <div class="jd-details-descr">









  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -2155,6 +2414,9 @@ From class 
      </div>

    <div class="jd-details-descr">









  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -2183,6 +2445,9 @@ From class 
      </div>

    <div class="jd-details-descr">









  <div class="jd-tagdata jd-tagdescr"><p></p></div>
@@ -2223,6 +2488,9 @@ From class 
      </div>

    <div class="jd-details-descr">

      







  <div class="jd-tagdata jd-tagdescr"><p></p></div>



    </div>

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

+342 −34

File changed.

Preview size limit exceeded, changes collapsed.

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

+102 −10
Original line number Diff line number Diff line
@@ -72,6 +72,17 @@
@@ -113,6 +124,8 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
</script>

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







<script>

  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -128,7 +141,7 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
</head>



<body class="gc-documentation google

  develop" itemscope itemtype="http://schema.org/Article">

  develop reference" itemscope itemtype="http://schema.org/Article">

  <div id="doc-api-level" class="" style="display:none"></div>

  <a name="top"></a>
@@ -138,6 +151,10 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
  <!-- Header -->

  <div id="header-wrapper">

    <div id="header">









      <div class="wrap" id="header-wrap">

        <div class="col-3 logo">

          <a href="/index.html">
@@ -360,7 +377,36 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> 
  

    <!-- Secondary x-nav -->

    <div id="nav-x">

        <div class="wrap">

        <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%">

                <li class="training"><a href="/training/index.html"

                  zh-tw-lang="訓練課程"
@@ -775,6 +821,9 @@ Summary: 
  











</div><!-- end header -->



<div id="naMessage"></div>
@@ -849,7 +898,12 @@ Summary: 
        

        class</nobr></td>

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

      <td class="jd-descrcol" width="100%">&nbsp;</td>

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

        &nbsp;







      </td>

    </tr>
@@ -861,7 +915,12 @@ Summary: 
        

        class</nobr></td>

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

      <td class="jd-descrcol" width="100%">&nbsp;</td>

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

        &nbsp;







      </td>

    </tr>
@@ -873,7 +932,12 @@ Summary: 
        

        class</nobr></td>

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

      <td class="jd-descrcol" width="100%">&nbsp;</td>

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

        &nbsp;







      </td>

    </tr>
@@ -885,7 +949,12 @@ Summary: 
        

        class</nobr></td>

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

      <td class="jd-descrcol" width="100%">&nbsp;</td>

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

        &nbsp;







      </td>

    </tr>
@@ -897,7 +966,12 @@ Summary: 
        

        class</nobr></td>

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

      <td class="jd-descrcol" width="100%">&nbsp;</td>

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

        &nbsp;







      </td>

    </tr>
@@ -909,7 +983,12 @@ 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-descrcol" width="100%">&nbsp;</td>

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

        &nbsp;







      </td>

    </tr>
@@ -921,7 +1000,12 @@ 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>

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

        &nbsp;







      </td>

    </tr>
@@ -933,7 +1017,12 @@ Summary: 


        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%">&nbsp;</td>

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

        &nbsp;







      </td>

    </tr>
@@ -1258,6 +1347,9 @@ From class 
      </div>

    <div class="jd-details-descr">

      







  <div class="jd-tagdata jd-tagdescr"><p></p></div>



    </div>