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

Commit d8573aa5 authored by Luan Nguyen's avatar Luan Nguyen Committed by Android Git Automerger
Browse files

am dfa79aeb: am d5600855: Merge "docs: Refresh Wearable support library...

am dfa79aeb: am d5600855: Merge "docs: Refresh Wearable support library reference for Diamond" into lmp-mr1-ub-docs

* commit 'dfa79aeb':
  docs: Refresh Wearable support library reference for Diamond
parents f644f702 dfa79aeb
Loading
Loading
Loading
Loading
+1380 −0

File added.

Preview size limit exceeded, changes collapsed.

+1192 −0

File added.

Preview size limit exceeded, changes collapsed.

+742 −21

File changed.

Preview size limit exceeded, changes collapsed.

+482 −17
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@
href="http://fonts.googleapis.com/css?family=Roboto+Condensed">
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto:light,regular,medium,thin,italic,mediumitalic,bold"
  title="roboto">
<link href="../../../../assets/css/default.css?v=4" rel="stylesheet" type="text/css">
<link href="../../../../assets/css/default.css?v=5" rel="stylesheet" type="text/css">


<!-- FULLSCREEN STYLESHEET -->
@@ -397,6 +397,7 @@ type="text/css">
                <li><a href="../../../../distribute/users/index.html">Get Users</a></li>
                <li><a href="../../../../distribute/engage/index.html">Engage &amp; Retain</a></li>
                <li><a href="../../../../distribute/monetize/index.html">Monetize</a></li>
                <li><a href="../../../../distribute/analyze/index.html">Analyze</a></li>
                <li><a href="../../../../distribute/tools/index.html">Tools &amp; Reference</a></li>
                <li><a href="../../../../distribute/stories/index.html">Developer Stories</a></li>
              </ul>
@@ -413,19 +414,6 @@ type="text/css">

        
        
            <a id="helpoutsLink" class="resource resource-card resource-card-6x2x3 resource-card-6x2 helpouts-card" 
              href="http://helpouts.google.com/partner/landing/provider/googledevelopers?utm_source=dac&utm_medium=banner&utm_campaign=android_provider_banner3" target="_blank">
              <div class="card-bg helpouts-card-bg"></div>
              <div class="card-info">
                <div class="helpouts-description">
                  <div class="text">Help Android Wear and TV developers<br/>
                    <span id="helpoutsLinkText" class="link-color" 
                    style="display:block;padding-top:5px;text-align:right">Learn more</span>
                  </div>
                </div>
              </div>
            </a>
        
        

            <ul class="nav-x col-9 develop" style="width:100%">
@@ -527,6 +515,10 @@ type="text/css">
    <li class="api apilevel-">
  <a href="../../../../reference/android/support/wearable/companion/package-summary.html">android.support.wearable.companion</a></li>
    <li class="api apilevel-">
  <a href="../../../../reference/android/support/wearable/input/package-summary.html">android.support.wearable.input</a></li>
    <li class="api apilevel-">
  <a href="../../../../reference/android/support/wearable/media/package-summary.html">android.support.wearable.media</a></li>
    <li class="api apilevel-">
  <a href="../../../../reference/android/support/wearable/provider/package-summary.html">android.support.wearable.provider</a></li>
    <li class="api apilevel-">
  <a href="../../../../reference/android/support/wearable/view/package-summary.html">android.support.wearable.view</a></li>
@@ -547,12 +539,16 @@ type="text/css">
    <li><h2>Classes</h2>
      <ul>
          <li class="api apilevel-"><a href="../../../../reference/android/support/wearable/R.html">R</a></li>
          <li class="api apilevel-"><a href="../../../../reference/android/support/wearable/R.anim.html">R.anim</a></li>
          <li class="api apilevel-"><a href="../../../../reference/android/support/wearable/R.animator.html">R.animator</a></li>
          <li class="api apilevel-"><a href="../../../../reference/android/support/wearable/R.attr.html">R.attr</a></li>
          <li class="selected api apilevel-"><a href="../../../../reference/android/support/wearable/R.color.html">R.color</a></li>
          <li class="api apilevel-"><a href="../../../../reference/android/support/wearable/R.dimen.html">R.dimen</a></li>
          <li class="api apilevel-"><a href="../../../../reference/android/support/wearable/R.drawable.html">R.drawable</a></li>
          <li class="api apilevel-"><a href="../../../../reference/android/support/wearable/R.id.html">R.id</a></li>
          <li class="api apilevel-"><a href="../../../../reference/android/support/wearable/R.interpolator.html">R.interpolator</a></li>
          <li class="api apilevel-"><a href="../../../../reference/android/support/wearable/R.layout.html">R.layout</a></li>
          <li class="api apilevel-"><a href="../../../../reference/android/support/wearable/R.string.html">R.string</a></li>
          <li class="api apilevel-"><a href="../../../../reference/android/support/wearable/R.style.html">R.style</a></li>
          <li class="api apilevel-"><a href="../../../../reference/android/support/wearable/R.styleable.html">R.styleable</a></li>
      </ul>
