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

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

am 94a6c689: Merge "wholesale manual merge of docs from gingerbread-docs to... 

am 94a6c689: Merge "wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed" into gingerbread

* commit '94a6c689':
  wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed
parents 603b475e 94a6c689

docs/html/guide/developing/device.jd

+6 −4
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ page.title=Developing on a Device 
  </ol>

  <h2>See also</h2>

  <ol>

    <li><a

    href="{@docRoot}sdk/win-usb.html">USB Driver for Windows</a></li>

    <li><a href="{@docRoot}sdk/win-usb.html">Google USB Driver</a></li>

    <li><a href="{@docRoot}sdk/oem-usb.html">OEM USB Drivers</a></li>

    <li><a

href="{@docRoot}guide/developing/eclipse-adt.html">Developing in Eclipse, with ADT</a></li>

    <li><a
@@ -73,8 +73,10 @@ would on the emulator. Before you can start, there are just a few things to do:< 
  <li>Setup your system to detect your device.

    <ul>

      <li>If you're developing on Windows, you need to install a USB driver

      for adb. See the <a href="{@docRoot}sdk/win-usb.html">Windows USB

      Driver</a> documentation.</li>

      for adb. If you're using an Android Developer Phone (ADP), Nexus One, or Nexus S,

      see the <a href="{@docRoot}sdk/win-usb.html">Google Windows USB

      Driver</a>. Otherwise, you can find a link to the appropriate OEM driver in the

  <a href="{@docRoot}sdk/oem-usb.html">OEM USB Drivers</a> document.</li>

      <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

that contains a USB configuration for each type of device you want to use for

docs/html/guide/topics/manifest/supports-screens-element.jd

+32 −10
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ page.title=&lt;supports-screens&gt; 
&lt;supports-screens android:<a href="#small">smallScreens</a>=["true" | "false"] 

                  android:<a href="#normal">normalScreens</a>=["true" | "false"] 

                  android:<a href="#large">largeScreens</a>=["true" | "false"] 

                  android:<a href="#xlarge">xlargeScreens</a>=["true" | "false"]

                  android:<a href="#any">anyDensity</a>=["true" | "false"] /&gt;

</pre>

</dd>
@@ -31,7 +32,7 @@ or scale them up by a factor of 1.5 (high dpi screens). 
The screen density is expressed as dots-per-inch (dpi).</p>



<p>For more information, see 

<a href="{@docRoot}guide/practices/screens_support.html">Multiple Screens Support</a>.</p>

<a href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple Screens</a>.</p>





<dt>attributes:</dt>
@@ -43,8 +44,10 @@ The screen density is expressed as dots-per-inch (dpi).</p> 
     the "normal" (traditional HVGA) screen.  An application that does

     not support small screens <em>will not be available</em> for

     small screen devices, because there is little the platform can do

     to make such an application work on a smaller screen. Applications using

     API Level 4 or higher default this to "true", others are "false".

     to make such an application work on a smaller screen. If the application has set the <a

href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">{@code &lt;uses-sdk&gt;}</a> element's

{@code android:minSdkVersion} or {@code android:targetSdkVersion} attribute to "4" or higher,

the default value for this is "true", any value less than "4" results in this set to "false".

  </dd>

  

  <dt><a name="normal"></a>{@code android:normalScreens}</dt>
@@ -60,15 +63,33 @@ The screen density is expressed as dots-per-inch (dpi).</p> 
     A large screen is defined as a screen that is significantly larger

     than a "normal" phone screen, and thus may require some special care

     on the application's part to make good use of it. An application that 

     does not support large screens will be placed as a "postage stamp" on 

     such a screen, so that it retains the dimensions it was originally

     designed for. Applications using API Level 4 or higher default 

     to "true", others are "false".

     does not support large screens (declares this "false")&mdash;but does support "normal" or

"small" screens&mdash;will be placed as a "postage stamp" on 

     a large screen, so that it retains the dimensions it was originally

     designed for. If the application has set the <a

href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">{@code &lt;uses-sdk&gt;}</a> element's

{@code android:minSdkVersion} or {@code android:targetSdkVersion} attribute to "4" or higher,

the default value for this is "true", any value less than "4" results in this set to "false".

  </dd>

  

  <dt><a name="xlarge"></a>{@code android:xlargeScreens}</dt>

  <dd>Indicates whether the application supports extra large screen form-factors.

     An xlarge screen is defined as a screen that is significantly larger

     than a "large" screen, such as a tablet (or something larger) and may require special care

     on the application's part to make good use of it. An application that 

     does not support xlarge screens (declares this "false")&mdash;but does support "large",

"normal", or "small" screens&mdash;will be placed as a "postage stamp" on 

     an xlarge screen, so that it retains the dimensions it was originally

     designed for. If the application has set the <a

href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">{@code &lt;uses-sdk&gt;}</a> element's

{@code android:minSdkVersion} or {@code android:targetSdkVersion} attribute to "4" or higher,

the default value for this is "true", any value less than "4" results in this set to "false".

     <p>This attribute was introduced in API Level 9.</p>

  </dd>

  

  <dt><a name="any"></a>{@code android:anyDensity}</dt>

  <dd>Indicates whether the application can accommodate any screen

     density.  Older applications (pre API Level 4) are assumed unable to

  <dd>Indicates whether the application includes resources to accommodate any screen

     density.  Older applications (before API Level 4) are assumed unable to

     accomodate all densities and this is "false" by default. Applications using 

     API Level 4 or higher are assumed able to and this is "true" by default. 

     You can explicitly supply your abilities here.
@@ -84,7 +105,8 @@ The screen density is expressed as dots-per-inch (dpi).</p> 
<dt>see also:</dt>

<dd>

  <ul>

    <li><a href="{@docRoot}guide/practices/screens_support.html">Multiple Screens Support</a></li>

    <li><a href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple

Screens</a></li>

    <li>{@link android.util.DisplayMetrics}</li>

  </ul>

</dd>

docs/html/images/developing/sdk-usb-driver.png

0 → 100644
+117 KiB
Loading image diff...

docs/html/resources/index.jd

+0 −4
Original line number Diff line number Diff line
@@ -29,10 +29,6 @@ techniques that you find in the samples!</dd> 
<dd>Links to the Android discussion groups and information about other ways to

collaborate with other developers. </dd>



<dt><b>Webinars</b></dt>

<dd>Online training videos on wide range of Android topics

coupled with live IRC chat sessions for discussions. </dd>



<dt><b>More</b></dt>

<dd>Quick development tips, troubleshooting information, and frequently asked

questions (FAQs). </dd>

docs/html/resources/resources_toc.cs

+2 −12
Original line number Diff line number Diff line
@@ -276,18 +276,8 @@ 
      </li>

    </ul>

  </li>

  <!-- Webinar section -->

  <li>

    <h2><span class="en">Webinars</span></h2>

    <ul>

      <li><a href="<?cs var:toroot ?>resources/webinars/webinar-watch.html">

            <span class="en">Watch a Webinar</span>

          </a></li>     

      <li><a href="<?cs var:toroot ?>resources/webinars/webinar-upcoming.html">

            <span class="en">Upcoming Schedule</span>

          </a></li>

    </ul>

  </li>







  <li>

    <h2><span class="en">More</span>