diff --git a/samples/CaptionOverlayActivity/Android.mk b/samples/MultiWindow/Android.mk
similarity index 88%
rename from samples/CaptionOverlayActivity/Android.mk
rename to samples/MultiWindow/Android.mk
index c4a8c87d7..8827b30cf 100644
--- a/samples/CaptionOverlayActivity/Android.mk
+++ b/samples/MultiWindow/Android.mk
@@ -6,7 +6,7 @@ LOCAL_MODULE_TAGS := samples
 # Only compile source java files in this apk.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_PACKAGE_NAME := CaptionOverlayActivity
+LOCAL_PACKAGE_NAME := MultiWindow
 
 LOCAL_SDK_VERSION := current
 
diff --git a/samples/CaptionOverlayActivity/AndroidManifest.xml b/samples/MultiWindow/AndroidManifest.xml
similarity index 55%
rename from samples/CaptionOverlayActivity/AndroidManifest.xml
rename to samples/MultiWindow/AndroidManifest.xml
index ff349dfea..229c48e22 100644
--- a/samples/CaptionOverlayActivity/AndroidManifest.xml
+++ b/samples/MultiWindow/AndroidManifest.xml
@@ -15,9 +15,10 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.captionoverlayactivity">
-    <application android:label="Caption Overlay">
+    package="com.example.android.multiwindow">
+    <application android:label="Multi Window">
         <activity android:name=".CaptionOverlayActivity"
+                android:label="Caption Overlay"
                 android:resizeableActivity="true"
                 android:theme="@android:style/Theme.Holo.Light">
             <intent-filter>
@@ -25,5 +26,24 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+
+        <activity android:name=".LaunchingToSideActivity"
+            android:label="Launch To Side"
+            android:resizeableActivity="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".MoveTaskToSideActivity"
+                android:label="Move to side"
+                android:resizeableActivity="true"
+                android:taskAffinity="">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
     </application>
 </manifest>
diff --git a/samples/CaptionOverlayActivity/res/layout/caption_overlay_layout.xml b/samples/MultiWindow/res/layout/caption_overlay_layout.xml
similarity index 100%
rename from samples/CaptionOverlayActivity/res/layout/caption_overlay_layout.xml
rename to samples/MultiWindow/res/layout/caption_overlay_layout.xml
diff --git a/samples/MultiWindow/res/layout/launching_to_side_layout.xml b/samples/MultiWindow/res/layout/launching_to_side_layout.xml
new file mode 100644
index 000000000..f389d29a2
--- /dev/null
+++ b/samples/MultiWindow/res/layout/launching_to_side_layout.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        >
+        <Button
+                android:id="@+id/launch_to_the_side"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/launch_settings_to_side"
+        />
+        <Button
+                android:id="@+id/launch_new_task"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/launch_new_task"
+        />
+
+</LinearLayout>
diff --git a/samples/MultiWindow/res/layout/move_task_to_side_layout.xml b/samples/MultiWindow/res/layout/move_task_to_side_layout.xml
new file mode 100644
index 000000000..d2a6c03ee
--- /dev/null
+++ b/samples/MultiWindow/res/layout/move_task_to_side_layout.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+>
+    <Button
+            android:id="@+id/button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/launch_settings_to_side"
+    />
+</FrameLayout>
diff --git a/samples/CaptionOverlayActivity/res/values/strings.xml b/samples/MultiWindow/res/values/strings.xml
similarity index 85%
rename from samples/CaptionOverlayActivity/res/values/strings.xml
rename to samples/MultiWindow/res/values/strings.xml
index fcaebd14a..f36b73c16 100644
--- a/samples/CaptionOverlayActivity/res/values/strings.xml
+++ b/samples/MultiWindow/res/values/strings.xml
@@ -18,5 +18,6 @@
 
     <string name="caption_overlay_activity_hello_text">Hello, World!</string>
     <string name="caption_overlay_activity_fish_text">Thanks for All the Fish!</string>
-
+    <string name="launch_settings_to_side">Launch settings to other side</string>
+    <string name="launch_new_task">Launch new task</string>
 </resources>
diff --git a/samples/CaptionOverlayActivity/src/com/example/android/captionoverlayactivity/CaptionOverlayActivity.java b/samples/MultiWindow/src/com/example/android/multiwindow/CaptionOverlayActivity.java
similarity index 95%
rename from samples/CaptionOverlayActivity/src/com/example/android/captionoverlayactivity/CaptionOverlayActivity.java
rename to samples/MultiWindow/src/com/example/android/multiwindow/CaptionOverlayActivity.java
index e579ad773..760bb1af2 100644
--- a/samples/CaptionOverlayActivity/src/com/example/android/captionoverlayactivity/CaptionOverlayActivity.java
+++ b/samples/MultiWindow/src/com/example/android/multiwindow/CaptionOverlayActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 The Android Open Source Project
+ * Copyright (C) 2015 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.android.captionoverlayactivity;
+package com.example.android.multiwindow;
 
 import android.app.ActionBar;
 import android.app.Activity;
diff --git a/samples/MultiWindow/src/com/example/android/multiwindow/LaunchingToSideActivity.java b/samples/MultiWindow/src/com/example/android/multiwindow/LaunchingToSideActivity.java
new file mode 100644
index 000000000..885ce5d71
--- /dev/null
+++ b/samples/MultiWindow/src/com/example/android/multiwindow/LaunchingToSideActivity.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2015 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.multiwindow;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+public class LaunchingToSideActivity extends Activity implements View.OnClickListener {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.launching_to_side_layout);
+        findViewById(R.id.launch_to_the_side).setOnClickListener(this);
+        findViewById(R.id.launch_new_task).setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v.getId() == R.id.launch_to_the_side) {
+            Intent intent = new Intent("android.settings.SETTINGS");
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_LAUNCH_TO_SIDE);
+            startActivity(intent);
+        } else if (v.getId() == R.id.launch_new_task) {
+            Intent intent = new Intent(this, MoveTaskToSideActivity.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+            startActivity(intent);
+        }
+    }
+}
diff --git a/samples/MultiWindow/src/com/example/android/multiwindow/MoveTaskToSideActivity.java b/samples/MultiWindow/src/com/example/android/multiwindow/MoveTaskToSideActivity.java
new file mode 100644
index 000000000..a19ca6de3
--- /dev/null
+++ b/samples/MultiWindow/src/com/example/android/multiwindow/MoveTaskToSideActivity.java
@@ -0,0 +1,22 @@
+package com.example.android.multiwindow;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+public class MoveTaskToSideActivity extends Activity implements View.OnClickListener {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.move_task_to_side_layout);
+        findViewById(R.id.button).setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View v) {
+        Intent intent = new Intent(this, LaunchingToSideActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_LAUNCH_TO_SIDE);
+        startActivity(intent);
+    }
+}