@@ -718,7 +714,6 @@ Summary:




</div><!-- jd-descr -->


@@ -768,6 +763,22 @@ Summary:
          public
          static
          
          int</nobr></td>
          <td class="jd-linkcol"><a href="../../../../reference/android/support/wearable/R.color.html#action_button_background">action_button_background</a></td>
          <td class="jd-descrcol" width="100%">
            
            
    

          </td>
      </tr>
      
    
      <tr class=" api apilevel-" >
          <td class="jd-typecol"><nobr>
          public
          static
          
          int</nobr></td>
          <td class="jd-linkcol"><a href="../../../../reference/android/support/wearable/R.color.html#black">black</a></td>
          <td class="jd-descrcol" width="100%">
@@ -775,6 +786,22 @@ Summary:
            
    

          </td>
      </tr>
      
    
      <tr class="alt-color api apilevel-" >
          <td class="jd-typecol"><nobr>
          public
          static
          
          int</nobr></td>
          <td class="jd-linkcol"><a href="../../../../reference/android/support/wearable/R.color.html#black_54p">black_54p</a></td>
          <td class="jd-descrcol" width="100%">
            
            
    

          </td>
      </tr>
      
@@ -785,7 +812,7 @@ Summary:
          static
          
          int</nobr></td>
          <td class="jd-linkcol"><a href="../../../../reference/android/support/wearable/R.color.html#blue">blue</a></td>
          <td class="jd-linkcol"><a href="../../../../reference/android/support/wearable/R.color.html#black_86p">black_86p</a></td>
          <td class="jd-descrcol" width="100%">
            
            
@@ -800,6 +827,22 @@ Summary:
          public
          static
          
          int</nobr></td>
          <td class="jd-linkcol"><a href="../../../../reference/android/support/wearable/R.color.html#blue">blue</a></td>
          <td class="jd-descrcol" width="100%">
            
            
    

          </td>
      </tr>
      
    
      <tr class=" api apilevel-" >
          <td class="jd-typecol"><nobr>
          public
          static
          
          int</nobr></td>
          <td class="jd-linkcol"><a href="../../../../reference/android/support/wearable/R.color.html#card_default_background">card_default_background</a></td>
          <td class="jd-descrcol" width="100%">
@@ -807,6 +850,22 @@ Summary:
            
    

          </td>
      </tr>
      
    
      <tr class="alt-color api apilevel-" >
          <td class="jd-typecol"><nobr>
          public
          static
          
          int</nobr></td>
          <td class="jd-linkcol"><a href="../../../../reference/android/support/wearable/R.color.html#circular_button">circular_button</a></td>
          <td class="jd-descrcol" width="100%">
            
            
    

          </td>
      </tr>
      
@@ -817,7 +876,39 @@ Summary:
          static
          
          int</nobr></td>
          <td class="jd-linkcol"><a href="../../../../reference/android/support/wearable/R.color.html#dark_blue">dark_blue</a></td>
          <td class="jd-linkcol"><a href="../../../../reference/android/support/wearable/R.color.html#circular_button_disabled">circular_button_disabled</a></td>
          <td class="jd-descrcol" width="100%">
            
            
    

          </td>
      </tr>
      
    
      <tr class="alt-color api apilevel-" >
          <td class="jd-typecol"><nobr>
          public
          static
          
          int</nobr></td>
          <td class="jd-linkcol"><a href="../../../../reference/android/support/wearable/R.color.html#circular_button_normal">circular_button_normal</a></td>
          <td class="jd-descrcol" width="100%">
            
            
    

          </td>
      </tr>
      
    
      <tr class=" api apilevel-" >
          <td class="jd-typecol"><nobr>
          public
          static
          
          int</nobr></td>
          <td class="jd-linkcol"><a href="../../../../reference/android/support/wearable/R.color.html#circular_button_pressed">circular_button_pressed</a></td>
          <td class="jd-descrcol" width="100%">
            
            
@@ -832,6 +923,22 @@ Summary:
          public
          static
          
          int</nobr></td>
          <td class="jd-linkcol"><a href="../../../../reference/android/support/wearable/R.color.html#dark_blue">dark_blue</a></td>
          <td class="jd-descrcol" width="100%">
            
            
    

          </td>
      </tr>
      
    
      <tr class=" api apilevel-" >
          <td class="jd-typecol"><nobr>
          public
          static
          
          int</nobr></td>
          <td class="jd-linkcol"><a href="../../../../reference/android/support/wearable/R.color.html#dark_grey">dark_grey</a></td>
          <td class="jd-descrcol" width="100%">
