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

Commit e768571e authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 22a65164: am d54bc800: am 71c4fc81: Merge "docs: change download URLs for... 

am 22a65164: am d54bc800: am 71c4fc81: Merge "docs: change download URLs for design assets. These new URLs are dummies that are handled by a redirect rule for all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/ Using thi

* commit '22a65164':
  docs: change download URLs for design assets. These new URLs are dummies that are handled by a redirect rule for all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/ Using this redirect allows us to change the storage location of the download assets in the future.
parents 573a22a3 22a65164

docs/html/design/downloads/index.jd

+9 −9
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ You can also download individual files listed below.</p> 
  <div class="layout-content-col span-4">



<p>

  <a class="download-button" href="https://dl-ssl.google.com/android/design/Android_Design_Downloads_20120814.zip">Download All</a>

  <a class="download-button" href="{@docRoot}downloads/design/Android_Design_Downloads_20120814.zip">Download All</a>

</p>



  </div>
@@ -37,10 +37,10 @@ available.</p> 
  <div class="layout-content-col span-4">



<p>

  <a class="download-button" href="https://dl-ssl.google.com/android/design/Android_Design_Fireworks_Stencil_20120814.png">Adobe&reg; Fireworks&reg; PNG Stencil</a>

  <a class="download-button" href="https://dl-ssl.google.com/android/design/Android_Design_Illustrator_Vectors_20120814.ai">Adobe&reg; Illustrator&reg; Stencil</a>

  <a class="download-button" href="https://dl-ssl.google.com/android/design/Android_Design_OmniGraffle_Stencil_20120814.graffle">Omni&reg; OmniGraffle&reg; Stencil</a>

  <a class="download-button" href="https://dl-ssl.google.com/android/design/Android_Design_Holo_Widgets_20120814.zip">Adobe&reg; Photoshop&reg; Sources</a>

  <a class="download-button" href="{@docRoot}downloads/design/Android_Design_Fireworks_Stencil_20120814.png">Adobe&reg; Fireworks&reg; PNG Stencil</a>

  <a class="download-button" href="{@docRoot}downloads/design/Android_Design_Illustrator_Vectors_20120814.ai">Adobe&reg; Illustrator&reg; Stencil</a>

  <a class="download-button" href="{@docRoot}downloads/design/Android_Design_OmniGraffle_Stencil_20120814.graffle">Omni&reg; OmniGraffle&reg; Stencil</a>

  <a class="download-button" href="{@docRoot}downloads/design/Android_Design_Holo_Widgets_20120814.zip">Adobe&reg; Photoshop&reg; Sources</a>

</p>



  </div>
@@ -66,7 +66,7 @@ modify to match your theme, plus source files.</p> 
  <div class="layout-content-col span-4">



<p>

  <a class="download-button" href="https://dl-ssl.google.com/android/design/Android_Design_Icons_20120814.zip">Action Bar Icon Pack</a>

  <a class="download-button" href="{@docRoot}downloads/design/Android_Design_Icons_20120814.zip">Action Bar Icon Pack</a>

</p>



  </div>
@@ -91,8 +91,8 @@ requirements of UI and high-resolution screens.</p> 
  <div class="layout-content-col span-4">



<p>

  <a class="download-button" href="https://dl-ssl.google.com/android/design/Roboto_Hinted_20111129.zip">Roboto</a>

  <a class="download-button" href="https://dl-ssl.google.com/android/design/Roboto_Specimen_Book_20111129.pdf">Specimen Book</a>

  <a class="download-button" href="{@docRoot}downloads/design/Roboto_Hinted_20111129.zip">Roboto</a>

  <a class="download-button" href="{@docRoot}downloads/design/Roboto_Specimen_Book_20111129.pdf">Specimen Book</a>

</p>



  </div>
@@ -115,7 +115,7 @@ shade that can be used as a complement when needed.</p> 
  <div class="layout-content-col span-4">



<p>

  <a class="download-button" href="https://dl-ssl.google.com/android/design/Android_Design_Color_Swatches_20120229.zip">Color Swatches</a>

  <a class="download-button" href="{@docRoot}downloads/design/Android_Design_Color_Swatches_20120229.zip">Color Swatches</a>

</p>



  </div>

docs/html/design/patterns/actionbar.jd

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ files for further customization. 
</p>

<p>



<a href="https://dl-ssl.google.com/android/design/Android_Design_Icons_20120229.zip">Download the Action Bar Icon Pack</a>

<a href="{@docRoot}downloads/design/Android_Design_Icons_20120229.zip">Download the Action Bar Icon Pack</a>



</p>

docs/html/design/style/color.jd

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ between visual components. Note that red and green may be indistinguishable to c 


<p>Blue is the standard accent color in Android's color palette. Each color has a corresponding darker

shade that can be used as a complement when needed.</p>

<p><a href="https://dl-ssl.google.com/android/design/Android_Design_Color_Swatches_20120229.zip">Download the swatches</a></p>

<p><a href="{@docRoot}downloads/design/Android_Design_Color_Swatches_20120229.zip">Download the swatches</a></p>



<img src="{@docRoot}design/media/color_spectrum.png">

docs/html/design/style/iconography.jd

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ files for further customization. 
</p>

<p>



<a href="https://dl-ssl.google.com/android/design/Android_Design_Icons_20120229.zip">Download the Action Bar Icon Pack</a>

<a href="{@docRoot}downloads/design/Android_Design_Icons_20120229.zip">Download the Action Bar Icon Pack</a>



</p>

docs/html/design/style/typography.jd

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ italic weights by default.</p> 


    <img src="{@docRoot}design/media/typography_alphas.png">



<p><a href="https://dl-ssl.google.com/android/design/Roboto_Hinted_20111129.zip">Download Roboto</a></p>

<p><a href="https://dl-ssl.google.com/android/design/Roboto_Specimen_Book_20111129.pdf">Specimen Book</a></p>

<p><a href="{@docRoot}downloads/design/Roboto_Hinted_20111129.zip">Download Roboto</a></p>

<p><a href="{@docRoot}downloads/design/Roboto_Specimen_Book_20111129.pdf">Specimen Book</a></p>



  </div>

</div>