Merge branch 'master' into honeycomb-release

* master:
  Give the app widget a background.
  Add sample for tab ordering.
  Preparing source.android.com for GB source drop. This includes a dead link to the 2.3 CDD, and that needs to be filled in before launch, but the CDD isn't done yet. The link will be filled in before this is pushed to live, when the CDD is done. I want to get this submitted now so we can test & stage it.

pdk/docs/compatibility/2.2/versions.jd

@@ -12,9 +12,9 @@ running on their devices.</p>
 but not change any API behavior, such releases may not be accompanied by a new
 Compatibility Definition Document. This page lists the versions that are
 allowable by an Android 2.2-based system.</p>
-<p>Currently the only permitted value for
+<p>The value of <code>android.os.Build.VERSION.RELEASE</code> for Android 2.2
-<code>android.os.Build.VERSION.RELEASE</code> for Android 2.2 is the string
+MUST be one of the following strings:</p>
-"2.2".</p>
 <ul>
 <li>2.2</li>
+<li>2.2.1</li>
 </ul>

pdk/docs/compatibility/2.3/versions.jd

@@ -0,0 +1,20 @@
+page.title=Permitted Version Strings for Android 2.3
+doc.type=compatibility
+@jd:body
+<p>As described in Section 3.2.2 of the <a
+href="{@docRoot}compatibility/android-2.3-cdd.pdf">Android 2.3 Compatibility
+Definition</a>, only certain strings are allowable for the system property
+<code>android.os.Build.VERSION.RELEASE</code>. The reason for this is that
+applications and web sites may rely on predictable values for this string, and
+so that end users can easily and reliably identify the version of Android
+running on their devices.</p>
+<p>Because subsequent releases of the Android software may revise this string,
+but not change any API behavior, such releases may not be accompanied by a new
+Compatibility Definition Document. This page lists the versions that are
+allowable by an Android 2.2-based system.</p>
+<p>The value of <code>android.os.Build.VERSION.RELEASE</code> for Android 2.3
+MUST be one of the following strings:</p>
+<ul>
+<li>2.3</li>
+<li>2.3.1</li>
+</ul>

pdk/docs/compatibility/compatibility_toc.cs

@@ -7,7 +7,7 @@ function nothing() {}
 <ul>
   <li><h2>Getting Started</h2><ul>
     <li><a href="<?cs var:toroot ?>compatibility/overview.html">Compatibility Overview</a></li>
-    <li><a href="<?cs var:toroot ?>compatibility/android-2.2-cdd.pdf">Current CDD</a></li>
+    <li><a href="<?cs var:toroot ?>compatibility/android-2.3-cdd.pdf">Current CDD</a></li>
     <li><a href="<?cs var:toroot ?>compatibility/cts-intro.html">CTS Introduction</a></li>
     <li><a href="<?cs var:toroot ?>compatibility/cts-development.html">CTS Development</a></li>
   </ul></li>

pdk/docs/compatibility/cts-development.jd

@@ -20,7 +20,7 @@ project:</p>
 
 <pre>
 cd /path/to/android/root
-./cts/development/ide/eclipse/genclasspath.sh > .classpath
+./cts/development/ide/eclipse/genclasspath.sh &gt; .classpath
 chmod u+w .classpath
 </pre>
 

pdk/docs/compatibility/cts-intro.jd

@@ -18,7 +18,7 @@ Android .apk files to run on the actual device target.</li>
 <li>For CTS 2.1 R2 and beyond, setup your device (or emulator) to run the accessibility tests:
     <ol>
         <li>adb install -r android-cts/repository/testcases/CtsDelegatingAccessibilityService.apk</li>
-        <li>On the device, enable Settings > Accessibility > Accessibility > Delegating Accessibility Service</li>
+        <li>On the device, enable Settings &gt; Accessibility &gt; Accessibility &gt; Delegating Accessibility Service</li>
     </ol>
 </li>
 <li>Launch the CTS. The CTS test harness loads the test plan onto the attached devices. For each test in the test harness:

pdk/docs/compatibility/downloads.jd

@@ -4,10 +4,22 @@ doc.type=compatibility
 <p>Thanks for your interest in Android Compatibility! The links below allow
 you to access the key documents and information.</p>
 
+<h2>Android 2.3</h2>
+<p>Android 2.3 is the release of the development milestone code-named
+Gingerbread. Android 2.3 is the current version of Android. Source code for
+Android 2.3 is found in the 'gingerbread' branch in the open-source tree. A
+CTS release for Android 2.3 has not yet been prepared, but one will be
+available soon.
+</p>
+<ul>
+  <li><a href="{@docRoot}compatibility/android-2.3-cdd.pdf">Android 2.3 Compatibility Definition Document (CDD)</a></li>
+  <!-- <li><a href="http://dl.google.com/dl/android/cts/android-cts-2.2_r4-x86.zip">Android 2.2 R4 Compatibility Test Suite (CTS)</a></li> -->
+</ul>
+
 <h2>Android 2.2</h2>
 <p>Android 2.2 is the release of the development milestone code-named
-FroYo. Android 2.2 is the current version of Android. Source code for Android
+FroYo. Source code for Android 2.2 is found in the 'froyo' branch in the
-2.2 is found in the 'froyo' branch in the open-source tree.
+open-source tree.
 </p>
 <ul>
   <li><a href="{@docRoot}compatibility/android-2.2-cdd.pdf">Android 2.2 Compatibility Definition Document (CDD)</a></li>

pdk/docs/compatibility/index.jd

@@ -12,8 +12,8 @@ Android Market shows apps only to those devices that can properly run
 them.</p>
 <p>These pages describe the Android Compatibility Program and how to get
 access to compatibility information and tools. The latest version of the
-Android source code and compatibility program is 2.2, which roughly
+Android source code and compatibility program is 2.3, which 
-corresponded to the FroYo branch.</p>
+corresponded to the Gingerbread branch.</p>
 
 
 <h2>Why build compatible Android devices?</h2>

pdk/docs/index.jd

@@ -3,17 +3,22 @@ home=true
 @jd:body
 <div style="float: right; width: 35%;">
 <h3 style="padding-top: 0px;">News</h3>
-<p><b>Compatibility Tools for Android 2.2</b><br/>
+<p><b>Compatibility Definition for Android 2.3</b><br/>
-The compatibility tools for Android 2.2 have been published. This includes the
+The Compatibility Definition Document for Android 2.3 has been published. 
-Compatibility Definition Document for Android 2.2, and the Compatibility Test
+The 2.3 CDD allows device manufacturers to use the Android source code to ship
-Suite version 2.2 r1. With these tools, device manufacturers can finalize
+a significantly wider variety of devices, including devices with extra-large
-builds of Android 2.2 for new and existing devices. For more information,
+screens, such as tablets.  A release of the Compatibility Test Suite is not
-<a href="{@docRoot}compatibility/index.html">visit the Compatibility page.</a>
+yet available, but will be soon.  For more information, <a
+href="{@docRoot}compatibility/index.html">visit the Compatibility page.</a>
+</p>
+<p><b>Source Code Available for Android 2.3</b><br/>
+The source code for the Android 2.3 platform and software stack has been
+released! This release allows OEMs to begin preparing Android 2.3 for
+installation on new and existing devices, and allows hobbyists, enthusiasts,
+and researchers to develop custom builds. For information on how to obtain the
+software, 
+<a href="{@docRoot}source/download.html">visit our 'Getting the Source' page.</a>
 </p>
-<p><b>Introducing the Compatibility Program</b><br/>
-We're pleased to introduce the Android Compatibility Program. We've released
-two tools -- the Compatibility Definition Document and the Compatibility Test
-Suite -- to help device manufacturers build compatible devices.</p>
 </div>
 <img style="float: right; padding-right: 1.5em;" src="{@docRoot}images/home-bugdroid.png" alt="Android Mascot"/>
 <div style="font-size: 1.3em;">