@@ -839,6 +946,54 @@ Summary:
            
    

          </td>
      </tr>
      
    
      <tr class="alt-color api apilevel-" >
          <td class="jd-typecol"><nobr>
          public
          static
          
          int</nobr></td>
          <td class="jd-linkcol"><a href="../../../../reference/android/support/wearable/R.color.html#dark_red">dark_red</a></td>
          <td class="jd-descrcol" width="100%">
            
            
    

          </td>
      </tr>
      
    
      <tr class=" api apilevel-" >
          <td class="jd-typecol"><nobr>
          public
          static
          
          int</nobr></td>
          <td class="jd-linkcol"><a href="../../../../reference/android/support/wearable/R.color.html#dialog_background">dialog_background</a></td>
          <td class="jd-descrcol" width="100%">
            
            
    

          </td>
      </tr>
      
    
      <tr class="alt-color api apilevel-" >
          <td class="jd-typecol"><nobr>
          public
          static
          
          int</nobr></td>
          <td class="jd-linkcol"><a href="../../../../reference/android/support/wearable/R.color.html#dialog_shade_background">dialog_shade_background</a></td>
          <td class="jd-descrcol" width="100%">
            
            
    

          </td>
      </tr>
      
@@ -1349,6 +1504,37 @@ From class



<A NAME="action_button_background"></A>

<div class="jd-details api apilevel-"> 
    <h4 class="jd-details-title">
      <span class="normal">
        public 
        static 
         
        int
      </span>
        action_button_background
    </h4>
      <div class="api-level">
        
        
  

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

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

    
    </div>
</div>



<A NAME="black"></A>

<div class="jd-details api apilevel-"> 
@@ -1380,6 +1566,68 @@ From class



<A NAME="black_54p"></A>

<div class="jd-details api apilevel-"> 
    <h4 class="jd-details-title">
      <span class="normal">
        public 
        static 
         
        int
      </span>
        black_54p
    </h4>
      <div class="api-level">
        
        
  

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

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

    
    </div>
</div>



<A NAME="black_86p"></A>

<div class="jd-details api apilevel-"> 
    <h4 class="jd-details-title">
      <span class="normal">
        public 
        static 
         
        int
      </span>
        black_86p
    </h4>
      <div class="api-level">
        
        
  

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

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

    
    </div>
</div>



<A NAME="blue"></A>

<div class="jd-details api apilevel-"> 
@@ -1442,6 +1690,130 @@ From class



<A NAME="circular_button"></A>

<div class="jd-details api apilevel-"> 
    <h4 class="jd-details-title">
      <span class="normal">
        public 
        static 
         
        int
      </span>
        circular_button
    </h4>
      <div class="api-level">
        
        
  

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

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

    
    </div>
</div>



<A NAME="circular_button_disabled"></A>

<div class="jd-details api apilevel-"> 
    <h4 class="jd-details-title">
      <span class="normal">
        public 
        static 
         
        int
      </span>
        circular_button_disabled
    </h4>
      <div class="api-level">
        
        
  

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

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

    
    </div>
</div>



<A NAME="circular_button_normal"></A>

<div class="jd-details api apilevel-"> 
    <h4 class="jd-details-title">
      <span class="normal">
        public 
        static 
         
        int
      </span>
        circular_button_normal
    </h4>
      <div class="api-level">
        
        
  

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

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

    
    </div>
</div>



<A NAME="circular_button_pressed"></A>

<div class="jd-details api apilevel-"> 
    <h4 class="jd-details-title">
      <span class="normal">
        public 
        static 
         
        int
      </span>
        circular_button_pressed
    </h4>
      <div class="api-level">
        
        
  

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

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

    
    </div>
</div>



<A NAME="dark_blue"></A>

<div class="jd-details api apilevel-"> 
@@ -1504,6 +1876,99 @@ From class



<A NAME="dark_red"></A>

<div class="jd-details api apilevel-"> 
    <h4 class="jd-details-title">
      <span class="normal">
        public 
        static 
         
        int
      </span>
        dark_red
    </h4>
      <div class="api-level">
        
        
  

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

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

    
    </div>
</div>



<A NAME="dialog_background"></A>

<div class="jd-details api apilevel-"> 
    <h4 class="jd-details-title">
      <span class="normal">
        public 
        static 
         
        int
      </span>
        dialog_background
    </h4>
      <div class="api-level">
        
        
  

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

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

    
    </div>
</div>



<A NAME="dialog_shade_background"></A>

<div class="jd-details api apilevel-"> 
    <h4 class="jd-details-title">
      <span class="normal">
        public 
        static 
         
        int
      </span>
        dialog_shade_background
    </h4>
      <div class="api-level">
        
        
  

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

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

    
    </div>
</div>



<A NAME="disabled_text_light"></A>

<div class="jd-details api apilevel-"> 
+623 −17

File changed.

Preview size limit exceeded, changes collapsed.

Loading