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

Commit ea761540 authored by Dirk Dougherty's avatar Dirk Dougherty
Browse files

Merge doc changes from cupcake at commit '373271b9'

parents de08cdc0 373271b9

docs/html/community/index.jd

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ page.title=Community 
<p class="note"><strong>Note:</strong> If you are seeking discussion about Android source code (not application development),

then please refer to the <a href="http://source.android.com/discuss">Open Source Project Mailing lists</a>.</p>



<p style="margin-bottom".5em"><strong>Contents</strong></p>

<p style="margin-bottom:.5em"><strong>Contents</strong></p>

<ol class="toc">

  <li><a href="#BeforeYouPost">Before you post</a></li>

  <li><a href="#ApplicationDeveloperLists">Application developer mailing lists</a></li>

docs/html/guide/developing/device.jd

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ would on the emulator. There are just a few things to do before you can start.</ 
      <li>If you're developing on Mac OS X, it just works. Skip this step.</li>

      <li>If you're developing on Ubuntu Linux, you need to add a rules file:

        <ol>

          <li>Login as root and create this file: <code>/etc/udev/rules.d/50-android.rules</code>.

          <li>Login as root and create this file: <code>/etc/udev/rules.d/51-android.rules</code>.

            <p>For Gusty/Hardy, edit the file to read: <br/>

              <code>SUBSYSTEM=="usb", SYSFS{idVendor}=="0bb4", MODE="0666"</code></p>

docs/html/guide/practices/ui_guidelines/icon_design.jd

+12 −228
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ application can use the standard icons by referencing them as resources.</li> 


<li style="margin-top:4px;"><a href="#dodonts">General guidelines</a></li>

<li><a href="#templatespack">Using the Icon Templates Pack</a></li>

<li><a href="#file">Icon appendix</a>

<li><a href="#iconappendix">Icon appendix</a>

	<ol>

	<li><a href="#launcherapx">Launcher icons</a></li>

	<li><a href="#menuapx">Menu icons</a></li>
@@ -989,27 +989,11 @@ simply look at image filenames, which use the format 
<table class="image-caption">

<tr>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_add.png" title="ic_menu_add" alt="Android asset" />

  <div class="caption">Add</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_archive.png" title="ic_menu_archive" alt="Android asset" />

  <div class="caption">Archive</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_attachment.png" title="ic_menu_attachment" alt="Android asset" />

  <div class="caption">Attach</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_back.png" title="ic_menu_back" alt="Android asset" />

  <div class="caption">Back</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_call.png" title="ic_menu_call" alt="Android asset" />

  <div class="caption">Call</div></td>
@@ -1024,9 +1008,6 @@ simply look at image filenames, which use the format 
  <img src="{@docRoot}images/icon_design/ic_menu_close_clear_cancel.png" title="ic_menu_close_clear_cancel" alt="Android asset" />

  <div class="caption">Clear / Close / Cancel / Discard </div></td>



</tr>

<tr>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_compass.png" title="ic_menu_compass" alt="Android asset" />
@@ -1042,50 +1023,24 @@ simply look at image filenames, which use the format 
  <img src="{@docRoot}images/icon_design/ic_menu_directions.png" title="ic_menu_directions" alt="Android asset" />

  <div class="caption">Directions</div></td>



</tr>

<tr>



<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_edit.png" title="ic_menu_edit" alt="Android asset" />

  <div class="caption">Edit</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_favorite.png" title="ic_menu_favorite" alt="Android asset" />

  <div class="caption">Favorite</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_forward.png" title="ic_menu_forward" alt="Android asset" />

  <div class="caption">Forward</div></td>

	



<td class="image-caption-i image-list">	

  <img src="{@docRoot}images/icon_design/ic_menu_gallery.png" title="ic_menu_gallery" alt="Android asset" />

  <div class="caption">Gallery</div></td>



</tr>

<tr>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_goto.png" title="ic_menu_goto" alt="Android asset" />

  <div class="caption">Go to</div></td>

	



<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_help.png" title="ic_menu_help" alt="Android asset" />

  <div class="caption">Help</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_recent_history.png" title="ic_menu_recent_history" alt="Android asset" />

  <div class="caption">History</div></td>

	



<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_home.png" title="ic_menu_home" alt="Android asset" />

  <div class="caption">Home</div></td>

	



<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_info_details.png" title="ic_menu_info_details" alt="Android asset" />

  <div class="caption">Info / details</div></td>
@@ -1096,14 +1051,6 @@ simply look at image filenames, which use the format 
  <div class="caption">Map mode</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_mark.png" title="ic_menu_mark" alt="Android asset" />

  <div class="caption">Mark</div></td>



</tr>

<tr>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_mylocation.png" title="ic_menu_mylocation" alt="Android asset" />

  <div class="caption">My Location</div></td>
