Extract support lib samples out of ApiDemos and in to their own app.

Change-Id: I2ca344e5f1b44c4825de938c9a4f9375a523ede5
diff --git a/samples/ApiDemos/Android.mk b/samples/ApiDemos/Android.mk
index abaf798..7921120 100644
--- a/samples/ApiDemos/Android.mk
+++ b/samples/ApiDemos/Android.mk
@@ -10,8 +10,6 @@
         src/com/example/android/apis/app/IRemoteServiceCallback.aidl \
         src/com/example/android/apis/app/ISecondary.aidl \
 
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
-
 LOCAL_PACKAGE_NAME := ApiDemos
 
 LOCAL_SDK_VERSION := current
diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml
index 8d12d84..bdae541 100644
--- a/samples/ApiDemos/AndroidManifest.xml
+++ b/samples/ApiDemos/AndroidManifest.xml
@@ -38,6 +38,10 @@
 
     <uses-sdk android:minSdkVersion="4" />
 
+    <!-- This app has not been optimized for large screens. -->
+    <supports-screens android:requiresSmallestWidthDp="320"
+            android:compatibleWidthLimitDp="480" />
+
     <!-- We will request access to the camera, saying we require a camera
          of some sort but not one with autofocus capability. -->
     <uses-permission android:name="android.permission.CAMERA" />
@@ -357,115 +361,6 @@
             </intent-filter>
         </activity>
 
-        <!-- Fragment Support Samples -->
-
-        <activity android:name=".support.app.FragmentAlertDialogSupport"
-                android:label="@string/fragment_alert_dialog_support">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SAMPLE_CODE" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".support.app.FragmentArgumentsSupport"
-                android:label="@string/fragment_arguments_support">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SAMPLE_CODE" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".support.app.FragmentHideShowSupport"
-                android:label="@string/fragment_hide_show_support"
-                android:windowSoftInputMode="stateUnchanged">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SAMPLE_CODE" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".support.app.FragmentContextMenuSupport"
-                android:label="@string/fragment_context_menu_support">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SAMPLE_CODE" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".support.app.FragmentDialogSupport"
-                android:label="@string/fragment_dialog_support">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SAMPLE_CODE" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".support.app.FragmentDialogOrActivitySupport"
-                android:label="@string/fragment_dialog_or_activity_support">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SAMPLE_CODE" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".support.app.FragmentLayoutSupport"
-                android:label="@string/fragment_layout_support">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SAMPLE_CODE" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".support.app.FragmentListArraySupport"
-                android:label="@string/fragment_list_array_support">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SAMPLE_CODE" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".support.app.FragmentLayoutSupport$DetailsActivity" />
-
-        <activity android:name=".support.app.FragmentMenuSupport"
-                android:label="@string/fragment_menu_support">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SAMPLE_CODE" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".support.app.FragmentRetainInstanceSupport"
-                android:label="@string/fragment_retain_instance_support">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SAMPLE_CODE" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".support.app.FragmentReceiveResultSupport"
-                android:label="@string/fragment_receive_result_support">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SAMPLE_CODE" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".support.app.FragmentStackSupport"
-                android:label="@string/fragment_stack_support">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SAMPLE_CODE" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".support.app.FragmentPagerSupport"
-                android:label="@string/fragment_pager_support">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SAMPLE_CODE" />
-            </intent-filter>
-        </activity>
-
         <!-- Loader Samples -->
 
         <activity android:name=".app.LoaderCursor"
@@ -500,26 +395,6 @@
                   android:enabled="@bool/atLeastHoneycomb" />
 <!-- END_INCLUDE(loader_throttle) -->
 
-        <!-- Fragment Support Samples -->
-
-        <activity android:name=".support.app.LoaderCursorSupport"
-                android:label="@string/loader_cursor_support">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SAMPLE_CODE" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".support.app.LoaderThrottleSupport"
-                android:label="@string/loader_throttle_support">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SAMPLE_CODE" />
-            </intent-filter>
-        </activity>
-        <provider android:name=".support.app.LoaderThrottleSupport$SimpleProvider"
-                  android:authorities="com.example.android.apis.support.app.LoaderThrottle" />
-
         <!-- Intent Samples -->
 
         <activity android:name=".app.Intents" android:label="@string/activity_intents">
diff --git a/samples/ApiDemos/_index.html b/samples/ApiDemos/_index.html
index ffe5db5..399ef86 100644
--- a/samples/ApiDemos/_index.html
+++ b/samples/ApiDemos/_index.html
@@ -37,8 +37,7 @@
 "    <li><a href='src/com/example/android/apis/media/index.html'>Media</a></li>"+
 "    <li><a href='src/com/example/android/apis/os/index.html'>OS</a></li>"+
 "    <li><a href='src/com/example/android/apis/text/index.html'>Text</a></li>"+
-"    <li><a href='src/com/example/android/apis/view/index.html'>Views</a></li></ul>"+
-"    <li><a href='src/com/example/android/apis/support/index.html'>Static Support Library</a></li>");
+"    <li><a href='src/com/example/android/apis/view/index.html'>Views</a></li></ul>");
 
 }
 
diff --git a/samples/ApiDemos/res/layout-land/fragment_arguments_support.xml b/samples/ApiDemos/res/layout-land/fragment_arguments_support.xml
deleted file mode 100644
index 9aa8daf..0000000
--- a/samples/ApiDemos/res/layout-land/fragment_arguments_support.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<!-- Top-level content view for the simple fragment sample. -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:padding="4dip"
-    android:gravity="center_horizontal"
-    android:layout_width="match_parent" android:layout_height="match_parent">
-
-    <TextView
-            android:id="@+id/text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:padding="4dip"
-            android:layout_gravity="center_vertical|center_horizontal"
-            android:gravity="top|center_horizontal"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="@string/fragment_arguments_msg" />
-
-    <LinearLayout android:orientation="horizontal" android:padding="4dip"
-        android:layout_width="match_parent" android:layout_height="wrap_content">
-
-        <fragment class="com.example.android.apis.support.app.FragmentArgumentsSupport$MyFragment"
-                android:id="@+id/embedded"
-                android:layout_width="0px" android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:label="@string/fragment_arguments_embedded" />
-
-        <FrameLayout
-                android:id="@+id/created"
-                android:layout_width="0px"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" />
-
-    </LinearLayout>
-
-    <fragment class="com.example.android.apis.support.app.FragmentArgumentsSupport$MyFragment"
-            android:id="@+id/embedded_land"
-            android:layout_width="match_parent" android:layout_height="wrap_content"
-            android:label="@string/fragment_arguments_embedded_land" />
-
-</LinearLayout>
diff --git a/samples/ApiDemos/res/layout-land/fragment_layout_support.xml b/samples/ApiDemos/res/layout-land/fragment_layout_support.xml
deleted file mode 100644
index de31341..0000000
--- a/samples/ApiDemos/res/layout-land/fragment_layout_support.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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.
--->
-
-<!-- Top-level content view for the layout fragment sample.  This version is
-     for display when in landscape: we can fit both titles and dialog. -->
-
-<!-- BEGIN_INCLUDE(layout) -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent" android:layout_height="match_parent">
-
-    <fragment class="com.example.android.apis.support.app.FragmentLayoutSupport$TitlesFragment"
-            android:id="@+id/titles" android:layout_weight="1"
-            android:layout_width="0px" android:layout_height="match_parent" />
-
-    <FrameLayout android:id="@+id/details" android:layout_weight="1"
-            android:layout_width="0px" android:layout_height="match_parent" />
-
-</LinearLayout>
-<!-- END_INCLUDE(layout) -->
diff --git a/samples/ApiDemos/res/layout/fragment_arguments_support.xml b/samples/ApiDemos/res/layout/fragment_arguments_support.xml
deleted file mode 100644
index b218f82..0000000
--- a/samples/ApiDemos/res/layout/fragment_arguments_support.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<!-- Top-level content view for the simple fragment sample. -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:padding="4dip"
-    android:gravity="center_horizontal"
-    android:layout_width="match_parent" android:layout_height="match_parent">
-
-    <TextView
-            android:id="@+id/text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:padding="4dip"
-            android:layout_gravity="center_vertical|center_horizontal"
-            android:gravity="top|center_horizontal"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="@string/fragment_arguments_msg" />
-
-    <LinearLayout android:orientation="horizontal" android:padding="4dip"
-        android:layout_width="match_parent" android:layout_height="wrap_content">
-
-<!-- BEGIN_INCLUDE(from_attributes) -->
-        <fragment class="com.example.android.apis.support.app.FragmentArgumentsSupport$MyFragment"
-                android:id="@+id/embedded"
-                android:layout_width="0px" android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:label="@string/fragment_arguments_embedded" />
-<!-- END_INCLUDE(from_attributes) -->
-
-        <FrameLayout
-                android:id="@+id/created"
-                android:layout_width="0px"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/samples/ApiDemos/res/layout/fragment_hide_show_support.xml b/samples/ApiDemos/res/layout/fragment_hide_show_support.xml
deleted file mode 100644
index e4245bd..0000000
--- a/samples/ApiDemos/res/layout/fragment_hide_show_support.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<!-- Top-level content view for the layout fragment sample. -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:gravity="center_horizontal"
-    android:layout_width="match_parent" android:layout_height="match_parent">
-
-    <TextView android:layout_width="match_parent" android:layout_height="wrap_content"
-        android:gravity="center_vertical|center_horizontal"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="Demonstration of hiding and showing fragments." />
-
-    <LinearLayout android:orientation="horizontal" android:padding="4dip"
-        android:gravity="center_vertical" android:layout_weight="1"
-        android:layout_width="match_parent" android:layout_height="wrap_content">
-
-        <Button android:id="@+id/frag1hide"
-            android:layout_width="wrap_content" android:layout_height="wrap_content"
-            android:text="Hide" />
-
-        <fragment android:name="com.example.android.apis.support.app.FragmentHideShowSupport$FirstFragment"
-                android:id="@+id/fragment1" android:layout_weight="1"
-                android:layout_width="0px" android:layout_height="wrap_content" />
-
-    </LinearLayout>
-
-    <LinearLayout android:orientation="horizontal" android:padding="4dip"
-        android:gravity="center_vertical" android:layout_weight="1"
-        android:layout_width="match_parent" android:layout_height="wrap_content">
-
-        <Button android:id="@+id/frag2hide"
-            android:layout_width="wrap_content" android:layout_height="wrap_content"
-            android:text="Hide" />
-
-        <fragment android:name="com.example.android.apis.support.app.FragmentHideShowSupport$SecondFragment"
-                android:id="@+id/fragment2" android:layout_weight="1"
-                android:layout_width="0px" android:layout_height="wrap_content" />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/samples/ApiDemos/res/layout/fragment_layout_support.xml b/samples/ApiDemos/res/layout/fragment_layout_support.xml
deleted file mode 100644
index 08c40bf..0000000
--- a/samples/ApiDemos/res/layout/fragment_layout_support.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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.
--->
-
-<!-- Top-level content view for the layout fragment sample.  This version is
-     for display when not in landscape: we can only fit the list of titles. -->
-
-<!-- BEGIN_INCLUDE(layout) -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent" android:layout_height="match_parent">
-    <fragment class="com.example.android.apis.support.app.FragmentLayoutSupport$TitlesFragment"
-            android:id="@+id/titles"
-            android:layout_width="match_parent" android:layout_height="match_parent" />
-</FrameLayout>
-<!-- END_INCLUDE(layout) -->
diff --git a/samples/ApiDemos/res/values/strings.xml b/samples/ApiDemos/res/values/strings.xml
index 10dd78d..bae9247 100644
--- a/samples/ApiDemos/res/values/strings.xml
+++ b/samples/ApiDemos/res/values/strings.xml
@@ -150,42 +150,12 @@
     <string name="fragment_stack">App/Fragment/Stack</string>
     <string name="new_fragment">New fragment</string>
 