pdk/docs/source/overview.jd

@@ -7,11 +7,11 @@ includes feature overviews of the various Android platform versions.
 The links below will take you to developer.android.com where you can view this
 information.</p>
 <p>The links below will navigate you away from this site.</p>
-<p><i>Note: this page will be updated to cover Android 2.2 when the
+<h3><a href="http://developer.android.com/sdk/android-2.3-highlights.html">Android 2.3</a></h3>
-formal compatibility program for Android 2.2 is launched, which will occur in
+<p>Android 2.3 corresponded to the "Gingerbread" milestone branch, and has an API level of 9.</p>
-the near future.</i></p>
+<h3><a href="http://developer.android.com/sdk/android-2.2-highlights.html">Android 2.2</a></h3>
-<h3><a href="http://developer.android.com/sdk/android-2.0-highlights.html">Android
+<p>Android 2.2 corresponded to the "FroYo" milestone branch, and has an API level of 8.</p>
-2.1</a></h3>
+<h3><a href="http://developer.android.com/sdk/android-2.0-highlights.html">Android 2.1</a></h3>
 <p>Android 2.1 corresponded to the "Eclair" milestone branch, and has an API level of
 7.</p>
 <p>The Eclair branch was also used for 2.0 and 2.0.1; however, both of those

samples/ApiDemos/AndroidManifest.xml

@@ -1804,6 +1804,13 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".view.Focus5" android:label="Views/Focus/5. Sequential (Tab Order)">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.SAMPLE_CODE" />
+            </intent-filter>
+        </activity>
+
         <activity android:name=".view.DateWidgets1" android:label="Views/Date Widgets/1. Dialog">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

samples/ApiDemos/res/layout/appwidget_provider.xml

@@ -18,6 +18,7 @@
     android:id="@+id/appwidget_text"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:background="#ffff00ff"
     android:textColor="#ff000000"
 />
 

samples/ApiDemos/res/layout/focus_5.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<!-- Demonstrates using nextFocusForward to explicitly set sequential focus order.-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:orientation="horizontal">
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:orientation="vertical">
+
+        <Button android:id="@+id/button1"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:text="@string/focus_5_button1"
+            android:nextFocusForward="@+id/button2"/>
+
+        <Button android:id="@+id/button2"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:text="@string/focus_5_button2"
+            android:nextFocusForward="@+id/button3"/>
+
+        <Button android:id="@+id/button3"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:text="@string/focus_5_button3"
+            android:nextFocusForward="@+id/button4"/>
+
+    </LinearLayout>
+
+    <Button android:id="@+id/button4"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="@string/focus_5_button4"
+        android:nextFocusForward="@+id/button5"/>
+
+    <Button android:id="@+id/button5"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="@string/focus_5_button5"
+        android:nextFocusForward="@+id/button1"/>
+</LinearLayout>

samples/ApiDemos/res/values/strings.xml

@@ -845,6 +845,11 @@
     <string name="focus_3_right">right</string>
     <string name="focus_3_top">top</string>
     <string name="focus_3_bottom">bottom</string>
+    <string name="focus_5_button1">1</string>
+    <string name="focus_5_button2">2</string>
+    <string name="focus_5_button3">3</string>
+    <string name="focus_5_button4">4</string>
+    <string name="focus_5_button5">5</string>
     <string name="gallery_2_text">Testing</string>
     <string name="googlelogin_login">Login</string>
     <string name="googlelogin_bad_login">Bad Login</string>

samples/ApiDemos/src/com/example/android/apis/view/Focus5.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2010 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.
+ */
+
+package com.example.android.apis.view;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.Button;
+import com.example.android.apis.R;
+
+public class Focus5 extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.focus_5);
+    }
+}