Merge branch 'froyo' into froyo-release

target/product/full.mk

@@ -22,9 +22,6 @@
 PRODUCT_PACKAGES := \
     VoiceDialer
 
-# This is the list of locales included in AOSP builds
-PRODUCT_LOCALES := en_US en_GB fr_FR it_IT de_DE es_ES
-
 # Additional settings used in all AOSP builds
 PRODUCT_PROPERTY_OVERRIDES := \
     keyguard.no_require_sim=true \
@@ -41,6 +38,10 @@ PRODUCT_COPY_FILES := \
 # on smaller devices.
 $(call inherit-product, frameworks/base/data/sounds/OriginalAudio.mk)
 
+# Get a list of languages. We use the small list to save space
+# on smaller devices.
+$(call inherit-product, build/target/product/languages_small.mk)
+
 $(call inherit-product, build/target/product/generic.mk)
 
 # Overrides

target/product/generic.mk

@@ -29,6 +29,7 @@ PRODUCT_PACKAGES := \
     CertInstaller \
     DrmProvider \
     Email \
+    Gallery3D \
     LatinIME \
     Launcher2 \
     Mms \

target/product/languages_full.mk

@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2009 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# This is a build configuration that just contains a list of languages.
+# It helps in situations where laugnages must come first in the list,
+# mostly because screen densities interfere with the list of locales and
+# the system misbehaves when a density is the first locale.
+
+# Those are all the locales that have translations.
+PRODUCT_LOCALES := en_US en_GB fr_FR it_IT es_ES es_US de_DE nl_NL cs_CZ pl_PL zh_TW zh_CN ru_RU ko_KR nb_NO pt_PT pt_BR da_DK el_GR sv_SE tr_TR ja_JP

target/product/languages_small.mk

@@ -0,0 +1,24 @@
+#
+# Copyright (C) 2009 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# This is a build configuration that just contains a list of languages.
+# It helps in situations where laugnages must come first in the list,
+# mostly because screen densities interfere with the list of locales and
+# the system misbehaves when a density is the first locale.
+
+# This is the list of languages that originally shipped on ADP1
+
+PRODUCT_LOCALES := en_US en_GB fr_FR it_IT de_DE es_ES

tools/droiddoc/templates-sdk/sdkpage.cs

@@ -6,7 +6,7 @@
     <title>Redirecting...</title>
     <meta http-equiv="refresh" content="0;url=<?cs var:toroot ?>sdk/<?cs 
       if:sdk.redirect.path ?><?cs var:sdk.redirect.path ?><?cs 
-      else ?><?cs var:sdk.current ?>/index.html<?cs /if ?>">
+      else ?>index.html<?cs /if ?>">
     <link href="<?cs var:toroot ?>assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
   </head>
 <?cs else ?>
@@ -38,8 +38,7 @@
 
   <div id="jd-content">
     <?cs 
-    if:ndk ?><p><em><?cs 
-      var:ndk.date ?></em></p><?cs 
+    if:ndk ?><?cs 
     else ?><?cs 
       if:android.whichdoc == "online" ?><p><em><?cs 
       var:sdk.date ?></em></p><?cs 
@@ -120,7 +119,8 @@ computer. </p>
 <?cs /if ?> 
 <?cs # end if NDK ... the following is for the SDK ?>
 
-  <div class="toggle-content special">
+<?cs #  
+    <div class="toggle-content special">
     <p>The Android SDK has changed! If you've worked with the Android SDK before, 
     you will notice several important differences:</p>
     
@@ -146,15 +146,19 @@ computer. </p>
     href="adding-components.html">Adding SDK Components</a>.</p>
     </div>
     
-    <a href='#' class='toggle-content-button show' onclick="toggleContent(this);return false;">
+    <a href='#' class='toggle-content-button show' onclick="toggleContent(this,true);return false;">
       <span>show more</span><span style='display:none'>show less</span>
     </a>
   </div>
+?>
+  <p>Welcome Developers! If you are new to the Android SDK, please read the <a
+href="#quickstart">Quick Start</a>, below, for an overview of how to install and
+set up the SDK. </p>
+
+  <p>If you are already using the Android SDK and would like to update to the
+latest tools or platforms, please use the <em>Android SDK and AVD Manager</em>
+to get the components, rather than downloading a new SDK package.</p>
 
-  <p>If you are new to the Android SDK, please read the <a href="#quickstart">Quick Start</a>,
-  below, for an overview of how to install and set up the SDK.</p>
-  
-  
   <table class="download">
     <tr>
       <th>Platform</th>