-    <string name="fragment_alert_dialog_support">Support/App/Fragment/Alert Dialog</string>
-
-    <string name="fragment_arguments_support">Support/App/Fragment/Arguments</string>
-
-    <string name="fragment_hide_show_support">Support/App/Fragment/Hide and Show</string>
-
-    <string name="fragment_context_menu_support">Support/App/Fragment/Context Menu</string>
-
-    <string name="fragment_dialog_support">Support/App/Fragment/Dialog</string>
-
-    <string name="fragment_dialog_or_activity_support">Support/App/Fragment/Dialog or Activity</string>
-
-    <string name="fragment_layout_support">Support/App/Fragment/Layout</string>
-
-    <string name="fragment_list_array_support">Support/App/Fragment/List Array</string>
-
-    <string name="fragment_menu_support">Support/App/Fragment/Menu</string>
-
-    <string name="fragment_retain_instance_support">Support/App/Fragment/Retain Instance</string>
-
-    <string name="fragment_receive_result_support">Support/App/Fragment/Receive Result</string>
-
-    <string name="fragment_stack_support">Support/App/Fragment/Stack</string>
-
-    <string name="fragment_pager_support">Support/App/Fragment/Pager</string>
-
     <string name="loader_cursor">App/Loader/Cursor</string>
 
     <string name="loader_custom">App/Loader/Custom</string>
 
     <string name="loader_throttle">App/Loader/Throttle</string>
 
-    <string name="loader_cursor_support">Support/App/Loader/Cursor</string>
-    
-    <string name="loader_throttle_support">Support/Loader/Throttle</string>
-    
     <string name="activity_menu">App/Activity/Menu</string>
     <string name="open_menu">Open menu</string>
     <string name="close_menu">Close menu</string>