@@ -1113,22 +1060,14 @@ simply look at image filenames, which use the format 
  <img src="{@docRoot}images/icon_design/ic_menu_more.png" title="ic_menu_more" alt="Android asset" />

  <div class="caption">More</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_play_clip.png" title="ic_menu_play_clip" alt="Android asset" />

  <div class="caption">Play</div></td>

	

</tr>

<tr>



<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_preferences.png" title="ic_menu_preferences" alt="Android asset" />

  <div class="caption">Preferences</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_refresh.png" title="ic_menu_refresh" alt="Android asset" />

  <div class="caption">Refresh</div></td>

	



<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_rotate.png" title="ic_menu_rotate" alt="Android asset" />

  <div class="caption">Rotate</div></td>
@@ -1138,9 +1077,6 @@ simply look at image filenames, which use the format 
  <img src="{@docRoot}images/icon_design/ic_menu_save.png" title="ic_menu_save" alt="Android asset" />

  <div class="caption">Save</div></td>



</tr>

<tr>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_send.png" title="ic_menu_send" alt="Android asset" />
@@ -1157,29 +1093,18 @@ simply look at image filenames, which use the format 
  <div class="caption">Share</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_shuffle.png" title="ic_menu_shuffle" alt="Android asset" />

  <div class="caption">Shuffle</div></td>

	



<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_upload.png" title="ic_menu_upload" alt="Android asset" />

  <div class="caption">Upload</div></td>



</tr>

<tr>



<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_view.png" title="ic_menu_view" alt="Android asset" />

  <div class="caption">View</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_camera_video_view.png" title="ic_menu_camera_video_view" alt="Android asset" />

  <div class="caption">Video</div></td>



</tr>

<tr>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/ic_menu_zoom.png" title="ic_menu_zoom" alt="Android asset" />

  <div class="caption">Zoom</div></td>
@@ -1213,131 +1138,21 @@ or simply look at the image filename, which use the format 
<table class="image-caption">

<tr>



<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_sys_data_connected_3g.png" title="stat_sys_data_connected_3g" alt="Android asset" />

  <div class="caption">3G</div></td>



<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_sys_signal_flightmode.png" title="stat_sys_signal_flightmode" alt="Android asset" />

  <div class="caption">Airplane mode</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_notify_alarm.png" title="stat_notify_alarm" alt="Android asset" />

  <div class="caption">Alarm</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_sys_data_bluetooth.png" title="stat_sys_data_bluetooth" alt="Android asset" />

  <div class="caption">Bluetooth</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_sys_data_bluetooth_connected.png" title="stat_sys_data_bluetooth_connected" alt="Android asset" />

  <div class="caption">Bluetooth connected</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_notify_calendar.png" title="stat_notify_calendar" alt="Android asset" />

  <div class="caption">Calendar</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_notify_disk_full.png" title="stat_notify_disk_full" alt="Android asset" />

  <div class="caption">Disk full</div></td>



</tr>

<tr>



<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_sys_data_connected_e.png" title="stat_sys_data_connected_e" alt="Android asset" />

  <div class="caption">EDGE</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_notify_email_generic.png" title="stat_notify_email_generic" alt="Android asset" />

  <div class="caption">Email</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_notify_email.png" title="stat_notify_email" alt="Android asset" />

  <div class="caption">Gmail</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_sys_data_connected_g.png" title="stat_sys_data_connected_g" alt="Android asset" />

  <div class="caption">GPRS</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_notify_chat.png" title="stat_notify_chat" alt="Android asset" />

  <div class="caption">IM</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_sys_install_complete.png" title="stat_sys_install_complete" alt="Android asset" />

  <div class="caption">Installation complete</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_notify_musicplayer.png" title="stat_notify_musicplayer" alt="Android asset" />

  <div class="caption">Music</div></td>



</tr>

<tr>



<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_sys_r_signal_4.png" title="stat_sys_r_signal_4" alt="Android asset" />

  <div class="caption">Roaming</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_sys_signal_4.png" title="stat_sys_signal_4" alt="Android asset" />

  <div class="caption">Signal</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_sys_signal_null.png" title="stat_sys_signal_null" alt="Android asset" />

  <div class="caption">Signal unavailable</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_sys_ringer_silent_old.png" title="stat_sys_ringer_silent_old" alt="Android asset" />

  <div class="caption">Silent mode</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_notify_sms.png" title="stat_notify_sms" alt="Android asset" />

  <div class="caption">SMS/MMS</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_sys_speakerphone.png" title="stat_sys_speakerphone" alt="Android asset" />

  <div class="caption">Speaker phone</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_notify_sync_anim0.png" title="stat_notify_sync_anim0" alt="Android asset" />

  <div class="caption">Sync</div></td>



</tr>

<tr>



<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_notify_sync_error.png" title="stat_notify_sync_error" alt="Android asset" />

  <div class="caption">Sync error</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_sys_data_usb.png" title="stat_sys_data_usb" alt="Android asset" />

  <div class="caption">USB connected</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_sys_ringer_vibrate.png" title="stat_sys_ringer_vibrate" alt="Android asset" />

  <div class="caption">Vibrate</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_notify_voicemail.png" title="stat_notify_voicemail" alt="Android asset" />

  <div class="caption">Voicemail</div></td>
@@ -1348,32 +1163,6 @@ or simply look at the image filename, which use the format 
  <div class="caption">Warning</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_sys_wifi_signal_4.png" title="stat_sys_wifi_signal_4" alt="Android asset" />

  <div class="caption">WiFi</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_notify_wifi_in_range.png" title="stat_notify_wifi_in_range" alt="Android asset" />

  <div class="caption">WiFi network available</div></td>



</tr>

<tr>



<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_sys_wifi_unavailable.png" title="stat_sys_wifi_unavailable" alt="Android asset" />

  <div class="caption">WiFi unavailable</div></td>



<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_sys_battery_100.png" title="stat_sys_battery_100" alt="Android asset" />

  <div class="caption">Battery 100%</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_sys_battery_empty.png" title="stat_sys_battery_empty" alt="Android asset" />

  <div class="caption">Battery empty</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_sys_phone_call.png" title="stat_sys_phone_call" alt="Android asset" />

  <div class="caption">Call</div></td>
@@ -1383,19 +1172,14 @@ or simply look at the image filename, which use the format 
  <img src="{@docRoot}images/icon_design/stat_sys_phone_call_forward.png" title="stat_sys_phone_call_forward" alt="Android asset" />

  <div class="caption">Call forward</div></td>



</tr>

<tr>



<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_sys_phone_call_on_hold.png" title="stat_sys_phone_call_on_hold" alt="Android asset" />

  <div class="caption">Call on hold</div></td>





<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_sys_gps_on.png" title="stat_sys_gps_on" alt="Android asset" />

  <div class="caption">GPS on</div></td>



</tr>

<tr>



<td class="image-caption-i image-list">

  <img src="{@docRoot}images/icon_design/stat_notify_missed_call.png" title="stat_notify_missed_call" alt="Android asset" />

  <div class="caption">Missed call</div></td>

docs/html/index.jd

+4 −2
Original line number Diff line number Diff line
@@ -13,8 +13,10 @@ home=true 
                            <!-- total max width is 520px -->

                                <img src="/assets/images/home/IO-logo.png" alt="Google I/O Developer Conference 2009" width="242px" />

                                <div id="announcement" style="width:270px">

                                  <p>Google I/O is a two-day developer event that will take place May 27-28 at Moscone Center, San Francisco. The agenda includes a number of great sessions on Android topics by team engineers and other developers.</p>

                                  <p><a href="http://code.google.com/events/io/">Learn more &raquo;</a></p>

                                  <p>The Google I/O developer conference took place May 27-28 in San Francisco. 

                                    If you missed the conference, you can experience the Android sessions

                                    by viewing YouTube videos and presentation slides.</p>

                                  <p><a href="http://code.google.com/events/io/sessions.html#mobile">See the Mobile sessions at Google I/O &raquo;</a></p>

                                </div> <!-- end annoucement -->

                            </div> <!-- end annoucement-block -->  

                        </div><!-- end topAnnouncement -->

docs/html/sdk/1.5_r2/installing.jd

+4 −4
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ page.title=Installing the Android SDK 
<p>This page describes how to install the Android SDK and set up your

development environment. If you haven't downloaded the SDK, you can

do so from the 

<a href="{@docRoot}sdk/1.5_r2/index.html">Download</a> page. Once you've downloaded

<a href="index.html">Download</a> page. Once you've downloaded

the SDK, return here.</p>



<p>If you encounter any problems during installation, see the
@@ -19,7 +19,7 @@ this page.</p> 
<h4 style="margin-top">Upgrading?</h4>

<p>If you have already developed applications using an earlier version

of the SDK, please read 

<a href="{@docRoot}sdk/1.5_r2/upgrading.html"><strong>Upgrading the

<a href="upgrading.html"><strong>Upgrading the

SDK</strong></a></b>, instead.

</p>
@@ -27,7 +27,7 @@ SDK</strong></a></b>, instead. 
<h2 id="setup">Preparing for Installation</h2>



<p>Before you begin, take a moment to confirm that your development machine meets the 

<a href="{@docRoot}sdk/1.5_r2/requirements.html">System Requirements</a>.

<a href="requirements.html">System Requirements</a>.

</p>



<p>If you will be developing on Eclipse with the Android Development
@@ -323,7 +323,7 @@ begin developing applications. Here are a few ways you can get started: </p> 
<ul>

  <li>If JDK is already installed on your development computer, please

  take a moment to make sure that it meets the version requirements listed

  in the <a href="{@docRoot}sdk/1.1_r1/requirements.html">System Requirements</a>.

  in the <a href="{@docRoot}sdk/{@sdkCurrent}/requirements.html">System Requirements</a>.

  In particular, note that some Linux distributions may include JDK 1.4 or Gnu

  Compiler for Java, both of which are not supported for Android development.</li>

</ul>