diff --git a/samples/ApiDemos/src/com/example/android/apis/support/_index.html b/samples/ApiDemos/src/com/example/android/apis/support/_index.html
deleted file mode 100644
index 806a571..0000000
--- a/samples/ApiDemos/src/com/example/android/apis/support/_index.html
+++ /dev/null
@@ -1,76 +0,0 @@
-
-<p>This section includes samples showing the use of Android's
-static support library.  This library contains code that you can
-build in to your application to access new features and common
-utilities while being able to run down to version 1.6 (API 4)
-of the platform.</p>
-<ul>
-  <li><a href="#Fragment">Fragment</a></li>
-  <li><a href="#LoaderManager">LoaderManager</a></li>
-</ul>
-
-
-<h3 id="Fragment">Fragment</h3>
-<dl>
-  <dt><a href="app/FragmentAlertDialogSupport.html">Fragment Alert Dialog</a></dt>
-  <dd>Demonstrates how to use a DialogFragment to show and manage an
-  AlertDialog.</dd>
-  
-  <dt><a href="app/FragmentArgumentsSupport.html">Fragment Arguments</a></dt>
-  <dd>Demonstrates how a fragment can be initialized with arguments,
-  supplying them either as an argument Bundle at runtime or XML attributes
-  in a &lt;fragment> tag.</dd>
-  
-  <dt><a href="app/FragmentContextMenuSupport.html">Fragment Context Menu</a></dt>
-  <dd>Demonstrates how to display and respond to a context menu that is
-  display from a fragment's view hierarchy.</dd>
-  
-  <dt><a href="app/FragmentDialogSupport.html">Fragment Dialog</a></dt>
-  <dd>Demonstrates use of DialogFragment to show various types of dialogs.</dd>
-  
-  <dt><a href="app/FragmentDialogOrActivitySupport.html">Fragment Dialog or Activity</a></dt>
-  <dd>Demonstrates how the same Fragment implementation can be used to provide the UI
-  for either an Activity or Dialog.</dd>
-  
-  <dt><a href="app/FragmentHideShowSupport.html">Fragment Hide Show</a></dt>
-  <dd>Demonstrates hiding and showing fragments.</dd>
-  
-  <dt><a href="app/FragmentLayoutSupport.html">Fragment Layout</a></dt>
-  <dd>Demonstrates use of the &lt;fragment&gt; tag to embed a Fragment in
-  an Activity's content view layout, and making the layout change based on
-  configuration to achieve different UI flows.</dd>
-  
-  <dt><a href="app/FragmentListArraySupport.html">Fragment List Array</a></dt>
-  <dd>Demonstrates use of ListFragment to show the contents of a simple ArrayAdapter.</dd>
-  
-  <dt><a href="app/FragmentListCursorLoaderSupport.html">Fragment List Cursor Loader</a></dt>
-  <dd>Demonstrates use of LoaderManager to perform a query for a Cursor that
-  populates a ListFragment.</dd>
-  
-  <dt><a href="app/FragmentMenuSupport.html">Fragment Menu</a></dt>
-  <dd>Demonstrates populating custom menu items from a Fragment.</dd>
-  
-  <dt><a href="app/FragmentReceiveResultSupport.html">Fragment Receive Result</a></dt>
-  <dd>Demonstrates starting a new Activity from a Fragment, and receiving
-  a result back from it.</dd>
-  
-  <dt><a href="app/FragmentRetainInstanceSupport.html">Fragment Retain Instance</a></dt>
-  <dd>Demonstrates a Fragment can be used to easily retain active state across
-  an Activity's configuration change.</dd>
-  
-  <dt><a href="app/FragmentStackSupport.html">Fragment Stack</a></dt>
-  <dd>Demonstrates creating a stack of Fragment instances similar to the
-  traditional stack of activities.</dd>
-  
-</dl>
-
-<h3 id="LoaderManager">LoaderManager</h3>
-<dl>
-  <dt><a href="app/LoaderThrottleSupport.html">Loader Throttle</a></dt>
-  <dd>Complete end-to-end demonstration of a simple content provider that
-  populates data in a list through a cursor loader.  The UI allows the list
-  to be populated with a series of items, showing how AsyncTaskLoader's
-  throttling facility can be used to control how much a Loader is refreshed
-  in this case.</dd>
-</dl>
-  
\ No newline at end of file
diff --git a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentAlertDialogSupport.java b/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentAlertDialogSupport.java
deleted file mode 100644
index d7f6ae9..0000000
--- a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentAlertDialogSupport.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2011 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.support.app;
-
-import com.example.android.apis.R;
-
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentActivity;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.TextView;
-
-/**
- * Demonstrates how to show an AlertDialog that is managed by a Fragment.
- */
-public class FragmentAlertDialogSupport extends FragmentActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.fragment_dialog);
-
-        View tv = findViewById(R.id.text);
-        ((TextView)tv).setText("Example of displaying an alert dialog with a DialogFragment");
-
-        // Watch for button clicks.
-        Button button = (Button)findViewById(R.id.show);
-        button.setOnClickListener(new OnClickListener() {
-            public void onClick(View v) {
-                showDialog();
-            }
-        });
-    }
-
-//BEGIN_INCLUDE(activity)
-    void showDialog() {
-        DialogFragment newFragment = MyAlertDialogFragment.newInstance(
-                R.string.alert_dialog_two_buttons_title);
-        newFragment.show(getSupportFragmentManager(), "dialog");
-    }
-
-    public void doPositiveClick() {
-        // Do stuff here.
-        Log.i("FragmentAlertDialog", "Positive click!");
-    }
-
-    public void doNegativeClick() {
-        // Do stuff here.
-        Log.i("FragmentAlertDialog", "Negative click!");
-    }
-//END_INCLUDE(activity)
-
-//BEGIN_INCLUDE(dialog)
-    public static class MyAlertDialogFragment extends DialogFragment {
-
-        public static MyAlertDialogFragment newInstance(int title) {
-            MyAlertDialogFragment frag = new MyAlertDialogFragment();
-            Bundle args = new Bundle();
-            args.putInt("title", title);
-            frag.setArguments(args);
-            return frag;
-        }
-
-        @Override
-        public Dialog onCreateDialog(Bundle savedInstanceState) {
-            int title = getArguments().getInt("title");
-
-            return new AlertDialog.Builder(getActivity())
-                    .setIcon(R.drawable.alert_dialog_icon)
-                    .setTitle(title)
-                    .setPositiveButton(R.string.alert_dialog_ok,
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int whichButton) {
-                                ((FragmentAlertDialogSupport)getActivity()).doPositiveClick();
-                            }
-                        }
-                    )
-                    .setNegativeButton(R.string.alert_dialog_cancel,
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int whichButton) {
-                                ((FragmentAlertDialogSupport)getActivity()).doNegativeClick();
-                            }
-                        }
-                    )
-                    .create();
-        }
-    }
-//END_INCLUDE(dialog)
-}
diff --git a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentArgumentsSupport.java b/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentArgumentsSupport.java
deleted file mode 100644
index 1ff7185..0000000
--- a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentArgumentsSupport.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2011 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.support.app;
-
-import com.example.android.apis.R;
-
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-
-import android.app.Activity;
-import android.content.res.TypedArray;
-import android.os.Bundle;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-/**
- * Demonstrates a fragment that can be configured through both Bundle arguments
- * and layout attributes.
- */
-public class FragmentArgumentsSupport extends FragmentActivity {
-//BEGIN_INCLUDE(create)
-    @Override protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.fragment_arguments_support);
-
-        if (savedInstanceState == null) {
-            // First-time init; create fragment to embed in activity.
-            FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-            Fragment newFragment = MyFragment.newInstance("From Arguments");
-            ft.add(R.id.created, newFragment);
-            ft.commit();
-        }
-    }
-//END_INCLUDE(create)
-
-//BEGIN_INCLUDE(fragment)
-    public static class MyFragment extends Fragment {
-        CharSequence mLabel;
-
-        /**
-         * Create a new instance of MyFragment that will be initialized
-         * with the given arguments.
-         */
-        static MyFragment newInstance(CharSequence label) {
-            MyFragment f = new MyFragment();
-            Bundle b = new Bundle();
-            b.putCharSequence("label", label);
-            f.setArguments(b);
-            return f;
-        }
-
-        /**
-         * Parse attributes during inflation from a view hierarchy into the
-         * arguments we handle.
-         */
-        @Override public void onInflate(Activity activity, AttributeSet attrs,
-                Bundle savedInstanceState) {
-            super.onInflate(activity, attrs, savedInstanceState);
-
-            TypedArray a = activity.obtainStyledAttributes(attrs,
-                    R.styleable.FragmentArguments);
-            mLabel = a.getText(R.styleable.FragmentArguments_android_label);
-            a.recycle();
-        }
-
-        /**
-         * During creation, if arguments have been supplied to the fragment
-         * then parse those out.
-         */
-        @Override public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-
-            Bundle args = getArguments();
-            if (args != null) {
-                CharSequence label = args.getCharSequence("label");
-                if (label != null) {
-                    mLabel = label;
-                }
-            }
-        }
-
-        /**
-         * Create the view for this fragment, using the arguments given to it.
-         */
-        @Override public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-            View v = inflater.inflate(R.layout.hello_world, container, false);
-            View tv = v.findViewById(R.id.text);
-            ((TextView)tv).setText(mLabel != null ? mLabel : "(no label)");
-            tv.setBackgroundDrawable(getResources().getDrawable(android.R.drawable.gallery_thumb));
-            return v;
-        }
-    }
-//END_INCLUDE(fragment)
-}
diff --git a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentContextMenuSupport.java b/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentContextMenuSupport.java
deleted file mode 100644
index a934145..0000000
--- a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentContextMenuSupport.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2011 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.support.app;
-
-import com.example.android.apis.R;
-
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-
-import android.os.Bundle;
-import android.util.Log;
-import android.view.ContextMenu;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ContextMenu.ContextMenuInfo;
-
-/**
- * Demonstration of displaying a context menu from a fragment.
- */
-public class FragmentContextMenuSupport extends FragmentActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // Create the list fragment and add it as our sole content.
-        ContextMenuFragment content = new ContextMenuFragment();
-        getSupportFragmentManager().beginTransaction().add(
-                android.R.id.content, content).commit();
-    }
-
-    public static class ContextMenuFragment extends Fragment {
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-            View root = inflater.inflate(R.layout.fragment_context_menu, container, false);
-            registerForContextMenu(root.findViewById(R.id.long_press));
-            return root;
-        }
-
-        @Override
-        public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-            super.onCreateContextMenu(menu, v, menuInfo);
-            menu.add(Menu.NONE, R.id.a_item, Menu.NONE, "Menu A");
-            menu.add(Menu.NONE, R.id.b_item, Menu.NONE, "Menu B");
-        }
-
-        @Override
-        public boolean onContextItemSelected(MenuItem item) {
-            switch (item.getItemId()) {
-                case R.id.a_item:
-                    Log.i("ContextMenu", "Item 1a was chosen");
-                    return true;
-                case R.id.b_item:
-                    Log.i("ContextMenu", "Item 1b was chosen");
-                    return true;
-            }
-            return super.onContextItemSelected(item);
-        }
-    }
-}
diff --git a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentDialogOrActivitySupport.java b/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentDialogOrActivitySupport.java
deleted file mode 100644
index fe677aa..0000000
--- a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentDialogOrActivitySupport.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.support.app;
-
-import com.example.android.apis.R;
-
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentTransaction;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.TextView;
-
-public class FragmentDialogOrActivitySupport extends FragmentActivity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.fragment_dialog_or_activity);
-
-        if (savedInstanceState == null) {
-            // First-time init; create fragment to embed in activity.
-//BEGIN_INCLUDE(embed)
-            FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-            DialogFragment newFragment = MyDialogFragment.newInstance();
-            ft.add(R.id.embedded, newFragment);
-            ft.commit();
-//END_INCLUDE(embed)
-        }
-
-        // Watch for button clicks.
-        Button button = (Button)findViewById(R.id.show_dialog);
-        button.setOnClickListener(new OnClickListener() {
-            public void onClick(View v) {
-                showDialog();
-            }
-        });
-    }
-
-//BEGIN_INCLUDE(show_dialog)
-    void showDialog() {
-        // Create the fragment and show it as a dialog.
-        DialogFragment newFragment = MyDialogFragment.newInstance();
-        newFragment.show(getSupportFragmentManager(), "dialog");
-    }
-//END_INCLUDE(show_dialog)
-
-//BEGIN_INCLUDE(dialog)
-    public static class MyDialogFragment extends DialogFragment {
-        static MyDialogFragment newInstance() {
-            return new MyDialogFragment();
-        }
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-            View v = inflater.inflate(R.layout.hello_world, container, false);
-            View tv = v.findViewById(R.id.text);
-            ((TextView)tv).setText("This is an instance of MyDialogFragment");
-            return v;
-        }
-    }
-//END_INCLUDE(dialog)
-}
diff --git a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentDialogSupport.java b/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentDialogSupport.java
deleted file mode 100644
index 666151d..0000000
--- a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentDialogSupport.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (C) 2011 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.support.app;
-
-import com.example.android.apis.R;
-
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentTransaction;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-
-public class FragmentDialogSupport extends FragmentActivity {
-    int mStackLevel = 0;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.fragment_dialog);
-
-        View tv = findViewById(R.id.text);
-        ((TextView)tv).setText("Example of displaying dialogs with a DialogFragment.  "
-                + "Press the show button below to see the first dialog; pressing "
-                + "successive show buttons will display other dialog styles as a "
-                + "stack, with dismissing or back going to the previous dialog.");
-
-        // Watch for button clicks.
-        Button button = (Button)findViewById(R.id.show);
-        button.setOnClickListener(new OnClickListener() {
-            public void onClick(View v) {
-                showDialog();
-            }
-        });
-
-        if (savedInstanceState != null) {
-            mStackLevel = savedInstanceState.getInt("level");
-        }
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putInt("level", mStackLevel);
-    }
-
-//BEGIN_INCLUDE(add_dialog)
-    void showDialog() {
-        mStackLevel++;
-
-        // DialogFragment.show() will take care of adding the fragment
-        // in a transaction.  We also want to remove any currently showing
-        // dialog, so make our own transaction and take care of that here.
-        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-        Fragment prev = getSupportFragmentManager().findFragmentByTag("dialog");
-        if (prev != null) {
-            ft.remove(prev);
-        }
-        ft.addToBackStack(null);
-
-        // Create and show the dialog.
-        DialogFragment newFragment = MyDialogFragment.newInstance(mStackLevel);
-        newFragment.show(ft, "dialog");
-    }
-//END_INCLUDE(add_dialog)
-
-    static String getNameForNum(int num) {
-        switch ((num-1)%6) {
-            case 1: return "STYLE_NO_TITLE";
-            case 2: return "STYLE_NO_FRAME";
-            case 3: return "STYLE_NO_INPUT (this window can't receive input, so "
-                    + "you will need to press the bottom show button)";
-            case 4: return "STYLE_NORMAL with dark fullscreen theme";
-            case 5: return "STYLE_NORMAL with light theme";
-            case 6: return "STYLE_NO_TITLE with light theme";
-            case 7: return "STYLE_NO_FRAME with light theme";
-            case 8: return "STYLE_NORMAL with light fullscreen theme";
-        }
-        return "STYLE_NORMAL";
-    }
-
-//BEGIN_INCLUDE(dialog)
-    public static class MyDialogFragment extends DialogFragment {
-        int mNum;
-
-        /**
-         * Create a new instance of MyDialogFragment, providing "num"
-         * as an argument.
-         */
-        static MyDialogFragment newInstance(int num) {
-            MyDialogFragment f = new MyDialogFragment();
-
-            // Supply num input as an argument.
-            Bundle args = new Bundle();
-            args.putInt("num", num);
-            f.setArguments(args);
-
-            return f;
-        }
-
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            mNum = getArguments().getInt("num");
-
-            // Pick a style based on the num.
-            int style = DialogFragment.STYLE_NORMAL, theme = 0;
-            switch ((mNum-1)%6) {
-                case 1: style = DialogFragment.STYLE_NO_TITLE; break;
-                case 2: style = DialogFragment.STYLE_NO_FRAME; break;
-                case 3: style = DialogFragment.STYLE_NO_INPUT; break;
-                case 4: style = DialogFragment.STYLE_NORMAL; break;
-                case 5: style = DialogFragment.STYLE_NO_TITLE; break;
-                case 6: style = DialogFragment.STYLE_NO_FRAME; break;
-                case 7: style = DialogFragment.STYLE_NORMAL; break;
-            }
-            switch ((mNum-1)%6) {
-                case 2: theme = android.R.style.Theme_Panel; break;
-                case 4: theme = android.R.style.Theme; break;
-                case 5: theme = android.R.style.Theme_Light; break;
-                case 6: theme = android.R.style.Theme_Light_Panel; break;
-                case 7: theme = android.R.style.Theme_Light; break;
-            }
-            setStyle(style, theme);
-        }
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-            View v = inflater.inflate(R.layout.fragment_dialog, container, false);
-            View tv = v.findViewById(R.id.text);
-            ((TextView)tv).setText("Dialog #" + mNum + ": using style "
-                    + getNameForNum(mNum));
-
-            // Watch for button clicks.
-            Button button = (Button)v.findViewById(R.id.show);
-            button.setOnClickListener(new OnClickListener() {
-                public void onClick(View v) {
-                    // When button is clicked, call up to owning activity.
-                    ((FragmentDialogSupport)getActivity()).showDialog();
-                }
-            });
-
-            return v;
-        }
-    }
-//END_INCLUDE(dialog)
-}
diff --git a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentHideShowSupport.java b/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentHideShowSupport.java
deleted file mode 100644
index d347160..0000000
--- a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentHideShowSupport.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2011 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.support.app;
-
-import com.example.android.apis.R;
-
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.TextView;
-
-/**
- * Demonstration of hiding and showing fragments.
- */
-public class FragmentHideShowSupport extends FragmentActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.fragment_hide_show_support);
-
-        // The content view embeds two fragments; now retrieve them and attach
-        // their "hide" button.
-        FragmentManager fm = getSupportFragmentManager();
-        addShowHideListener(R.id.frag1hide, fm.findFragmentById(R.id.fragment1));
-        addShowHideListener(R.id.frag2hide, fm.findFragmentById(R.id.fragment2));
-    }
-
-    void addShowHideListener(int buttonId, final Fragment fragment) {
-        final Button button = (Button)findViewById(buttonId);
-        button.setOnClickListener(new OnClickListener() {
-            public void onClick(View v) {
-                FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-                ft.setCustomAnimations(android.R.anim.fade_in,
-                        android.R.anim.fade_out);
-                if (fragment.isHidden()) {
-                    ft.show(fragment);
-                    button.setText("Hide");
-                } else {
-                    ft.hide(fragment);
-                    button.setText("Show");
-                }
-                ft.commit();
-            }
-        });
-    }
-
-    public static class FirstFragment extends Fragment {
-        TextView mTextView;
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-            View v = inflater.inflate(R.layout.labeled_text_edit, container, false);
-            View tv = v.findViewById(R.id.msg);
-            ((TextView)tv).setText("The fragment saves and restores this text.");
-
-            // Retrieve the text editor, and restore the last saved state if needed.
-            mTextView = (TextView)v.findViewById(R.id.saved);
-            if (savedInstanceState != null) {
-                mTextView.setText(savedInstanceState.getCharSequence("text"));
-            }
-            return v;
-        }
-
-        @Override
-        public void onSaveInstanceState(Bundle outState) {
-            super.onSaveInstanceState(outState);
-
-            // Remember the current text, to restore if we later restart.
-            outState.putCharSequence("text", mTextView.getText());
-        }
-    }
-
-    public static class SecondFragment extends Fragment {
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-            View v = inflater.inflate(R.layout.labeled_text_edit, container, false);
-            View tv = v.findViewById(R.id.msg);
-            ((TextView)tv).setText("The TextView saves and restores this text.");
-
-            // Retrieve the text editor and tell it to save and restore its state.
-            // Note that you will often set this in the layout XML, but since
-            // we are sharing our layout with the other fragment we will customize
-            // it here.
-            ((TextView)v.findViewById(R.id.saved)).setSaveEnabled(true);
-            return v;
-        }
-    }
-}
diff --git a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentLayoutSupport.java b/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentLayoutSupport.java
deleted file mode 100644
index e1c63ae..0000000
--- a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentLayoutSupport.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * 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.support.app;
-
-import com.example.android.apis.R;
-import com.example.android.apis.Shakespeare;
-
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.app.ListFragment;
-
-import android.content.Intent;
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.util.TypedValue;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.ScrollView;
-import android.widget.TextView;
-
-/**
- * Demonstration of using fragments to implement different activity layouts.
- * This sample provides a different layout (and activity flow) when run in
- * landscape.
- */
-public class FragmentLayoutSupport extends FragmentActivity {
-
-//BEGIN_INCLUDE(main)
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.fragment_layout_support);
-    }
-//END_INCLUDE(main)
-
-    /**
-     * This is a secondary activity, to show what the user has selected
-     * when the screen is not large enough to show it all in one activity.
-     */
-//BEGIN_INCLUDE(details_activity)
-    public static class DetailsActivity extends FragmentActivity {
-
-        @Override
-        protected void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-
-            if (getResources().getConfiguration().orientation
-                    == Configuration.ORIENTATION_LANDSCAPE) {
-                // If the screen is now in landscape mode, we can show the
-                // dialog in-line with the list so we don't need this activity.
-                finish();
-                return;
-            }
-
-            if (savedInstanceState == null) {
-                // During initial setup, plug in the details fragment.
-                DetailsFragment details = new DetailsFragment();
-                details.setArguments(getIntent().getExtras());
-                getSupportFragmentManager().beginTransaction().add(
-                        android.R.id.content, details).commit();
-            }
-        }
-    }
-//END_INCLUDE(details_activity)
-
-    /**
-     * This is the "top-level" fragment, showing a list of items that the
-     * user can pick.  Upon picking an item, it takes care of displaying the
-     * data to the user as appropriate based on the currrent UI layout.
-     */
-//BEGIN_INCLUDE(titles)
-    public static class TitlesFragment extends ListFragment {
-        boolean mDualPane;
-        int mCurCheckPosition = 0;
-
-        @Override
-        public void onActivityCreated(Bundle savedInstanceState) {
-            super.onActivityCreated(savedInstanceState);
-
-            // Populate list with our static array of titles.
-            setListAdapter(new ArrayAdapter<String>(getActivity(),
-                    R.layout.simple_list_item_checkable_1,
-                    android.R.id.text1, Shakespeare.TITLES));
-
-            // Check to see if we have a frame in which to embed the details
-            // fragment directly in the containing UI.
-            View detailsFrame = getActivity().findViewById(R.id.details);
-            mDualPane = detailsFrame != null && detailsFrame.getVisibility() == View.VISIBLE;
-
-            if (savedInstanceState != null) {
-                // Restore last state for checked position.
-                mCurCheckPosition = savedInstanceState.getInt("curChoice", 0);
-            }
-
-            if (mDualPane) {
-                // In dual-pane mode, the list view highlights the selected item.
-                getListView().setChoiceMode(ListView.CHOICE_MODE_SINGLE);
-                // Make sure our UI is in the correct state.
-                showDetails(mCurCheckPosition);
-            }
-        }
-
-        @Override
-        public void onSaveInstanceState(Bundle outState) {
-            super.onSaveInstanceState(outState);
-            outState.putInt("curChoice", mCurCheckPosition);
-        }
-
-        @Override
-        public void onListItemClick(ListView l, View v, int position, long id) {
-            showDetails(position);
-        }
-
-        /**
-         * Helper function to show the details of a selected item, either by
-         * displaying a fragment in-place in the current UI, or starting a
-         * whole new activity in which it is displayed.
-         */
-        void showDetails(int index) {
-            mCurCheckPosition = index;
-
-            if (mDualPane) {
-                // We can display everything in-place with fragments, so update
-                // the list to highlight the selected item and show the data.
-                getListView().setItemChecked(index, true);
-
-                // Check what fragment is currently shown, replace if needed.
-                DetailsFragment details = (DetailsFragment)
-                        getFragmentManager().findFragmentById(R.id.details);
-                if (details == null || details.getShownIndex() != index) {
-                    // Make new fragment to show this selection.
-                    details = DetailsFragment.newInstance(index);
-
-                    // Execute a transaction, replacing any existing fragment
-                    // with this one inside the frame.
-                    FragmentTransaction ft = getFragmentManager().beginTransaction();
-                    ft.replace(R.id.details, details);
-                    ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
-                    ft.commit();
-                }
-
-            } else {
-                // Otherwise we need to launch a new activity to display
-                // the dialog fragment with selected text.
-                Intent intent = new Intent();
-                intent.setClass(getActivity(), DetailsActivity.class);
-                intent.putExtra("index", index);
-                startActivity(intent);
-            }
-        }
-    }
-//END_INCLUDE(titles)
-
-    /**
-     * This is the secondary fragment, displaying the details of a particular
-     * item.
-     */
-//BEGIN_INCLUDE(details)
-    public static class DetailsFragment extends Fragment {
-        /**
-         * Create a new instance of DetailsFragment, initialized to
-         * show the text at 'index'.
-         */
-        public static DetailsFragment newInstance(int index) {
-            DetailsFragment f = new DetailsFragment();
-
-            // Supply index input as an argument.
-            Bundle args = new Bundle();
-            args.putInt("index", index);
-            f.setArguments(args);
-
-            return f;
-        }
-
-        public int getShownIndex() {
-            return getArguments().getInt("index", 0);
-        }
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-            if (container == null) {
-                // We have different layouts, and in one of them this
-                // fragment's containing frame doesn't exist.  The fragment
-                // may still be created from its saved state, but there is
-                // no reason to try to create its view hierarchy because it
-                // won't be displayed.  Note this is not needed -- we could
-                // just run the code below, where we would create and return
-                // the view hierarchy; it would just never be used.
-                return null;
-            }
-
-            ScrollView scroller = new ScrollView(getActivity());
-            TextView text = new TextView(getActivity());
-            int padding = (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
-                    4, getActivity().getResources().getDisplayMetrics());
-            text.setPadding(padding, padding, padding, padding);
-            scroller.addView(text);
-            text.setText(Shakespeare.DIALOGUE[getShownIndex()]);
-            return scroller;
-        }
-    }
-//END_INCLUDE(details)
-}
diff --git a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentListArraySupport.java b/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentListArraySupport.java
deleted file mode 100644
index 2bcc018..0000000
--- a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentListArraySupport.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.support.app;
-
-import com.example.android.apis.Shakespeare;
-
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.ListFragment;
-
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-
-/**
- * Demonstration of using ListFragment to show a list of items
- * from a canned array.
- */
-public class FragmentListArraySupport extends FragmentActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // Create the list fragment and add it as our sole content.
-        if (getSupportFragmentManager().findFragmentById(android.R.id.content) == null) {
-            ArrayListFragment list = new ArrayListFragment();
-            getSupportFragmentManager().beginTransaction().add(android.R.id.content, list).commit();
-        }
-    }
-
-    public static class ArrayListFragment extends ListFragment {
-
-        @Override
-        public void onActivityCreated(Bundle savedInstanceState) {
-            super.onActivityCreated(savedInstanceState);
-            setListAdapter(new ArrayAdapter<String>(getActivity(),
-                    android.R.layout.simple_list_item_1, Shakespeare.TITLES));
-        }
-
-        @Override
-        public void onListItemClick(ListView l, View v, int position, long id) {
-            Log.i("FragmentList", "Item clicked: " + id);
-        }
-    }
-}
diff --git a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentMenuSupport.java b/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentMenuSupport.java
deleted file mode 100644
index 5ac309a..0000000
--- a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentMenuSupport.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (C) 2011 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.support.app;
-
-import com.example.android.apis.R;
-
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.MenuCompat;
-
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.CheckBox;
-
-/**
- * Demonstrates how fragments can participate in the options menu.
- */
-public class FragmentMenuSupport extends FragmentActivity {
-    Fragment mFragment1;
-    Fragment mFragment2;
-    CheckBox mCheckBox1;
-    CheckBox mCheckBox2;
-
-    // Update fragment visibility when check boxes are changed.
-    final OnClickListener mClickListener = new OnClickListener() {
-        public void onClick(View v) {
-            updateFragmentVisibility();
-        }
-    };
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.fragment_menu);
-
-        // Make sure the two menu fragments are created.
-        FragmentManager fm = getSupportFragmentManager();
-        FragmentTransaction ft = fm.beginTransaction();
-        mFragment1 = fm.findFragmentByTag("f1");
-        if (mFragment1 == null) {
-            mFragment1 = new MenuFragment();
-            ft.add(mFragment1, "f1");
-        }
-        mFragment2 = fm.findFragmentByTag("f2");
-        if (mFragment2 == null) {
-            mFragment2 = new Menu2Fragment();
-            ft.add(mFragment2, "f2");
-        }
-        ft.commit();
-
-        // Watch check box clicks.
-        mCheckBox1 = (CheckBox)findViewById(R.id.menu1);
-        mCheckBox1.setOnClickListener(mClickListener);
-        mCheckBox2 = (CheckBox)findViewById(R.id.menu2);
-        mCheckBox2.setOnClickListener(mClickListener);
-
-        // Make sure fragments start out with correct visibility.
-        updateFragmentVisibility();
-    }
-
-    @Override
-    protected void onRestoreInstanceState(Bundle savedInstanceState) {
-        super.onRestoreInstanceState(savedInstanceState);
-        // Make sure fragments are updated after check box view state is restored.
-        updateFragmentVisibility();
-    }
-
-    // Update fragment visibility based on current check box state.
-    void updateFragmentVisibility() {
-        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-        if (mCheckBox1.isChecked()) ft.show(mFragment1);
-        else ft.hide(mFragment1);
-        if (mCheckBox2.isChecked()) ft.show(mFragment2);
-        else ft.hide(mFragment2);
-        ft.commit();
-    }
-
-    /**
-     * A fragment that displays a menu.  This fragment happens to not
-     * have a UI (it does not implement onCreateView), but it could also
-     * have one if it wanted.
-     */
-    public static class MenuFragment extends Fragment {
-
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            setHasOptionsMenu(true);
-        }
-
-        @Override
-        public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-            MenuItem item;
-            item = menu.add("Menu 1a");
-            MenuCompat.setShowAsAction(item, MenuItem.SHOW_AS_ACTION_IF_ROOM);
-            item = menu.add("Menu 1b");
-            MenuCompat.setShowAsAction(item, MenuItem.SHOW_AS_ACTION_IF_ROOM);
-        }
-    }
-
-    /**
-     * Second fragment with a menu.
-     */
-    public static class Menu2Fragment extends Fragment {
-
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            setHasOptionsMenu(true);
-        }
-
-        @Override
-        public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-            MenuItem item;
-            item = menu.add("Menu 2");
-            MenuCompat.setShowAsAction(item, MenuItem.SHOW_AS_ACTION_IF_ROOM);
-        }
-    }
-}
diff --git a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentPagerSupport.java b/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentPagerSupport.java
deleted file mode 100644
index 46d29ac..0000000
--- a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentPagerSupport.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (C) 2011 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.support.app;
-
-import com.example.android.apis.R;
-import com.example.android.apis.Shakespeare;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentPager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.app.ListFragment;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.View.OnClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.ListView;
-import android.widget.TextView;
-
-public class FragmentPagerSupport extends FragmentActivity
-        implements FragmentPager.Adapter {
-    static final int NUM_ITEMS = 10;
-
-    FragmentPager mPager;
-    int mCurPos;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.fragment_pager);
-
-        mPager = (FragmentPager)findViewById(R.id.pager);
-        mPager.setAdapter(this);
-
-        // Watch for button clicks.
-        Button button = (Button)findViewById(R.id.new_fragment);
-        button.setOnClickListener(new OnClickListener() {
-            public void onClick(View v) {
-                mCurPos++;
-                if (mCurPos < NUM_ITEMS) {
-                    mPager.setCurrentItem(mCurPos);
-                } else {
-                    mCurPos--;
-                }
-            }
-        });
-    }
-
-    @Override
-    public int getCount() {
-        return NUM_ITEMS;
-    }
-
-    @Override
-    public Fragment getItem(int position) {
-        return ArrayListFragment.newInstance(position);
-    }
-
-    public static class ArrayListFragment extends ListFragment {
-        int mNum;
-
-        /**
-         * Create a new instance of CountingFragment, providing "num"
-         * as an argument.
-         */
-        static ArrayListFragment newInstance(int num) {
-            ArrayListFragment f = new ArrayListFragment();
-
-            // Supply num input as an argument.
-            Bundle args = new Bundle();
-            args.putInt("num", num);
-            f.setArguments(args);
-
-            return f;
-        }
-
-        /**
-         * When creating, retrieve this instance's number from its arguments.
-         */
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            mNum = getArguments() != null ? getArguments().getInt("num") : 1;
-        }
-
-        /**
-         * The Fragment's UI is just a simple text view showing its
-         * instance number.
-         */
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-            View v = inflater.inflate(R.layout.fragment_pager_list, container, false);
-            View tv = v.findViewById(R.id.text);
-            ((TextView)tv).setText("Fragment #" + mNum);
-            return v;
-        }
-
-        @Override
-        public void onActivityCreated(Bundle savedInstanceState) {
-            super.onActivityCreated(savedInstanceState);
-            setListAdapter(new ArrayAdapter<String>(getActivity(),
-                    android.R.layout.simple_list_item_1, Shakespeare.TITLES));
-        }
-
-        @Override
-        public void onListItemClick(ListView l, View v, int position, long id) {
-            Log.i("FragmentList", "Item clicked: " + id);
-        }
-    }
-}
diff --git a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentReceiveResultSupport.java b/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentReceiveResultSupport.java
deleted file mode 100644
index f430e69..0000000
--- a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentReceiveResultSupport.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2011 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.support.app;
-
-import com.example.android.apis.R;
-import com.example.android.apis.app.SendResult;
-
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentTransaction;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.text.Editable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.TextView;
-
-public class FragmentReceiveResultSupport extends FragmentActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT);
-        FrameLayout frame = new FrameLayout(this);
-        frame.setId(R.id.simple_fragment);
-        setContentView(frame, lp);
-
-        if (savedInstanceState == null) {
-            // Do first time initialization -- add fragment.
-            Fragment newFragment = new ReceiveResultFragment();
-            FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-            ft.add(R.id.simple_fragment, newFragment).commit();
-        }
-    }
-
-    public static class ReceiveResultFragment extends Fragment {
-        // Definition of the one requestCode we use for receiving resuls.
-        static final private int GET_CODE = 0;
-
-        private TextView mResults;
-
-        private OnClickListener mGetListener = new OnClickListener() {
-            public void onClick(View v) {
-                // Start the activity whose result we want to retrieve.  The
-                // result will come back with request code GET_CODE.
-                Intent intent = new Intent(getActivity(), SendResult.class);
-                startActivityForResult(intent, GET_CODE);
-            }
-        };
-
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-        }
-
-        @Override
-        public void onSaveInstanceState(Bundle outState) {
-            super.onSaveInstanceState(outState);
-        }
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-            View v = inflater.inflate(R.layout.receive_result, container, false);
-
-            // Retrieve the TextView widget that will display results.
-            mResults = (TextView)v.findViewById(R.id.results);
-
-            // This allows us to later extend the text buffer.
-            mResults.setText(mResults.getText(), TextView.BufferType.EDITABLE);
-
-            // Watch for button clicks.
-            Button getButton = (Button)v.findViewById(R.id.get);
-            getButton.setOnClickListener(mGetListener);
-
-            return v;
-        }
-
-        /**
-         * This method is called when the sending activity has finished, with the
-         * result it supplied.
-         */
-        @Override
-        public void onActivityResult(int requestCode, int resultCode, Intent data) {
-            // You can use the requestCode to select between multiple child
-            // activities you may have started.  Here there is only one thing
-            // we launch.
-            if (requestCode == GET_CODE) {
-
-                // We will be adding to our text.
-                Editable text = (Editable)mResults.getText();
-
-                // This is a standard resultCode that is sent back if the
-                // activity doesn't supply an explicit result.  It will also
-                // be returned if the activity failed to launch.
-                if (resultCode == RESULT_CANCELED) {
-                    text.append("(cancelled)");
-
-                // Our protocol with the sending activity is that it will send
-                // text in 'data' as its result.
-                } else {
-                    text.append("(okay ");
-                    text.append(Integer.toString(resultCode));
-                    text.append(") ");
-                    if (data != null) {
-                        text.append(data.getAction());
-                    }
-                }
-
-                text.append("\n");
-            }
-        }
-    }
-}
diff --git a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentRetainInstanceSupport.java b/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentRetainInstanceSupport.java
deleted file mode 100644
index dbf0cfb..0000000
--- a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentRetainInstanceSupport.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright (C) 2011 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.support.app;
-
-import com.example.android.apis.R;
-
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.ProgressBar;
-
-/**
- * This example shows how you can use a Fragment to easily propagate state
- * (such as threads) across activity instances when an activity needs to be
- * restarted due to, for example, a configuration change.  This is a lot
- * easier than using the raw Activity.onRetainNonConfiguratinInstance() API.
- */
-public class FragmentRetainInstanceSupport extends FragmentActivity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // First time init, create the UI.
-        if (savedInstanceState == null) {
-            getSupportFragmentManager().beginTransaction().add(android.R.id.content,
-                    new UiFragment()).commit();
-        }
-    }
-
-    /**
-     * This is a fragment showing UI that will be updated from work done
-     * in the retained fragment.
-     */
-    public static class UiFragment extends Fragment {
-        RetainedFragment mWorkFragment;
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-            View v = inflater.inflate(R.layout.fragment_retain_instance, container, false);
-
-            // Watch for button clicks.
-            Button button = (Button)v.findViewById(R.id.restart);
-            button.setOnClickListener(new OnClickListener() {
-                public void onClick(View v) {
-                    mWorkFragment.restart();
-                }
-            });
-
-            return v;
-        }
-
-        @Override
-        public void onActivityCreated(Bundle savedInstanceState) {
-            super.onActivityCreated(savedInstanceState);
-
-            FragmentManager fm = getFragmentManager();
-
-            // Check to see if we have retained the worker fragment.
-            mWorkFragment = (RetainedFragment)fm.findFragmentByTag("work");
-
-            // If not retained (or first time running), we need to create it.
-            if (mWorkFragment == null) {
-                mWorkFragment = new RetainedFragment();
-                // Tell it who it is working with.
-                mWorkFragment.setTargetFragment(this, 0);
-                fm.beginTransaction().add(mWorkFragment, "work").commit();
-            }
-        }
-
-    }
-
-    /**
-     * This is the Fragment implementation that will be retained across
-     * activity instances.  It represents some ongoing work, here a thread
-     * we have that sits around incrementing a progress indicator.
-     */
-    public static class RetainedFragment extends Fragment {
-        ProgressBar mProgressBar;
-        int mPosition;
-        boolean mReady = false;
-        boolean mQuiting = false;
-
-        /**
-         * This is the thread that will do our work.  It sits in a loop running
-         * the progress up until it has reached the top, then stops and waits.
-         */
-        final Thread mThread = new Thread() {
-            @Override
-            public void run() {
-                // We'll figure the real value out later.
-                int max = 10000;
-
-                // This thread runs almost forever.
-                while (true) {
-
-                    // Update our shared state with the UI.
-                    synchronized (this) {
-                        // Our thread is stopped if the UI is not ready
-                        // or it has completed its work.
-                        while (!mReady || mPosition >= max) {
-                            if (mQuiting) {
-                                return;
-                            }
-                            try {
-                                wait();
-                            } catch (InterruptedException e) {
-                            }
-                        }
-
-                        // Now update the progress.  Note it is important that
-                        // we touch the progress bar with the lock held, so it
-                        // doesn't disappear on us.
-                        mPosition++;
-                        max = mProgressBar.getMax();
-                        mProgressBar.setProgress(mPosition);
-                    }
-
-                    // Normally we would be doing some work, but put a kludge
-                    // here to pretend like we are.
-                    synchronized (this) {
-                        try {
-                            wait(50);
-                        } catch (InterruptedException e) {
-                        }
-                    }
-                }
-            }
-        };
-
-        /**
-         * Fragment initialization.  We way we want to be retained and
-         * start our thread.
-         */
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-
-            // Tell the framework to try to keep this fragment around
-            // during a configuration change.
-            setRetainInstance(true);
-
-            // Start up the worker thread.
-            mThread.start();
-        }
-
-        /**
-         * This is called when the Fragment's Activity is ready to go, after
-         * its content view has been installed; it is called both after
-         * the initial fragment creation and after the fragment is re-attached
-         * to a new activity.
-         */
-        @Override
-        public void onActivityCreated(Bundle savedInstanceState) {
-            super.onActivityCreated(savedInstanceState);
-
-            // Retrieve the progress bar from the target's view hierarchy.
-            mProgressBar = (ProgressBar)getTargetFragment().getView().findViewById(
-                    R.id.progress_horizontal);
-
-            // We are ready for our thread to go.
-            synchronized (mThread) {
-                mReady = true;
-                mThread.notify();
-            }
-        }
-
-        /**
-         * This is called when the fragment is going away.  It is NOT called
-         * when the fragment is being propagated between activity instances.
-         */
-        @Override
-        public void onDestroy() {
-            // Make the thread go away.
-            synchronized (mThread) {
-                mReady = false;
-                mQuiting = true;
-                mThread.notify();
-            }
-
-            super.onDestroy();
-        }
-
-        /**
-         * This is called right before the fragment is detached from its
-         * current activity instance.
-         */
-        @Override
-        public void onDetach() {
-            // This fragment is being detached from its activity.  We need
-            // to make sure its thread is not going to touch any activity
-            // state after returning from this function.
-            synchronized (mThread) {
-                mProgressBar = null;
-                mReady = false;
-                mThread.notify();
-            }
-
-            super.onDetach();
-        }
-
-        /**
-         * API for our UI to restart the progress thread.
-         */
-        public void restart() {
-            synchronized (mThread) {
-                mPosition = 0;
-                mThread.notify();
-            }
-        }
-    }
-}
diff --git a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentStackSupport.java b/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentStackSupport.java
deleted file mode 100644
index 404721b..0000000
--- a/samples/ApiDemos/src/com/example/android/apis/support/app/FragmentStackSupport.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2011 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.support.app;
-
-import com.example.android.apis.R;
-
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentTransaction;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.TextView;
-
-public class FragmentStackSupport extends FragmentActivity {
-    int mStackLevel = 1;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.fragment_stack);
-
-        // Watch for button clicks.
-        Button button = (Button)findViewById(R.id.new_fragment);
-        button.setOnClickListener(new OnClickListener() {
-            public void onClick(View v) {
-                addFragmentToStack();
-            }
-        });
-
-        if (savedInstanceState == null) {
-            // Do first time initialization -- add initial fragment.
-            Fragment newFragment = CountingFragment.newInstance(mStackLevel);
-            FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-            ft.add(R.id.simple_fragment, newFragment).commit();
-        } else {
-            mStackLevel = savedInstanceState.getInt("level");
-        }
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putInt("level", mStackLevel);
-    }
-
-//BEGIN_INCLUDE(add_stack)
-    void addFragmentToStack() {
-        mStackLevel++;
-
-        // Instantiate a new fragment.
-        Fragment newFragment = CountingFragment.newInstance(mStackLevel);
-
-        // Add the fragment to the activity, pushing this transaction
-        // on to the back stack.
-        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-        ft.replace(R.id.simple_fragment, newFragment);
-        ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
-        ft.addToBackStack(null);
-        ft.commit();
-    }
-//END_INCLUDE(add_stack)
-
-//BEGIN_INCLUDE(fragment)
-    public static class CountingFragment extends Fragment {
-        int mNum;
-
-        /**
-         * Create a new instance of CountingFragment, providing "num"
-         * as an argument.
-         */
-        static CountingFragment newInstance(int num) {
-            CountingFragment f = new CountingFragment();
-
-            // Supply num input as an argument.
-            Bundle args = new Bundle();
-            args.putInt("num", num);
-            f.setArguments(args);
-
-            return f;
-        }
-
-        /**
-         * When creating, retrieve this instance's number from its arguments.
-         */
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            mNum = getArguments() != null ? getArguments().getInt("num") : 1;
-        }
-
-        /**
-         * The Fragment's UI is just a simple text view showing its
-         * instance number.
-         */
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-            View v = inflater.inflate(R.layout.hello_world, container, false);
-            View tv = v.findViewById(R.id.text);
-            ((TextView)tv).setText("Fragment #" + mNum);
-            tv.setBackgroundDrawable(getResources().getDrawable(android.R.drawable.gallery_thumb));
-            return v;
-        }
-    }
-//END_INCLUDE(fragment)
-}
diff --git a/samples/ApiDemos/src/com/example/android/apis/support/app/LoaderCursorSupport.java b/samples/ApiDemos/src/com/example/android/apis/support/app/LoaderCursorSupport.java
deleted file mode 100644
index 491ae0e..0000000
--- a/samples/ApiDemos/src/com/example/android/apis/support/app/LoaderCursorSupport.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * 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.support.app;
-
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.ListFragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.CursorLoader;
-import android.support.v4.content.Loader;
-import android.support.v4.widget.SimpleCursorAdapter;
-
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.ContactsContract.Contacts;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.ListView;
-
-/**
- * Demonstration of the use of a CursorLoader to load and display contacts
- * data in a fragment.
- */
-public class LoaderCursorSupport extends FragmentActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        FragmentManager fm = getSupportFragmentManager();
-
-        // Create the list fragment and add it as our sole content.
-        if (fm.findFragmentById(android.R.id.content) == null) {
-            CursorLoaderListFragment list = new CursorLoaderListFragment();
-            fm.beginTransaction().add(android.R.id.content, list).commit();
-        }
-    }
-
-//BEGIN_INCLUDE(fragment_cursor)
-    public static class CursorLoaderListFragment extends ListFragment
-            implements LoaderManager.LoaderCallbacks<Cursor> {
-
-        // This is the Adapter being used to display the list's data.
-        SimpleCursorAdapter mAdapter;
-
-        // If non-null, this is the current filter the user has provided.
-        String mCurFilter;
-
-        @Override public void onActivityCreated(Bundle savedInstanceState) {
-            super.onActivityCreated(savedInstanceState);
-
-            // Give some text to display if there is no data.  In a real
-            // application this would come from a resource.
-            setEmptyText("No phone numbers");
-
-            // We have a menu item to show in action bar.
-            setHasOptionsMenu(true);
-
-            // Create an empty adapter we will use to display the loaded data.
-            mAdapter = new SimpleCursorAdapter(getActivity(),
-                    android.R.layout.simple_list_item_2, null,
-                    new String[] { Contacts.DISPLAY_NAME, Contacts.CONTACT_STATUS },
-                    new int[] { android.R.id.text1, android.R.id.text2 }, 0);
-            setListAdapter(mAdapter);
-
-            // Prepare the loader.  Either re-connect with an existing one,
-            // or start a new one.
-            getLoaderManager().initLoader(0, null, this);
-        }
-
-        @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-            // Place an action bar item for searching.
-            //MenuItem item = menu.add("Search");
-            //item.setIcon(android.R.drawable.ic_menu_search);
-            //item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-            //SearchView sv = new SearchView(getActivity());
-            //sv.setOnQueryTextListener(this);
-            //item.setActionView(sv);
-        }
-
-        public boolean onQueryTextChange(String newText) {
-            // Called when the action bar search text has changed.  Update
-            // the search filter, and restart the loader to do a new query
-            // with this filter.
-            mCurFilter = !TextUtils.isEmpty(newText) ? newText : null;
-            getLoaderManager().restartLoader(0, null, this);
-            return true;
-        }
-
-        @Override public void onListItemClick(ListView l, View v, int position, long id) {
-            // Insert desired behavior here.
-            Log.i("FragmentComplexList", "Item clicked: " + id);
-        }
-
-        // These are the Contacts rows that we will retrieve.
-        static final String[] CONTACTS_SUMMARY_PROJECTION = new String[] {
-            Contacts._ID,
-            Contacts.DISPLAY_NAME,
-            Contacts.CONTACT_STATUS,
-            Contacts.CONTACT_PRESENCE,
-            Contacts.PHOTO_ID,
-            Contacts.LOOKUP_KEY,
-        };
-
-        public Loader<Cursor> onCreateLoader(int id, Bundle args) {
-            // This is called when a new Loader needs to be created.  This
-            // sample only has one Loader, so we don't care about the ID.
-            // First, pick the base URI to use depending on whether we are
-            // currently filtering.
-            Uri baseUri;
-            if (mCurFilter != null) {
-                baseUri = Uri.withAppendedPath(Contacts.CONTENT_FILTER_URI,
-                        Uri.encode(mCurFilter));
-            } else {
-                baseUri = Contacts.CONTENT_URI;
-            }
-
-            // Now create and return a CursorLoader that will take care of
-            // creating a Cursor for the data being displayed.
-            String select = "((" + Contacts.DISPLAY_NAME + " NOTNULL) AND ("
-                    + Contacts.HAS_PHONE_NUMBER + "=1) AND ("
-                    + Contacts.DISPLAY_NAME + " != '' ))";
-            return new CursorLoader(getActivity(), baseUri,
-                    CONTACTS_SUMMARY_PROJECTION, select, null,
-                    Contacts.DISPLAY_NAME + " COLLATE LOCALIZED ASC");
-        }
-
-        public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
-            // Swap the new cursor in.  (The framework will take care of closing the
-            // old cursor once we return.)
-            mAdapter.swapCursor(data);
-        }
-
-        public void onLoaderReset(Loader<Cursor> loader) {
-            // This is called when the last Cursor provided to onLoadFinished()
-            // above is about to be closed.  We need to make sure we are no
-            // longer using it.
-            mAdapter.swapCursor(null);
-        }
-    }
-//END_INCLUDE(fragment_cursor)
-}
diff --git a/samples/ApiDemos/src/com/example/android/apis/support/app/LoaderThrottleSupport.java b/samples/ApiDemos/src/com/example/android/apis/support/app/LoaderThrottleSupport.java
deleted file mode 100644
index e8f4af5..0000000
--- a/samples/ApiDemos/src/com/example/android/apis/support/app/LoaderThrottleSupport.java
+++ /dev/null
@@ -1,503 +0,0 @@
-/*
- * Copyright (C) 2011 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.support.app;
-
-//BEGIN_INCLUDE(complete)
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.ListFragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.CursorLoader;
-import android.support.v4.content.Loader;
-import android.support.v4.widget.SimpleCursorAdapter;
-
-import android.content.ContentProvider;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.UriMatcher;
-import android.database.Cursor;
-import android.database.DatabaseUtils;
-import android.database.SQLException;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.database.sqlite.SQLiteQueryBuilder;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.provider.BaseColumns;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.ListView;
-
-import java.util.HashMap;
-
-/**
- * Demonstration of bottom to top implementation of a content provider holding
- * structured data through displaying it in the UI, using throttling to reduce
- * the number of queries done when its data changes.
- */
-public class LoaderThrottleSupport extends FragmentActivity {
-    // Debugging.
-    static final String TAG = "LoaderThrottle";
-
-    /**
-     * The authority we use to get to our sample provider.
-     */
-    public static final String AUTHORITY = "com.example.android.apis.support.app.LoaderThrottle";
-
-    /**
-     * Definition of the contract for the main table of our provider.
-     */
-    public static final class MainTable implements BaseColumns {
-
-        // This class cannot be instantiated
-        private MainTable() {}
-
-        /**
-         * The table name offered by this provider
-         */
-        public static final String TABLE_NAME = "main";
-
-        /**
-         * The content:// style URL for this table
-         */
-        public static final Uri CONTENT_URI =  Uri.parse("content://" + AUTHORITY + "/main");
-
-        /**
-         * The content URI base for a single row of data. Callers must
-         * append a numeric row id to this Uri to retrieve a row
-         */
-        public static final Uri CONTENT_ID_URI_BASE
-                = Uri.parse("content://" + AUTHORITY + "/main/");
-
-        /**
-         * The MIME type of {@link #CONTENT_URI}.
-         */
-        public static final String CONTENT_TYPE
-                = "vnd.android.cursor.dir/vnd.example.api-demos-throttle";
-
-        /**
-         * The MIME type of a {@link #CONTENT_URI} sub-directory of a single row.
-         */
-        public static final String CONTENT_ITEM_TYPE
-                = "vnd.android.cursor.item/vnd.example.api-demos-throttle";
-        /**
-         * The default sort order for this table
-         */
-        public static final String DEFAULT_SORT_ORDER = "data COLLATE LOCALIZED ASC";
-
-        /**
-         * Column name for the single column holding our data.
-         * <P>Type: TEXT</P>
-         */
-        public static final String COLUMN_NAME_DATA = "data";
-    }
-
-    /**
-     * This class helps open, create, and upgrade the database file.
-     */
-   static class DatabaseHelper extends SQLiteOpenHelper {
-
-       private static final String DATABASE_NAME = "loader_throttle.db";
-       private static final int DATABASE_VERSION = 2;
-
-       DatabaseHelper(Context context) {
-
-           // calls the super constructor, requesting the default cursor factory.
-           super(context, DATABASE_NAME, null, DATABASE_VERSION);
-       }
-
-       /**
-        *
-        * Creates the underlying database with table name and column names taken from the
-        * NotePad class.
-        */
-       @Override
-       public void onCreate(SQLiteDatabase db) {
-           db.execSQL("CREATE TABLE " + MainTable.TABLE_NAME + " ("
-                   + MainTable._ID + " INTEGER PRIMARY KEY,"
-                   + MainTable.COLUMN_NAME_DATA + " TEXT"
-                   + ");");
-       }
-
-       /**
-        *
-        * Demonstrates that the provider must consider what happens when the
-        * underlying datastore is changed. In this sample, the database is upgraded the database
-        * by destroying the existing data.
-        * A real application should upgrade the database in place.
-        */
-       @Override
-       public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-
-           // Logs that the database is being upgraded
-           Log.w(TAG, "Upgrading database from version " + oldVersion + " to "
-                   + newVersion + ", which will destroy all old data");
-
-           // Kills the table and existing data
-           db.execSQL("DROP TABLE IF EXISTS notes");
-
-           // Recreates the database with a new version
-           onCreate(db);
-       }
-   }
-
-    /**
-     * A very simple implementation of a content provider.
-     */
-    public static class SimpleProvider extends ContentProvider {
-        // A projection map used to select columns from the database
-        private final HashMap<String, String> mNotesProjectionMap;
-        // Uri matcher to decode incoming URIs.
-        private final UriMatcher mUriMatcher;
-
-        // The incoming URI matches the main table URI pattern
-        private static final int MAIN = 1;
-        // The incoming URI matches the main table row ID URI pattern
-        private static final int MAIN_ID = 2;
-
-        // Handle to a new DatabaseHelper.
-        private DatabaseHelper mOpenHelper;
-
-        /**
-         * Global provider initialization.
-         */
-        public SimpleProvider() {
-            // Create and initialize URI matcher.
-            mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
-            mUriMatcher.addURI(AUTHORITY, MainTable.TABLE_NAME, MAIN);
-            mUriMatcher.addURI(AUTHORITY, MainTable.TABLE_NAME + "/#", MAIN_ID);
-
-            // Create and initialize projection map for all columns.  This is
-            // simply an identity mapping.
-            mNotesProjectionMap = new HashMap<String, String>();
-            mNotesProjectionMap.put(MainTable._ID, MainTable._ID);
-            mNotesProjectionMap.put(MainTable.COLUMN_NAME_DATA, MainTable.COLUMN_NAME_DATA);
-        }
-
-        /**
-         * Perform provider creation.
-         */
-        @Override
-        public boolean onCreate() {
-            mOpenHelper = new DatabaseHelper(getContext());
-            // Assumes that any failures will be reported by a thrown exception.
-            return true;
-        }
-
-        /**
-         * Handle incoming queries.
-         */
-        @Override
-        public Cursor query(Uri uri, String[] projection, String selection,
-                String[] selectionArgs, String sortOrder) {
-
-            // Constructs a new query builder and sets its table name
-            SQLiteQueryBuilder qb = new SQLiteQueryBuilder();
-            qb.setTables(MainTable.TABLE_NAME);
-
-            switch (mUriMatcher.match(uri)) {
-                case MAIN:
-                    // If the incoming URI is for main table.
-                    qb.setProjectionMap(mNotesProjectionMap);
-                    break;
-
-                case MAIN_ID:
-                    // The incoming URI is for a single row.
-                    qb.setProjectionMap(mNotesProjectionMap);
-                    qb.appendWhere(MainTable._ID + "=?");
-                    selectionArgs = DatabaseUtils.appendSelectionArgs(selectionArgs,
-                            new String[] { uri.getLastPathSegment() });
-                    break;
-
-                default:
-                    throw new IllegalArgumentException("Unknown URI " + uri);
-            }
-
-
-            if (TextUtils.isEmpty(sortOrder)) {
-                sortOrder = MainTable.DEFAULT_SORT_ORDER;
-            }
-
-            SQLiteDatabase db = mOpenHelper.getReadableDatabase();
-
-            Cursor c = qb.query(db, projection, selection, selectionArgs,
-                    null /* no group */, null /* no filter */, sortOrder);
-
-            c.setNotificationUri(getContext().getContentResolver(), uri);
-            return c;
-        }
-
-        /**
-         * Return the MIME type for an known URI in the provider.
-         */
-        @Override
-        public String getType(Uri uri) {
-            switch (mUriMatcher.match(uri)) {
-                case MAIN:
-                    return MainTable.CONTENT_TYPE;
-                case MAIN_ID:
-                    return MainTable.CONTENT_ITEM_TYPE;
-                default:
-                    throw new IllegalArgumentException("Unknown URI " + uri);
-            }
-        }
-
-        /**
-         * Handler inserting new data.
-         */
-        @Override
-        public Uri insert(Uri uri, ContentValues initialValues) {
-            if (mUriMatcher.match(uri) != MAIN) {
-                // Can only insert into to main URI.
-                throw new IllegalArgumentException("Unknown URI " + uri);
-            }
-
-            ContentValues values;
-
-            if (initialValues != null) {
-                values = new ContentValues(initialValues);
-            } else {
-                values = new ContentValues();
-            }
-
-            if (values.containsKey(MainTable.COLUMN_NAME_DATA) == false) {
-                values.put(MainTable.COLUMN_NAME_DATA, "");
-            }
-
-            SQLiteDatabase db = mOpenHelper.getWritableDatabase();
-
-            long rowId = db.insert(MainTable.TABLE_NAME, null, values);
-
-            // If the insert succeeded, the row ID exists.
-            if (rowId > 0) {
-                Uri noteUri = ContentUris.withAppendedId(MainTable.CONTENT_ID_URI_BASE, rowId);
-                getContext().getContentResolver().notifyChange(noteUri, null);
-                return noteUri;
-            }
-
-            throw new SQLException("Failed to insert row into " + uri);
-        }
-
-        /**
-         * Handle deleting data.
-         */
-        @Override
-        public int delete(Uri uri, String where, String[] whereArgs) {
-            SQLiteDatabase db = mOpenHelper.getWritableDatabase();
-            String finalWhere;
-
-            int count;
-
-            switch (mUriMatcher.match(uri)) {
-                case MAIN:
-                    // If URI is main table, delete uses incoming where clause and args.
-                    count = db.delete(MainTable.TABLE_NAME, where, whereArgs);
-                    break;
-
-                    // If the incoming URI matches a single note ID, does the delete based on the
-                    // incoming data, but modifies the where clause to restrict it to the
-                    // particular note ID.
-                case MAIN_ID:
-                    // If URI is for a particular row ID, delete is based on incoming
-                    // data but modified to restrict to the given ID.
-                    finalWhere = DatabaseUtils.concatenateWhere(
-                            MainTable._ID + " = " + ContentUris.parseId(uri), where);
-                    count = db.delete(MainTable.TABLE_NAME, finalWhere, whereArgs);
-                    break;
-
-                default:
-                    throw new IllegalArgumentException("Unknown URI " + uri);
-            }
-
-            getContext().getContentResolver().notifyChange(uri, null);
-
-            return count;
-        }
-
-        /**
-         * Handle updating data.
-         */
-        @Override
-        public int update(Uri uri, ContentValues values, String where, String[] whereArgs) {
-            SQLiteDatabase db = mOpenHelper.getWritableDatabase();
-            int count;
-            String finalWhere;
-
-            switch (mUriMatcher.match(uri)) {
-                case MAIN:
-                    // If URI is main table, update uses incoming where clause and args.
-                    count = db.update(MainTable.TABLE_NAME, values, where, whereArgs);
-                    break;
-
-                case MAIN_ID:
-                    // If URI is for a particular row ID, update is based on incoming
-                    // data but modified to restrict to the given ID.
-                    finalWhere = DatabaseUtils.concatenateWhere(
-                            MainTable._ID + " = " + ContentUris.parseId(uri), where);
-                    count = db.update(MainTable.TABLE_NAME, values, finalWhere, whereArgs);
-                    break;
-
-                default:
-                    throw new IllegalArgumentException("Unknown URI " + uri);
-            }
-
-            getContext().getContentResolver().notifyChange(uri, null);
-
-            return count;
-        }
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        FragmentManager fm = getSupportFragmentManager();
-
-        // Create the list fragment and add it as our sole content.
-        if (fm.findFragmentById(android.R.id.content) == null) {
-            ThrottledLoaderListFragment list = new ThrottledLoaderListFragment();
-            fm.beginTransaction().add(android.R.id.content, list).commit();
-        }
-    }
-
-    public static class ThrottledLoaderListFragment extends ListFragment
-            implements LoaderManager.LoaderCallbacks<Cursor> {
-
-        // Menu identifiers
-        static final int POPULATE_ID = Menu.FIRST;
-        static final int CLEAR_ID = Menu.FIRST+1;
-
-        // This is the Adapter being used to display the list's data.
-        SimpleCursorAdapter mAdapter;
-
-        // If non-null, this is the current filter the user has provided.
-        String mCurFilter;
-
-        // Task we have running to populate the database.
-        AsyncTask<Void, Void, Void> mPopulatingTask;
-
-        @Override public void onActivityCreated(Bundle savedInstanceState) {
-            super.onActivityCreated(savedInstanceState);
-
-            setEmptyText("No data.  Select 'Populate' to fill with data from Z to A at a rate of 4 per second.");
-            setHasOptionsMenu(true);
-
-            // Create an empty adapter we will use to display the loaded data.
-            mAdapter = new SimpleCursorAdapter(getActivity(),
-                    android.R.layout.simple_list_item_1, null,
-                    new String[] { MainTable.COLUMN_NAME_DATA },
-                    new int[] { android.R.id.text1 }, 0);
-            setListAdapter(mAdapter);
-
-            // Prepare the loader.  Either re-connect with an existing one,
-            // or start a new one.
-            getLoaderManager().initLoader(0, null, this);
-        }
-
-        @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-            menu.add(Menu.NONE, POPULATE_ID, 0, "Populate")
-                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-            menu.add(Menu.NONE, CLEAR_ID, 0, "Clear")
-                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-        }
-
-        @Override public boolean onOptionsItemSelected(MenuItem item) {
-            final ContentResolver cr = getActivity().getContentResolver();
-
-            switch (item.getItemId()) {
-                case POPULATE_ID:
-                    if (mPopulatingTask != null) {
-                        mPopulatingTask.cancel(false);
-                    }
-                    mPopulatingTask = new AsyncTask<Void, Void, Void>() {
-                        @Override protected Void doInBackground(Void... params) {
-                            for (char c='Z'; c>='A'; c--) {
-                                if (isCancelled()) {
-                                    break;
-                                }
-                                StringBuilder builder = new StringBuilder("Data ");
-                                builder.append(c);
-                                ContentValues values = new ContentValues();
-                                values.put(MainTable.COLUMN_NAME_DATA, builder.toString());
-                                cr.insert(MainTable.CONTENT_URI, values);
-                                // Wait a bit between each insert.
-                                try {
-                                    Thread.sleep(250);
-                                } catch (InterruptedException e) {
-                                }
-                            }
-                            return null;
-                        }
-                    };
-                    mPopulatingTask.executeOnExecutor(
-                            AsyncTask.THREAD_POOL_EXECUTOR, (Void[])null);
-                    return true;
-
-                case CLEAR_ID:
-                    if (mPopulatingTask != null) {
-                        mPopulatingTask.cancel(false);
-                        mPopulatingTask = null;
-                    }
-                    AsyncTask<Void, Void, Void> task = new AsyncTask<Void, Void, Void>() {
-                        @Override protected Void doInBackground(Void... params) {
-                            cr.delete(MainTable.CONTENT_URI, null, null);
-                            return null;
-                        }
-                    };
-                    task.execute((Void[])null);
-                    return true;
-
-                default:
-                    return super.onOptionsItemSelected(item);
-            }
-        }
-
-        @Override public void onListItemClick(ListView l, View v, int position, long id) {
-            // Insert desired behavior here.
-            Log.i(TAG, "Item clicked: " + id);
-        }
-
-        // These are the rows that we will retrieve.
-        static final String[] PROJECTION = new String[] {
-            MainTable._ID,
-            MainTable.COLUMN_NAME_DATA,
-        };
-
-        public Loader<Cursor> onCreateLoader(int id, Bundle args) {
-            CursorLoader cl = new CursorLoader(getActivity(), MainTable.CONTENT_URI,
-                    PROJECTION, null, null, null);
-            cl.setUpdateThrottle(2000); // update at most every 2 seconds.
-            return cl;
-        }
-
-        public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
-            mAdapter.swapCursor(data);
-        }
-
-        public void onLoaderReset(Loader<Cursor> loader) {
-            mAdapter.swapCursor(null);
-        }
-    }
-}
-//END_INCLUDE(complete)