Update more samples to use Application module
Renaming main module for samples from <Name>Sample to Application, for
compatibility with Android Wear projects.
Change-Id: I28fbdcf3f1686c2c37bb2ccb08882f4906d3431b
diff --git a/admin/BasicManagedProfile/BasicManagedProfileSample/.gitignore b/admin/BasicManagedProfile/Application/.gitignore
similarity index 100%
rename from admin/BasicManagedProfile/BasicManagedProfileSample/.gitignore
rename to admin/BasicManagedProfile/Application/.gitignore
diff --git a/admin/BasicManagedProfile/BasicManagedProfileSample/proguard-project.txt b/admin/BasicManagedProfile/Application/proguard-project.txt
similarity index 100%
rename from admin/BasicManagedProfile/BasicManagedProfileSample/proguard-project.txt
rename to admin/BasicManagedProfile/Application/proguard-project.txt
diff --git a/admin/BasicManagedProfile/BasicManagedProfileSample/src/main/AndroidManifest.xml b/admin/BasicManagedProfile/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from admin/BasicManagedProfile/BasicManagedProfileSample/src/main/AndroidManifest.xml
rename to admin/BasicManagedProfile/Application/src/main/AndroidManifest.xml
diff --git a/admin/BasicManagedProfile/BasicManagedProfileSample/src/main/java/com/example/android/basicmanagedprofile/BasicDeviceAdminReceiver.java b/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/BasicDeviceAdminReceiver.java
similarity index 100%
rename from admin/BasicManagedProfile/BasicManagedProfileSample/src/main/java/com/example/android/basicmanagedprofile/BasicDeviceAdminReceiver.java
rename to admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/BasicDeviceAdminReceiver.java
diff --git a/admin/BasicManagedProfile/BasicManagedProfileSample/src/main/java/com/example/android/basicmanagedprofile/BasicManagedProfileFragment.java b/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/BasicManagedProfileFragment.java
similarity index 100%
rename from admin/BasicManagedProfile/BasicManagedProfileSample/src/main/java/com/example/android/basicmanagedprofile/BasicManagedProfileFragment.java
rename to admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/BasicManagedProfileFragment.java
diff --git a/admin/BasicManagedProfile/BasicManagedProfileSample/src/main/java/com/example/android/basicmanagedprofile/EnableProfileActivity.java b/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/EnableProfileActivity.java
similarity index 100%
rename from admin/BasicManagedProfile/BasicManagedProfileSample/src/main/java/com/example/android/basicmanagedprofile/EnableProfileActivity.java
rename to admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/EnableProfileActivity.java
diff --git a/admin/BasicManagedProfile/BasicManagedProfileSample/src/main/java/com/example/android/basicmanagedprofile/MainActivity.java b/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/MainActivity.java
similarity index 100%
rename from admin/BasicManagedProfile/BasicManagedProfileSample/src/main/java/com/example/android/basicmanagedprofile/MainActivity.java
rename to admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/MainActivity.java
diff --git a/admin/BasicManagedProfile/BasicManagedProfileSample/src/main/java/com/example/android/basicmanagedprofile/SetupProfileFragment.java b/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/SetupProfileFragment.java
similarity index 100%
rename from admin/BasicManagedProfile/BasicManagedProfileSample/src/main/java/com/example/android/basicmanagedprofile/SetupProfileFragment.java
rename to admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/SetupProfileFragment.java
diff --git a/admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable-hdpi/ic_launcher.png b/admin/BasicManagedProfile/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to admin/BasicManagedProfile/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable-mdpi/ic_launcher.png b/admin/BasicManagedProfile/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to admin/BasicManagedProfile/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable-xhdpi/ic_launcher.png b/admin/BasicManagedProfile/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to admin/BasicManagedProfile/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable-xxhdpi/badge.png b/admin/BasicManagedProfile/Application/src/main/res/drawable-xxhdpi/badge.png
similarity index 100%
rename from admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable-xxhdpi/badge.png
rename to admin/BasicManagedProfile/Application/src/main/res/drawable-xxhdpi/badge.png
Binary files differ
diff --git a/admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/admin/BasicManagedProfile/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to admin/BasicManagedProfile/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable/ic_launcher_badged.xml b/admin/BasicManagedProfile/Application/src/main/res/drawable/ic_launcher_badged.xml
similarity index 100%
rename from admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable/ic_launcher_badged.xml
rename to admin/BasicManagedProfile/Application/src/main/res/drawable/ic_launcher_badged.xml
diff --git a/admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/layout/activity_main_real.xml b/admin/BasicManagedProfile/Application/src/main/res/layout/activity_main_real.xml
similarity index 100%
rename from admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/layout/activity_main_real.xml
rename to admin/BasicManagedProfile/Application/src/main/res/layout/activity_main_real.xml
diff --git a/admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/layout/activity_setup.xml b/admin/BasicManagedProfile/Application/src/main/res/layout/activity_setup.xml
similarity index 100%
rename from admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/layout/activity_setup.xml
rename to admin/BasicManagedProfile/Application/src/main/res/layout/activity_setup.xml
diff --git a/admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/layout/fragment_main.xml b/admin/BasicManagedProfile/Application/src/main/res/layout/fragment_main.xml
similarity index 100%
rename from admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/layout/fragment_main.xml
rename to admin/BasicManagedProfile/Application/src/main/res/layout/fragment_main.xml
diff --git a/admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/layout/fragment_setup_profile.xml b/admin/BasicManagedProfile/Application/src/main/res/layout/fragment_setup_profile.xml
similarity index 100%
rename from admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/layout/fragment_setup_profile.xml
rename to admin/BasicManagedProfile/Application/src/main/res/layout/fragment_setup_profile.xml
diff --git a/admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values-w820dp/dimens.xml b/admin/BasicManagedProfile/Application/src/main/res/values-w820dp/dimens.xml
similarity index 100%
rename from admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values-w820dp/dimens.xml
rename to admin/BasicManagedProfile/Application/src/main/res/values-w820dp/dimens.xml
diff --git a/admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values/dimens.xml b/admin/BasicManagedProfile/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values/dimens.xml
rename to admin/BasicManagedProfile/Application/src/main/res/values/dimens.xml
diff --git a/admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values/strings.xml b/admin/BasicManagedProfile/Application/src/main/res/values/strings.xml
similarity index 100%
rename from admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values/strings.xml
rename to admin/BasicManagedProfile/Application/src/main/res/values/strings.xml
diff --git a/admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values/styles.xml b/admin/BasicManagedProfile/Application/src/main/res/values/styles.xml
similarity index 100%
rename from admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values/styles.xml
rename to admin/BasicManagedProfile/Application/src/main/res/values/styles.xml
diff --git a/admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/xml/basic_device_admin_receiver.xml b/admin/BasicManagedProfile/Application/src/main/res/xml/basic_device_admin_receiver.xml
similarity index 100%
rename from admin/BasicManagedProfile/BasicManagedProfileSample/src/main/res/xml/basic_device_admin_receiver.xml
rename to admin/BasicManagedProfile/Application/src/main/res/xml/basic_device_admin_receiver.xml
diff --git a/admin/BasicManagedProfile/settings.gradle b/admin/BasicManagedProfile/settings.gradle
index f896148..9464a35 100644
--- a/admin/BasicManagedProfile/settings.gradle
+++ b/admin/BasicManagedProfile/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicManagedProfileSample'
+include 'Application'
diff --git a/background/JobScheduler/JobSchedulerSample/.gitignore b/background/JobScheduler/Application/.gitignore
similarity index 100%
rename from background/JobScheduler/JobSchedulerSample/.gitignore
rename to background/JobScheduler/Application/.gitignore
diff --git a/background/JobScheduler/JobSchedulerSample/proguard-project.txt b/background/JobScheduler/Application/proguard-project.txt
similarity index 100%
rename from background/JobScheduler/JobSchedulerSample/proguard-project.txt
rename to background/JobScheduler/Application/proguard-project.txt
diff --git a/background/JobScheduler/JobSchedulerSample/src/main/AndroidManifest.xml b/background/JobScheduler/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from background/JobScheduler/JobSchedulerSample/src/main/AndroidManifest.xml
rename to background/JobScheduler/Application/src/main/AndroidManifest.xml
diff --git a/background/JobScheduler/JobSchedulerSample/src/main/java/com/example/android/jobscheduler/MainActivity.java b/background/JobScheduler/Application/src/main/java/com/example/android/jobscheduler/MainActivity.java
similarity index 100%
rename from background/JobScheduler/JobSchedulerSample/src/main/java/com/example/android/jobscheduler/MainActivity.java
rename to background/JobScheduler/Application/src/main/java/com/example/android/jobscheduler/MainActivity.java
diff --git a/background/JobScheduler/JobSchedulerSample/src/main/java/com/example/android/jobscheduler/service/TestJobService.java b/background/JobScheduler/Application/src/main/java/com/example/android/jobscheduler/service/TestJobService.java
similarity index 100%
rename from background/JobScheduler/JobSchedulerSample/src/main/java/com/example/android/jobscheduler/service/TestJobService.java
rename to background/JobScheduler/Application/src/main/java/com/example/android/jobscheduler/service/TestJobService.java
diff --git a/background/JobScheduler/JobSchedulerSample/src/main/res/drawable-hdpi/ic_launcher.png b/background/JobScheduler/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from background/JobScheduler/JobSchedulerSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to background/JobScheduler/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/background/JobScheduler/JobSchedulerSample/src/main/res/drawable-mdpi/ic_launcher.png b/background/JobScheduler/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from background/JobScheduler/JobSchedulerSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to background/JobScheduler/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/background/JobScheduler/JobSchedulerSample/src/main/res/drawable-xhdpi/ic_launcher.png b/background/JobScheduler/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from background/JobScheduler/JobSchedulerSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to background/JobScheduler/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/background/JobScheduler/JobSchedulerSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/background/JobScheduler/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from background/JobScheduler/JobSchedulerSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to background/JobScheduler/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/background/JobScheduler/JobSchedulerSample/src/main/res/layout/sample_main.xml b/background/JobScheduler/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from background/JobScheduler/JobSchedulerSample/src/main/res/layout/sample_main.xml
rename to background/JobScheduler/Application/src/main/res/layout/sample_main.xml
diff --git a/background/JobScheduler/JobSchedulerSample/src/main/res/values-v11/styles.xml b/background/JobScheduler/Application/src/main/res/values-v11/styles.xml
similarity index 100%
rename from background/JobScheduler/JobSchedulerSample/src/main/res/values-v11/styles.xml
rename to background/JobScheduler/Application/src/main/res/values-v11/styles.xml
diff --git a/background/JobScheduler/JobSchedulerSample/src/main/res/values-v14/styles.xml b/background/JobScheduler/Application/src/main/res/values-v14/styles.xml
similarity index 100%
rename from background/JobScheduler/JobSchedulerSample/src/main/res/values-v14/styles.xml
rename to background/JobScheduler/Application/src/main/res/values-v14/styles.xml
diff --git a/background/JobScheduler/JobSchedulerSample/src/main/res/values/color.xml b/background/JobScheduler/Application/src/main/res/values/color.xml
similarity index 100%
rename from background/JobScheduler/JobSchedulerSample/src/main/res/values/color.xml
rename to background/JobScheduler/Application/src/main/res/values/color.xml
diff --git a/background/JobScheduler/JobSchedulerSample/src/main/res/values/strings.xml b/background/JobScheduler/Application/src/main/res/values/strings.xml
similarity index 100%
rename from background/JobScheduler/JobSchedulerSample/src/main/res/values/strings.xml
rename to background/JobScheduler/Application/src/main/res/values/strings.xml
diff --git a/background/JobScheduler/JobSchedulerSample/src/main/res/values/styles.xml b/background/JobScheduler/Application/src/main/res/values/styles.xml
similarity index 100%
rename from background/JobScheduler/JobSchedulerSample/src/main/res/values/styles.xml
rename to background/JobScheduler/Application/src/main/res/values/styles.xml
diff --git a/background/JobScheduler/JobSchedulerSample/tests/AndroidManifest.xml b/background/JobScheduler/Application/tests/AndroidManifest.xml
similarity index 100%
rename from background/JobScheduler/JobSchedulerSample/tests/AndroidManifest.xml
rename to background/JobScheduler/Application/tests/AndroidManifest.xml
diff --git a/background/JobScheduler/JobSchedulerSample/tests/src/com/example/android/jobscheduler/tests/SampleTests.java b/background/JobScheduler/Application/tests/src/com/example/android/jobscheduler/tests/SampleTests.java
similarity index 100%
rename from background/JobScheduler/JobSchedulerSample/tests/src/com/example/android/jobscheduler/tests/SampleTests.java
rename to background/JobScheduler/Application/tests/src/com/example/android/jobscheduler/tests/SampleTests.java
diff --git a/background/JobScheduler/settings.gradle b/background/JobScheduler/settings.gradle
index 77a2714..9464a35 100644
--- a/background/JobScheduler/settings.gradle
+++ b/background/JobScheduler/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'JobSchedulerSample'
+include 'Application'
diff --git a/media/Camera2Basic/Camera2BasicSample/.gitignore b/media/Camera2Basic/Application/.gitignore
similarity index 100%
rename from media/Camera2Basic/Camera2BasicSample/.gitignore
rename to media/Camera2Basic/Application/.gitignore
diff --git a/media/Camera2Basic/Camera2BasicSample/proguard-project.txt b/media/Camera2Basic/Application/proguard-project.txt
similarity index 100%
rename from media/Camera2Basic/Camera2BasicSample/proguard-project.txt
rename to media/Camera2Basic/Application/proguard-project.txt
diff --git a/media/Camera2Basic/Camera2BasicSample/src/main/AndroidManifest.xml b/media/Camera2Basic/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from media/Camera2Basic/Camera2BasicSample/src/main/AndroidManifest.xml
rename to media/Camera2Basic/Application/src/main/AndroidManifest.xml
diff --git a/media/Camera2Basic/Camera2BasicSample/src/main/java/com/example/android/camera2basic/AutoFitTextureView.java b/media/Camera2Basic/Application/src/main/java/com/example/android/camera2basic/AutoFitTextureView.java
similarity index 100%
rename from media/Camera2Basic/Camera2BasicSample/src/main/java/com/example/android/camera2basic/AutoFitTextureView.java
rename to media/Camera2Basic/Application/src/main/java/com/example/android/camera2basic/AutoFitTextureView.java
diff --git a/media/Camera2Basic/Camera2BasicSample/src/main/java/com/example/android/camera2basic/Camera2BasicFragment.java b/media/Camera2Basic/Application/src/main/java/com/example/android/camera2basic/Camera2BasicFragment.java
similarity index 100%
rename from media/Camera2Basic/Camera2BasicSample/src/main/java/com/example/android/camera2basic/Camera2BasicFragment.java
rename to media/Camera2Basic/Application/src/main/java/com/example/android/camera2basic/Camera2BasicFragment.java
diff --git a/media/Camera2Basic/Camera2BasicSample/src/main/java/com/example/android/camera2basic/CameraActivity.java b/media/Camera2Basic/Application/src/main/java/com/example/android/camera2basic/CameraActivity.java
similarity index 100%
rename from media/Camera2Basic/Camera2BasicSample/src/main/java/com/example/android/camera2basic/CameraActivity.java
rename to media/Camera2Basic/Application/src/main/java/com/example/android/camera2basic/CameraActivity.java
diff --git a/media/Camera2Basic/Camera2BasicSample/src/main/res/drawable-hdpi/ic_action_info.png b/media/Camera2Basic/Application/src/main/res/drawable-hdpi/ic_action_info.png
similarity index 100%
rename from media/Camera2Basic/Camera2BasicSample/src/main/res/drawable-hdpi/ic_action_info.png
rename to media/Camera2Basic/Application/src/main/res/drawable-hdpi/ic_action_info.png
Binary files differ
diff --git a/media/Camera2Basic/Camera2BasicSample/src/main/res/drawable-hdpi/ic_launcher.png b/media/Camera2Basic/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from media/Camera2Basic/Camera2BasicSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to media/Camera2Basic/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/media/Camera2Basic/Camera2BasicSample/src/main/res/drawable-mdpi/ic_action_info.png b/media/Camera2Basic/Application/src/main/res/drawable-mdpi/ic_action_info.png
similarity index 100%
rename from media/Camera2Basic/Camera2BasicSample/src/main/res/drawable-mdpi/ic_action_info.png
rename to media/Camera2Basic/Application/src/main/res/drawable-mdpi/ic_action_info.png
Binary files differ
diff --git a/media/Camera2Basic/Camera2BasicSample/src/main/res/drawable-mdpi/ic_launcher.png b/media/Camera2Basic/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from media/Camera2Basic/Camera2BasicSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to media/Camera2Basic/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/media/Camera2Basic/Camera2BasicSample/src/main/res/drawable-xhdpi/ic_action_info.png b/media/Camera2Basic/Application/src/main/res/drawable-xhdpi/ic_action_info.png
similarity index 100%
rename from media/Camera2Basic/Camera2BasicSample/src/main/res/drawable-xhdpi/ic_action_info.png
rename to media/Camera2Basic/Application/src/main/res/drawable-xhdpi/ic_action_info.png
Binary files differ
diff --git a/media/Camera2Basic/Camera2BasicSample/src/main/res/drawable-xhdpi/ic_launcher.png b/media/Camera2Basic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from media/Camera2Basic/Camera2BasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to media/Camera2Basic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/media/Camera2Basic/Camera2BasicSample/src/main/res/drawable-xxhdpi/ic_action_info.png b/media/Camera2Basic/Application/src/main/res/drawable-xxhdpi/ic_action_info.png
similarity index 100%
rename from media/Camera2Basic/Camera2BasicSample/src/main/res/drawable-xxhdpi/ic_action_info.png
rename to media/Camera2Basic/Application/src/main/res/drawable-xxhdpi/ic_action_info.png
Binary files differ
diff --git a/media/Camera2Basic/Camera2BasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/media/Camera2Basic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from media/Camera2Basic/Camera2BasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to media/Camera2Basic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/media/Camera2Basic/Camera2BasicSample/src/main/res/layout-land/fragment_camera2_basic.xml b/media/Camera2Basic/Application/src/main/res/layout-land/fragment_camera2_basic.xml
similarity index 100%
rename from media/Camera2Basic/Camera2BasicSample/src/main/res/layout-land/fragment_camera2_basic.xml
rename to media/Camera2Basic/Application/src/main/res/layout-land/fragment_camera2_basic.xml
diff --git a/media/Camera2Basic/Camera2BasicSample/src/main/res/layout/activity_camera.xml b/media/Camera2Basic/Application/src/main/res/layout/activity_camera.xml
similarity index 100%
rename from media/Camera2Basic/Camera2BasicSample/src/main/res/layout/activity_camera.xml
rename to media/Camera2Basic/Application/src/main/res/layout/activity_camera.xml
diff --git a/media/Camera2Basic/Camera2BasicSample/src/main/res/layout/fragment_camera2_basic.xml b/media/Camera2Basic/Application/src/main/res/layout/fragment_camera2_basic.xml
similarity index 100%
rename from media/Camera2Basic/Camera2BasicSample/src/main/res/layout/fragment_camera2_basic.xml
rename to media/Camera2Basic/Application/src/main/res/layout/fragment_camera2_basic.xml
diff --git a/media/Camera2Basic/Camera2BasicSample/src/main/res/values/strings.xml b/media/Camera2Basic/Application/src/main/res/values/strings.xml
similarity index 100%
rename from media/Camera2Basic/Camera2BasicSample/src/main/res/values/strings.xml
rename to media/Camera2Basic/Application/src/main/res/values/strings.xml
diff --git a/media/Camera2Basic/Camera2BasicSample/src/main/res/values/styles.xml b/media/Camera2Basic/Application/src/main/res/values/styles.xml
similarity index 100%
rename from media/Camera2Basic/Camera2BasicSample/src/main/res/values/styles.xml
rename to media/Camera2Basic/Application/src/main/res/values/styles.xml
diff --git a/media/Camera2Basic/Camera2BasicSample/tests/AndroidManifest.xml b/media/Camera2Basic/Application/tests/AndroidManifest.xml
similarity index 100%
rename from media/Camera2Basic/Camera2BasicSample/tests/AndroidManifest.xml
rename to media/Camera2Basic/Application/tests/AndroidManifest.xml
diff --git a/media/Camera2Basic/Camera2BasicSample/tests/src/com/example/android/camera2basic/tests/SampleTests.java b/media/Camera2Basic/Application/tests/src/com/example/android/camera2basic/tests/SampleTests.java
similarity index 100%
rename from media/Camera2Basic/Camera2BasicSample/tests/src/com/example/android/camera2basic/tests/SampleTests.java
rename to media/Camera2Basic/Application/tests/src/com/example/android/camera2basic/tests/SampleTests.java
diff --git a/media/Camera2Basic/settings.gradle b/media/Camera2Basic/settings.gradle
index fcefe51..9464a35 100644
--- a/media/Camera2Basic/settings.gradle
+++ b/media/Camera2Basic/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'Camera2BasicSample'
+include 'Application'
diff --git a/media/Camera2Video/Camera2VideoSample/.gitignore b/media/Camera2Video/Application/.gitignore
similarity index 100%
rename from media/Camera2Video/Camera2VideoSample/.gitignore
rename to media/Camera2Video/Application/.gitignore
diff --git a/media/Camera2Video/Camera2VideoSample/proguard-project.txt b/media/Camera2Video/Application/proguard-project.txt
similarity index 100%
rename from media/Camera2Video/Camera2VideoSample/proguard-project.txt
rename to media/Camera2Video/Application/proguard-project.txt
diff --git a/media/Camera2Video/Camera2VideoSample/src/main/AndroidManifest.xml b/media/Camera2Video/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from media/Camera2Video/Camera2VideoSample/src/main/AndroidManifest.xml
rename to media/Camera2Video/Application/src/main/AndroidManifest.xml
diff --git a/media/Camera2Video/Camera2VideoSample/src/main/java/com/example/android/camera2video/AutoFitTextureView.java b/media/Camera2Video/Application/src/main/java/com/example/android/camera2video/AutoFitTextureView.java
similarity index 100%
rename from media/Camera2Video/Camera2VideoSample/src/main/java/com/example/android/camera2video/AutoFitTextureView.java
rename to media/Camera2Video/Application/src/main/java/com/example/android/camera2video/AutoFitTextureView.java
diff --git a/media/Camera2Video/Camera2VideoSample/src/main/java/com/example/android/camera2video/Camera2VideoFragment.java b/media/Camera2Video/Application/src/main/java/com/example/android/camera2video/Camera2VideoFragment.java
similarity index 100%
rename from media/Camera2Video/Camera2VideoSample/src/main/java/com/example/android/camera2video/Camera2VideoFragment.java
rename to media/Camera2Video/Application/src/main/java/com/example/android/camera2video/Camera2VideoFragment.java
diff --git a/media/Camera2Video/Camera2VideoSample/src/main/java/com/example/android/camera2video/CameraActivity.java b/media/Camera2Video/Application/src/main/java/com/example/android/camera2video/CameraActivity.java
similarity index 100%
rename from media/Camera2Video/Camera2VideoSample/src/main/java/com/example/android/camera2video/CameraActivity.java
rename to media/Camera2Video/Application/src/main/java/com/example/android/camera2video/CameraActivity.java
diff --git a/media/Camera2Video/Camera2VideoSample/src/main/res/drawable-hdpi/ic_action_info.png b/media/Camera2Video/Application/src/main/res/drawable-hdpi/ic_action_info.png
similarity index 100%
rename from media/Camera2Video/Camera2VideoSample/src/main/res/drawable-hdpi/ic_action_info.png
rename to media/Camera2Video/Application/src/main/res/drawable-hdpi/ic_action_info.png
Binary files differ
diff --git a/media/Camera2Video/Camera2VideoSample/src/main/res/drawable-hdpi/ic_launcher.png b/media/Camera2Video/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from media/Camera2Video/Camera2VideoSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to media/Camera2Video/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/media/Camera2Video/Camera2VideoSample/src/main/res/drawable-mdpi/ic_action_info.png b/media/Camera2Video/Application/src/main/res/drawable-mdpi/ic_action_info.png
similarity index 100%
rename from media/Camera2Video/Camera2VideoSample/src/main/res/drawable-mdpi/ic_action_info.png
rename to media/Camera2Video/Application/src/main/res/drawable-mdpi/ic_action_info.png
Binary files differ
diff --git a/media/Camera2Video/Camera2VideoSample/src/main/res/drawable-mdpi/ic_launcher.png b/media/Camera2Video/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from media/Camera2Video/Camera2VideoSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to media/Camera2Video/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/media/Camera2Video/Camera2VideoSample/src/main/res/drawable-xhdpi/ic_action_info.png b/media/Camera2Video/Application/src/main/res/drawable-xhdpi/ic_action_info.png
similarity index 100%
rename from media/Camera2Video/Camera2VideoSample/src/main/res/drawable-xhdpi/ic_action_info.png
rename to media/Camera2Video/Application/src/main/res/drawable-xhdpi/ic_action_info.png
Binary files differ
diff --git a/media/Camera2Video/Camera2VideoSample/src/main/res/drawable-xhdpi/ic_launcher.png b/media/Camera2Video/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from media/Camera2Video/Camera2VideoSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to media/Camera2Video/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/media/Camera2Video/Camera2VideoSample/src/main/res/drawable-xxhdpi/ic_action_info.png b/media/Camera2Video/Application/src/main/res/drawable-xxhdpi/ic_action_info.png
similarity index 100%
rename from media/Camera2Video/Camera2VideoSample/src/main/res/drawable-xxhdpi/ic_action_info.png
rename to media/Camera2Video/Application/src/main/res/drawable-xxhdpi/ic_action_info.png
Binary files differ
diff --git a/media/Camera2Video/Camera2VideoSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/media/Camera2Video/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from media/Camera2Video/Camera2VideoSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to media/Camera2Video/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/media/Camera2Video/Camera2VideoSample/src/main/res/layout-land/fragment_camera2_video.xml b/media/Camera2Video/Application/src/main/res/layout-land/fragment_camera2_video.xml
similarity index 100%
rename from media/Camera2Video/Camera2VideoSample/src/main/res/layout-land/fragment_camera2_video.xml
rename to media/Camera2Video/Application/src/main/res/layout-land/fragment_camera2_video.xml
diff --git a/media/Camera2Video/Camera2VideoSample/src/main/res/layout/activity_camera.xml b/media/Camera2Video/Application/src/main/res/layout/activity_camera.xml
similarity index 100%
rename from media/Camera2Video/Camera2VideoSample/src/main/res/layout/activity_camera.xml
rename to media/Camera2Video/Application/src/main/res/layout/activity_camera.xml
diff --git a/media/Camera2Video/Camera2VideoSample/src/main/res/layout/fragment_camera2_video.xml b/media/Camera2Video/Application/src/main/res/layout/fragment_camera2_video.xml
similarity index 100%
rename from media/Camera2Video/Camera2VideoSample/src/main/res/layout/fragment_camera2_video.xml
rename to media/Camera2Video/Application/src/main/res/layout/fragment_camera2_video.xml
diff --git a/media/Camera2Video/Camera2VideoSample/src/main/res/values/strings.xml b/media/Camera2Video/Application/src/main/res/values/strings.xml
similarity index 100%
rename from media/Camera2Video/Camera2VideoSample/src/main/res/values/strings.xml
rename to media/Camera2Video/Application/src/main/res/values/strings.xml
diff --git a/media/Camera2Video/Camera2VideoSample/src/main/res/values/styles.xml b/media/Camera2Video/Application/src/main/res/values/styles.xml
similarity index 100%
rename from media/Camera2Video/Camera2VideoSample/src/main/res/values/styles.xml
rename to media/Camera2Video/Application/src/main/res/values/styles.xml
diff --git a/media/Camera2Video/settings.gradle b/media/Camera2Video/settings.gradle
index 890bae1..9464a35 100644
--- a/media/Camera2Video/settings.gradle
+++ b/media/Camera2Video/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'Camera2VideoSample'
+include 'Application'
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/.gitignore b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/.gitignore
similarity index 100%
copy from ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/.gitignore
copy to ui/activityscenetransition/ActivitySceneTransitionBasic/Application/.gitignore
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/.gitignore b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/ActivitySceneTransitionBasicSample/.gitignore
similarity index 100%
rename from ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/.gitignore
rename to ui/activityscenetransition/ActivitySceneTransitionBasic/Application/ActivitySceneTransitionBasicSample/.gitignore
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/libs/volley.jar b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/ActivitySceneTransitionBasicSample/libs/volley.jar
similarity index 100%
rename from ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/libs/volley.jar
rename to ui/activityscenetransition/ActivitySceneTransitionBasic/Application/ActivitySceneTransitionBasicSample/libs/volley.jar
Binary files differ
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/proguard-project.txt b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/ActivitySceneTransitionBasicSample/proguard-project.txt
similarity index 100%
rename from ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/proguard-project.txt
rename to ui/activityscenetransition/ActivitySceneTransitionBasic/Application/ActivitySceneTransitionBasicSample/proguard-project.txt
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/tests/AndroidManifest.xml b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/ActivitySceneTransitionBasicSample/tests/AndroidManifest.xml
similarity index 100%
rename from ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/tests/AndroidManifest.xml
rename to ui/activityscenetransition/ActivitySceneTransitionBasic/Application/ActivitySceneTransitionBasicSample/tests/AndroidManifest.xml
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/tests/src/com/example/android/activityscenetransitionbasic/tests/SampleTests.java b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/ActivitySceneTransitionBasicSample/tests/src/com/example/android/activityscenetransitionbasic/tests/SampleTests.java
similarity index 100%
rename from ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/tests/src/com/example/android/activityscenetransitionbasic/tests/SampleTests.java
rename to ui/activityscenetransition/ActivitySceneTransitionBasic/Application/ActivitySceneTransitionBasicSample/tests/src/com/example/android/activityscenetransitionbasic/tests/SampleTests.java
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/AndroidManifest.xml b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/AndroidManifest.xml
rename to ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/AndroidManifest.xml
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/activityscenetransitionbasic/DetailActivity.java b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/DetailActivity.java
similarity index 100%
rename from ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/activityscenetransitionbasic/DetailActivity.java
rename to ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/DetailActivity.java
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/activityscenetransitionbasic/ImageMemoryCache.java b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/ImageMemoryCache.java
similarity index 100%
rename from ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/activityscenetransitionbasic/ImageMemoryCache.java
rename to ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/ImageMemoryCache.java
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/activityscenetransitionbasic/Item.java b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/Item.java
similarity index 100%
rename from ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/activityscenetransitionbasic/Item.java
rename to ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/Item.java
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/activityscenetransitionbasic/MainActivity.java b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/MainActivity.java
similarity index 100%
rename from ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/activityscenetransitionbasic/MainActivity.java
rename to ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/MainActivity.java
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/activityscenetransitionbasic/SquareFrameLayout.java b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/SquareFrameLayout.java
similarity index 100%
rename from ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/activityscenetransitionbasic/SquareFrameLayout.java
rename to ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/SquareFrameLayout.java
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/layout/details.xml b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/res/layout/details.xml
similarity index 100%
rename from ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/layout/details.xml
rename to ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/res/layout/details.xml
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/layout/grid.xml b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/res/layout/grid.xml
similarity index 100%
rename from ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/layout/grid.xml
rename to ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/res/layout/grid.xml
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/layout/grid_item.xml b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/res/layout/grid_item.xml
similarity index 100%
rename from ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/layout/grid_item.xml
rename to ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/res/layout/grid_item.xml
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/transition/grid_detail_transition.xml b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/res/transition/grid_detail_transition.xml
similarity index 100%
rename from ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/transition/grid_detail_transition.xml
rename to ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/res/transition/grid_detail_transition.xml
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values-v21/styles.xml b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/res/values-v21/styles.xml
similarity index 100%
rename from ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values-v21/styles.xml
rename to ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/res/values-v21/styles.xml
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values/dimens.xml b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values/dimens.xml
rename to ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/res/values/dimens.xml
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values/strings.xml b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/activityscenetransition/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values/strings.xml
rename to ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/res/values/strings.xml
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/settings.gradle b/ui/activityscenetransition/ActivitySceneTransitionBasic/settings.gradle
index 363009d..9464a35 100644
--- a/ui/activityscenetransition/ActivitySceneTransitionBasic/settings.gradle
+++ b/ui/activityscenetransition/ActivitySceneTransitionBasic/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'ActivitySceneTransitionBasicSample'
+include 'Application'
diff --git a/ui/graphics/PdfRendererBasic/PdfRendererBasicSample/.gitignore b/ui/graphics/PdfRendererBasic/Application/.gitignore
similarity index 100%
rename from ui/graphics/PdfRendererBasic/PdfRendererBasicSample/.gitignore
rename to ui/graphics/PdfRendererBasic/Application/.gitignore
diff --git a/ui/graphics/PdfRendererBasic/PdfRendererBasicSample/README-fragmentview.txt b/ui/graphics/PdfRendererBasic/Application/README-fragmentview.txt
similarity index 100%
rename from ui/graphics/PdfRendererBasic/PdfRendererBasicSample/README-fragmentview.txt
rename to ui/graphics/PdfRendererBasic/Application/README-fragmentview.txt
diff --git a/ui/graphics/PdfRendererBasic/PdfRendererBasicSample/proguard-project.txt b/ui/graphics/PdfRendererBasic/Application/proguard-project.txt
similarity index 100%
rename from ui/graphics/PdfRendererBasic/PdfRendererBasicSample/proguard-project.txt
rename to ui/graphics/PdfRendererBasic/Application/proguard-project.txt
diff --git a/ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/AndroidManifest.xml b/ui/graphics/PdfRendererBasic/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/AndroidManifest.xml
rename to ui/graphics/PdfRendererBasic/Application/src/main/AndroidManifest.xml
diff --git a/ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/assets/sample.pdf b/ui/graphics/PdfRendererBasic/Application/src/main/assets/sample.pdf
similarity index 100%
rename from ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/assets/sample.pdf
rename to ui/graphics/PdfRendererBasic/Application/src/main/assets/sample.pdf
Binary files differ
diff --git a/ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/java/com/example/android/pdfrendererbasic/MainActivity.java b/ui/graphics/PdfRendererBasic/Application/src/main/java/com/example/android/pdfrendererbasic/MainActivity.java
similarity index 100%
rename from ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/java/com/example/android/pdfrendererbasic/MainActivity.java
rename to ui/graphics/PdfRendererBasic/Application/src/main/java/com/example/android/pdfrendererbasic/MainActivity.java
diff --git a/ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/java/com/example/android/pdfrendererbasic/PdfRendererBasicFragment.java b/ui/graphics/PdfRendererBasic/Application/src/main/java/com/example/android/pdfrendererbasic/PdfRendererBasicFragment.java
similarity index 100%
rename from ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/java/com/example/android/pdfrendererbasic/PdfRendererBasicFragment.java
rename to ui/graphics/PdfRendererBasic/Application/src/main/java/com/example/android/pdfrendererbasic/PdfRendererBasicFragment.java
diff --git a/ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/res/drawable-hdpi/ic_action_info.png b/ui/graphics/PdfRendererBasic/Application/src/main/res/drawable-hdpi/ic_action_info.png
similarity index 100%
rename from ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/res/drawable-hdpi/ic_action_info.png
rename to ui/graphics/PdfRendererBasic/Application/src/main/res/drawable-hdpi/ic_action_info.png
Binary files differ
diff --git a/ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/graphics/PdfRendererBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/graphics/PdfRendererBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/res/drawable-mdpi/ic_action_info.png b/ui/graphics/PdfRendererBasic/Application/src/main/res/drawable-mdpi/ic_action_info.png
similarity index 100%
rename from ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/res/drawable-mdpi/ic_action_info.png
rename to ui/graphics/PdfRendererBasic/Application/src/main/res/drawable-mdpi/ic_action_info.png
Binary files differ
diff --git a/ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/graphics/PdfRendererBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/graphics/PdfRendererBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/res/drawable-xhdpi/ic_action_info.png b/ui/graphics/PdfRendererBasic/Application/src/main/res/drawable-xhdpi/ic_action_info.png
similarity index 100%
rename from ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/res/drawable-xhdpi/ic_action_info.png
rename to ui/graphics/PdfRendererBasic/Application/src/main/res/drawable-xhdpi/ic_action_info.png
Binary files differ
diff --git a/ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/graphics/PdfRendererBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/graphics/PdfRendererBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/res/drawable-xxhdpi/ic_action_info.png b/ui/graphics/PdfRendererBasic/Application/src/main/res/drawable-xxhdpi/ic_action_info.png
similarity index 100%
rename from ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/res/drawable-xxhdpi/ic_action_info.png
rename to ui/graphics/PdfRendererBasic/Application/src/main/res/drawable-xxhdpi/ic_action_info.png
Binary files differ
diff --git a/ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/graphics/PdfRendererBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/graphics/PdfRendererBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/res/layout/activity_main_real.xml b/ui/graphics/PdfRendererBasic/Application/src/main/res/layout/activity_main_real.xml
similarity index 100%
rename from ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/res/layout/activity_main_real.xml
rename to ui/graphics/PdfRendererBasic/Application/src/main/res/layout/activity_main_real.xml
diff --git a/ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/res/layout/fragment_pdf_renderer_basic.xml b/ui/graphics/PdfRendererBasic/Application/src/main/res/layout/fragment_pdf_renderer_basic.xml
similarity index 100%
rename from ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/res/layout/fragment_pdf_renderer_basic.xml
rename to ui/graphics/PdfRendererBasic/Application/src/main/res/layout/fragment_pdf_renderer_basic.xml
diff --git a/ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/res/menu/main.xml b/ui/graphics/PdfRendererBasic/Application/src/main/res/menu/main.xml
similarity index 100%
rename from ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/res/menu/main.xml
rename to ui/graphics/PdfRendererBasic/Application/src/main/res/menu/main.xml
diff --git a/ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/res/values/strings.xml b/ui/graphics/PdfRendererBasic/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/graphics/PdfRendererBasic/PdfRendererBasicSample/src/main/res/values/strings.xml
rename to ui/graphics/PdfRendererBasic/Application/src/main/res/values/strings.xml
diff --git a/ui/graphics/PdfRendererBasic/PdfRendererBasicSample/tests/AndroidManifest.xml b/ui/graphics/PdfRendererBasic/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/graphics/PdfRendererBasic/PdfRendererBasicSample/tests/AndroidManifest.xml
rename to ui/graphics/PdfRendererBasic/Application/tests/AndroidManifest.xml
diff --git a/ui/graphics/PdfRendererBasic/PdfRendererBasicSample/tests/src/com/example/android/pdfrendererbasic/tests/PdfRendererBasicFragmentTests.java b/ui/graphics/PdfRendererBasic/Application/tests/src/com/example/android/pdfrendererbasic/tests/PdfRendererBasicFragmentTests.java
similarity index 100%
rename from ui/graphics/PdfRendererBasic/PdfRendererBasicSample/tests/src/com/example/android/pdfrendererbasic/tests/PdfRendererBasicFragmentTests.java
rename to ui/graphics/PdfRendererBasic/Application/tests/src/com/example/android/pdfrendererbasic/tests/PdfRendererBasicFragmentTests.java
diff --git a/ui/graphics/PdfRendererBasic/settings.gradle b/ui/graphics/PdfRendererBasic/settings.gradle
index f34faad..9464a35 100644
--- a/ui/graphics/PdfRendererBasic/settings.gradle
+++ b/ui/graphics/PdfRendererBasic/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'PdfRendererBasicSample'
+include 'Application'
diff --git a/ui/views/Clipping/ClippingBasic/ClippingBasicSample/.gitignore b/ui/views/Clipping/ClippingBasic/Application/.gitignore
similarity index 100%
rename from ui/views/Clipping/ClippingBasic/ClippingBasicSample/.gitignore
rename to ui/views/Clipping/ClippingBasic/Application/.gitignore
diff --git a/ui/views/Clipping/ClippingBasic/ClippingBasicSample/proguard-project.txt b/ui/views/Clipping/ClippingBasic/Application/proguard-project.txt
similarity index 100%
rename from ui/views/Clipping/ClippingBasic/ClippingBasicSample/proguard-project.txt
rename to ui/views/Clipping/ClippingBasic/Application/proguard-project.txt
diff --git a/ui/views/Clipping/ClippingBasic/ClippingBasicSample/src/main/AndroidManifest.xml b/ui/views/Clipping/ClippingBasic/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/views/Clipping/ClippingBasic/ClippingBasicSample/src/main/AndroidManifest.xml
rename to ui/views/Clipping/ClippingBasic/Application/src/main/AndroidManifest.xml
diff --git a/ui/views/Clipping/ClippingBasic/ClippingBasicSample/src/main/java/com/example/android/clippingbasic/ClippingBasicFragment.java b/ui/views/Clipping/ClippingBasic/Application/src/main/java/com/example/android/clippingbasic/ClippingBasicFragment.java
similarity index 100%
rename from ui/views/Clipping/ClippingBasic/ClippingBasicSample/src/main/java/com/example/android/clippingbasic/ClippingBasicFragment.java
rename to ui/views/Clipping/ClippingBasic/Application/src/main/java/com/example/android/clippingbasic/ClippingBasicFragment.java
diff --git a/ui/views/Clipping/ClippingBasic/ClippingBasicSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/views/Clipping/ClippingBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/views/Clipping/ClippingBasic/ClippingBasicSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/views/Clipping/ClippingBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/Clipping/ClippingBasic/ClippingBasicSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/views/Clipping/ClippingBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/views/Clipping/ClippingBasic/ClippingBasicSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/views/Clipping/ClippingBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/Clipping/ClippingBasic/ClippingBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/views/Clipping/ClippingBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/Clipping/ClippingBasic/ClippingBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/views/Clipping/ClippingBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/Clipping/ClippingBasic/ClippingBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/views/Clipping/ClippingBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/Clipping/ClippingBasic/ClippingBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/views/Clipping/ClippingBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/Clipping/ClippingBasic/ClippingBasicSample/src/main/res/drawable/gradient_drawable.xml b/ui/views/Clipping/ClippingBasic/Application/src/main/res/drawable/gradient_drawable.xml
similarity index 100%
rename from ui/views/Clipping/ClippingBasic/ClippingBasicSample/src/main/res/drawable/gradient_drawable.xml
rename to ui/views/Clipping/ClippingBasic/Application/src/main/res/drawable/gradient_drawable.xml
diff --git a/ui/views/Clipping/ClippingBasic/ClippingBasicSample/src/main/res/layout/clipping_basic_fragment.xml b/ui/views/Clipping/ClippingBasic/Application/src/main/res/layout/clipping_basic_fragment.xml
similarity index 100%
rename from ui/views/Clipping/ClippingBasic/ClippingBasicSample/src/main/res/layout/clipping_basic_fragment.xml
rename to ui/views/Clipping/ClippingBasic/Application/src/main/res/layout/clipping_basic_fragment.xml
diff --git a/ui/views/Clipping/ClippingBasic/ClippingBasicSample/src/main/res/values/strings.xml b/ui/views/Clipping/ClippingBasic/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/views/Clipping/ClippingBasic/ClippingBasicSample/src/main/res/values/strings.xml
rename to ui/views/Clipping/ClippingBasic/Application/src/main/res/values/strings.xml
diff --git a/ui/views/Clipping/ClippingBasic/ClippingBasicSample/tests/AndroidManifest.xml b/ui/views/Clipping/ClippingBasic/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/views/Clipping/ClippingBasic/ClippingBasicSample/tests/AndroidManifest.xml
rename to ui/views/Clipping/ClippingBasic/Application/tests/AndroidManifest.xml
diff --git a/ui/views/Clipping/ClippingBasic/ClippingBasicSample/tests/src/com/example/android/clippingbasic/tests/SampleTests.java b/ui/views/Clipping/ClippingBasic/Application/tests/src/com/example/android/clippingbasic/tests/SampleTests.java
similarity index 100%
rename from ui/views/Clipping/ClippingBasic/ClippingBasicSample/tests/src/com/example/android/clippingbasic/tests/SampleTests.java
rename to ui/views/Clipping/ClippingBasic/Application/tests/src/com/example/android/clippingbasic/tests/SampleTests.java
diff --git a/ui/views/Clipping/ClippingBasic/ClippingBasicSample/README-fragmentview.txt b/ui/views/Clipping/ClippingBasic/ClippingBasicSample/README-fragmentview.txt
deleted file mode 100644
index 38d903f..0000000
--- a/ui/views/Clipping/ClippingBasic/ClippingBasicSample/README-fragmentview.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
- Copyright 2013 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.
--->
-
-Steps to implement FragmentView template:
--in template-params.xml.ftl:
- -add the following line to common imports
- <common src="activities"/>
-
--Add a Fragment to show behavior. In your MainActivity.java class, it will reference a Fragment
- called (yourProjectName)Fragment.java. Create that file in your project, using the "main" source
- folder instead of "common" or "templates".
- For instance, if your package name is com.example.foo, create the file
- src/main/java/com/example/foo/FooFragment.java
-
-
--Within this fragment, make sure that the onCreate method has the line
- "setHasOptionsMenu(true);", to enable the fragment to handle menu events.
-
--In order to override menu events, override onOptionsItemSelected.
-
--refer to sampleSamples/fragmentViewSample for a reference implementation of a
-project built on this template.
-
-
diff --git a/ui/views/Clipping/ClippingBasic/settings.gradle b/ui/views/Clipping/ClippingBasic/settings.gradle
index 670e715..9464a35 100644
--- a/ui/views/Clipping/ClippingBasic/settings.gradle
+++ b/ui/views/Clipping/ClippingBasic/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'ClippingBasicSample'
+include 'Application'
diff --git a/ui/views/Elevation/ElevationBasic/ElevationBasicSample/.gitignore b/ui/views/Elevation/ElevationBasic/Application/.gitignore
similarity index 100%
rename from ui/views/Elevation/ElevationBasic/ElevationBasicSample/.gitignore
rename to ui/views/Elevation/ElevationBasic/Application/.gitignore
diff --git a/ui/views/Elevation/ElevationBasic/ElevationBasicSample/README-singleview.txt b/ui/views/Elevation/ElevationBasic/Application/README-singleview.txt
similarity index 100%
rename from ui/views/Elevation/ElevationBasic/ElevationBasicSample/README-singleview.txt
rename to ui/views/Elevation/ElevationBasic/Application/README-singleview.txt
diff --git a/ui/views/Elevation/ElevationBasic/ElevationBasicSample/proguard-project.txt b/ui/views/Elevation/ElevationBasic/Application/proguard-project.txt
similarity index 100%
rename from ui/views/Elevation/ElevationBasic/ElevationBasicSample/proguard-project.txt
rename to ui/views/Elevation/ElevationBasic/Application/proguard-project.txt
diff --git a/ui/views/Elevation/ElevationBasic/ElevationBasicSample/src/main/AndroidManifest.xml b/ui/views/Elevation/ElevationBasic/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/views/Elevation/ElevationBasic/ElevationBasicSample/src/main/AndroidManifest.xml
rename to ui/views/Elevation/ElevationBasic/Application/src/main/AndroidManifest.xml
diff --git a/ui/views/Elevation/ElevationBasic/ElevationBasicSample/src/main/java/com/example/android/elevationbasic/ElevationBasicFragment.java b/ui/views/Elevation/ElevationBasic/Application/src/main/java/com/example/android/elevationbasic/ElevationBasicFragment.java
similarity index 100%
rename from ui/views/Elevation/ElevationBasic/ElevationBasicSample/src/main/java/com/example/android/elevationbasic/ElevationBasicFragment.java
rename to ui/views/Elevation/ElevationBasic/Application/src/main/java/com/example/android/elevationbasic/ElevationBasicFragment.java
diff --git a/ui/views/Elevation/ElevationBasic/ElevationBasicSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/views/Elevation/ElevationBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/views/Elevation/ElevationBasic/ElevationBasicSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/views/Elevation/ElevationBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/Elevation/ElevationBasic/ElevationBasicSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/views/Elevation/ElevationBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/views/Elevation/ElevationBasic/ElevationBasicSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/views/Elevation/ElevationBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/Elevation/ElevationBasic/ElevationBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/views/Elevation/ElevationBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/Elevation/ElevationBasic/ElevationBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/views/Elevation/ElevationBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/Elevation/ElevationBasic/ElevationBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/views/Elevation/ElevationBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/Elevation/ElevationBasic/ElevationBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/views/Elevation/ElevationBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/Elevation/ElevationBasic/ElevationBasicSample/src/main/res/drawable/shape.xml b/ui/views/Elevation/ElevationBasic/Application/src/main/res/drawable/shape.xml
similarity index 100%
rename from ui/views/Elevation/ElevationBasic/ElevationBasicSample/src/main/res/drawable/shape.xml
rename to ui/views/Elevation/ElevationBasic/Application/src/main/res/drawable/shape.xml
diff --git a/ui/views/Elevation/ElevationBasic/ElevationBasicSample/src/main/res/drawable/shape2.xml b/ui/views/Elevation/ElevationBasic/Application/src/main/res/drawable/shape2.xml
similarity index 100%
rename from ui/views/Elevation/ElevationBasic/ElevationBasicSample/src/main/res/drawable/shape2.xml
rename to ui/views/Elevation/ElevationBasic/Application/src/main/res/drawable/shape2.xml
diff --git a/ui/views/Elevation/ElevationBasic/ElevationBasicSample/src/main/res/layout/elevation_basic.xml b/ui/views/Elevation/ElevationBasic/Application/src/main/res/layout/elevation_basic.xml
similarity index 100%
rename from ui/views/Elevation/ElevationBasic/ElevationBasicSample/src/main/res/layout/elevation_basic.xml
rename to ui/views/Elevation/ElevationBasic/Application/src/main/res/layout/elevation_basic.xml
diff --git a/ui/views/Elevation/ElevationBasic/ElevationBasicSample/src/main/res/values/colors.xml b/ui/views/Elevation/ElevationBasic/Application/src/main/res/values/colors.xml
similarity index 100%
rename from ui/views/Elevation/ElevationBasic/ElevationBasicSample/src/main/res/values/colors.xml
rename to ui/views/Elevation/ElevationBasic/Application/src/main/res/values/colors.xml
diff --git a/ui/views/Elevation/ElevationBasic/ElevationBasicSample/tests/AndroidManifest.xml b/ui/views/Elevation/ElevationBasic/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/views/Elevation/ElevationBasic/ElevationBasicSample/tests/AndroidManifest.xml
rename to ui/views/Elevation/ElevationBasic/Application/tests/AndroidManifest.xml
diff --git a/ui/views/Elevation/ElevationBasic/ElevationBasicSample/tests/src/com/example/android/elevationbasic/tests/SampleTests.java b/ui/views/Elevation/ElevationBasic/Application/tests/src/com/example/android/elevationbasic/tests/SampleTests.java
similarity index 100%
rename from ui/views/Elevation/ElevationBasic/ElevationBasicSample/tests/src/com/example/android/elevationbasic/tests/SampleTests.java
rename to ui/views/Elevation/ElevationBasic/Application/tests/src/com/example/android/elevationbasic/tests/SampleTests.java
diff --git a/ui/views/Elevation/ElevationBasic/ElevationBasicSample/README-fragmentview.txt b/ui/views/Elevation/ElevationBasic/ElevationBasicSample/README-fragmentview.txt
deleted file mode 100644
index 38d903f..0000000
--- a/ui/views/Elevation/ElevationBasic/ElevationBasicSample/README-fragmentview.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
- Copyright 2013 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.
--->
-
-Steps to implement FragmentView template:
--in template-params.xml.ftl:
- -add the following line to common imports
- <common src="activities"/>
-
--Add a Fragment to show behavior. In your MainActivity.java class, it will reference a Fragment
- called (yourProjectName)Fragment.java. Create that file in your project, using the "main" source
- folder instead of "common" or "templates".
- For instance, if your package name is com.example.foo, create the file
- src/main/java/com/example/foo/FooFragment.java
-
-
--Within this fragment, make sure that the onCreate method has the line
- "setHasOptionsMenu(true);", to enable the fragment to handle menu events.
-
--In order to override menu events, override onOptionsItemSelected.
-
--refer to sampleSamples/fragmentViewSample for a reference implementation of a
-project built on this template.
-
-
diff --git a/ui/views/Elevation/ElevationBasic/settings.gradle b/ui/views/Elevation/ElevationBasic/settings.gradle
index 99cb553..9464a35 100644
--- a/ui/views/Elevation/ElevationBasic/settings.gradle
+++ b/ui/views/Elevation/ElevationBasic/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'ElevationBasicSample'
+include 'Application'
diff --git a/ui/views/Elevation/ElevationDrag/ElevationDragSample/.gitignore b/ui/views/Elevation/ElevationDrag/Application/.gitignore
similarity index 100%
rename from ui/views/Elevation/ElevationDrag/ElevationDragSample/.gitignore
rename to ui/views/Elevation/ElevationDrag/Application/.gitignore
diff --git a/ui/views/Elevation/ElevationDrag/ElevationDragSample/proguard-project.txt b/ui/views/Elevation/ElevationDrag/Application/proguard-project.txt
similarity index 100%
rename from ui/views/Elevation/ElevationDrag/ElevationDragSample/proguard-project.txt
rename to ui/views/Elevation/ElevationDrag/Application/proguard-project.txt
diff --git a/ui/views/Elevation/ElevationDrag/ElevationDragSample/src/main/AndroidManifest.xml b/ui/views/Elevation/ElevationDrag/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/views/Elevation/ElevationDrag/ElevationDragSample/src/main/AndroidManifest.xml
rename to ui/views/Elevation/ElevationDrag/Application/src/main/AndroidManifest.xml
diff --git a/ui/views/Elevation/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/elevationdrag/DragFrameLayout.java b/ui/views/Elevation/ElevationDrag/Application/src/main/java/com/example/android/elevationdrag/DragFrameLayout.java
similarity index 100%
rename from ui/views/Elevation/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/elevationdrag/DragFrameLayout.java
rename to ui/views/Elevation/ElevationDrag/Application/src/main/java/com/example/android/elevationdrag/DragFrameLayout.java
diff --git a/ui/views/Elevation/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/elevationdrag/ElevationDragFragment.java b/ui/views/Elevation/ElevationDrag/Application/src/main/java/com/example/android/elevationdrag/ElevationDragFragment.java
similarity index 100%
rename from ui/views/Elevation/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/elevationdrag/ElevationDragFragment.java
rename to ui/views/Elevation/ElevationDrag/Application/src/main/java/com/example/android/elevationdrag/ElevationDragFragment.java
diff --git a/ui/views/Elevation/ElevationDrag/ElevationDragSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/views/Elevation/ElevationDrag/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/views/Elevation/ElevationDrag/ElevationDragSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/views/Elevation/ElevationDrag/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/Elevation/ElevationDrag/ElevationDragSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/views/Elevation/ElevationDrag/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/views/Elevation/ElevationDrag/ElevationDragSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/views/Elevation/ElevationDrag/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/Elevation/ElevationDrag/ElevationDragSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/views/Elevation/ElevationDrag/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/Elevation/ElevationDrag/ElevationDragSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/views/Elevation/ElevationDrag/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/Elevation/ElevationDrag/ElevationDragSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/views/Elevation/ElevationDrag/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/Elevation/ElevationDrag/ElevationDragSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/views/Elevation/ElevationDrag/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/Elevation/ElevationDrag/ElevationDragSample/src/main/res/drawable/shape.xml b/ui/views/Elevation/ElevationDrag/Application/src/main/res/drawable/shape.xml
similarity index 100%
rename from ui/views/Elevation/ElevationDrag/ElevationDragSample/src/main/res/drawable/shape.xml
rename to ui/views/Elevation/ElevationDrag/Application/src/main/res/drawable/shape.xml
diff --git a/ui/views/Elevation/ElevationDrag/ElevationDragSample/src/main/res/layout/ztranslation.xml b/ui/views/Elevation/ElevationDrag/Application/src/main/res/layout/ztranslation.xml
similarity index 100%
rename from ui/views/Elevation/ElevationDrag/ElevationDragSample/src/main/res/layout/ztranslation.xml
rename to ui/views/Elevation/ElevationDrag/Application/src/main/res/layout/ztranslation.xml
diff --git a/ui/views/Elevation/ElevationDrag/ElevationDragSample/src/main/res/values/colors.xml b/ui/views/Elevation/ElevationDrag/Application/src/main/res/values/colors.xml
similarity index 100%
rename from ui/views/Elevation/ElevationDrag/ElevationDragSample/src/main/res/values/colors.xml
rename to ui/views/Elevation/ElevationDrag/Application/src/main/res/values/colors.xml
diff --git a/ui/views/Elevation/ElevationDrag/ElevationDragSample/src/main/res/values/dimens.xml b/ui/views/Elevation/ElevationDrag/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from ui/views/Elevation/ElevationDrag/ElevationDragSample/src/main/res/values/dimens.xml
rename to ui/views/Elevation/ElevationDrag/Application/src/main/res/values/dimens.xml
diff --git a/ui/views/Elevation/ElevationDrag/ElevationDragSample/src/main/res/values/shapes.xml b/ui/views/Elevation/ElevationDrag/Application/src/main/res/values/shapes.xml
similarity index 100%
rename from ui/views/Elevation/ElevationDrag/ElevationDragSample/src/main/res/values/shapes.xml
rename to ui/views/Elevation/ElevationDrag/Application/src/main/res/values/shapes.xml
diff --git a/ui/views/Elevation/ElevationDrag/ElevationDragSample/tests/AndroidManifest.xml b/ui/views/Elevation/ElevationDrag/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/views/Elevation/ElevationDrag/ElevationDragSample/tests/AndroidManifest.xml
rename to ui/views/Elevation/ElevationDrag/Application/tests/AndroidManifest.xml
diff --git a/ui/views/Elevation/ElevationDrag/ElevationDragSample/tests/src/com/example/android/elevationdrag/tests/SampleTests.java b/ui/views/Elevation/ElevationDrag/Application/tests/src/com/example/android/elevationdrag/tests/SampleTests.java
similarity index 100%
rename from ui/views/Elevation/ElevationDrag/ElevationDragSample/tests/src/com/example/android/elevationdrag/tests/SampleTests.java
rename to ui/views/Elevation/ElevationDrag/Application/tests/src/com/example/android/elevationdrag/tests/SampleTests.java
diff --git a/ui/views/Elevation/ElevationDrag/ElevationDragSample/README-fragmentview.txt b/ui/views/Elevation/ElevationDrag/ElevationDragSample/README-fragmentview.txt
deleted file mode 100644
index 38d903f..0000000
--- a/ui/views/Elevation/ElevationDrag/ElevationDragSample/README-fragmentview.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
- Copyright 2013 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.
--->
-
-Steps to implement FragmentView template:
--in template-params.xml.ftl:
- -add the following line to common imports
- <common src="activities"/>
-
--Add a Fragment to show behavior. In your MainActivity.java class, it will reference a Fragment
- called (yourProjectName)Fragment.java. Create that file in your project, using the "main" source
- folder instead of "common" or "templates".
- For instance, if your package name is com.example.foo, create the file
- src/main/java/com/example/foo/FooFragment.java
-
-
--Within this fragment, make sure that the onCreate method has the line
- "setHasOptionsMenu(true);", to enable the fragment to handle menu events.
-
--In order to override menu events, override onOptionsItemSelected.
-
--refer to sampleSamples/fragmentViewSample for a reference implementation of a
-project built on this template.
-
-
diff --git a/ui/views/Elevation/ElevationDrag/settings.gradle b/ui/views/Elevation/ElevationDrag/settings.gradle
index bb7fd61..9464a35 100644
--- a/ui/views/Elevation/ElevationDrag/settings.gradle
+++ b/ui/views/Elevation/ElevationDrag/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'ElevationDragSample'
+include 'Application'
diff --git a/ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/.gitignore b/ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/.gitignore
similarity index 100%
rename from ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/.gitignore
rename to ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/.gitignore
diff --git a/ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/proguard-project.txt b/ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/proguard-project.txt
similarity index 100%
rename from ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/proguard-project.txt
rename to ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/proguard-project.txt
diff --git a/ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/AndroidManifest.xml b/ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/AndroidManifest.xml
rename to ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/AndroidManifest.xml
diff --git a/ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/java/com/example/android/floatingactionbuttonbasic/FloatingActionButton.java b/ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/java/com/example/android/floatingactionbuttonbasic/FloatingActionButton.java
similarity index 100%
rename from ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/java/com/example/android/floatingactionbuttonbasic/FloatingActionButton.java
rename to ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/java/com/example/android/floatingactionbuttonbasic/FloatingActionButton.java
diff --git a/ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/java/com/example/android/floatingactionbuttonbasic/FloatingActionButtonBasicFragment.java b/ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/java/com/example/android/floatingactionbuttonbasic/FloatingActionButtonBasicFragment.java
similarity index 100%
rename from ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/java/com/example/android/floatingactionbuttonbasic/FloatingActionButtonBasicFragment.java
rename to ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/java/com/example/android/floatingactionbuttonbasic/FloatingActionButtonBasicFragment.java
diff --git a/ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/res/animator/fab_anim.xml b/ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/res/animator/fab_anim.xml
similarity index 100%
rename from ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/res/animator/fab_anim.xml
rename to ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/res/animator/fab_anim.xml
diff --git a/ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/res/drawable-xxhdpi/ic_add.png b/ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/res/drawable-xxhdpi/ic_add.png
similarity index 100%
rename from ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/res/drawable-xxhdpi/ic_add.png
rename to ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/res/drawable-xxhdpi/ic_add.png
Binary files differ
diff --git a/ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/res/drawable-xxhdpi/ic_tick.png b/ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/res/drawable-xxhdpi/ic_tick.png
similarity index 100%
rename from ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/res/drawable-xxhdpi/ic_tick.png
rename to ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/res/drawable-xxhdpi/ic_tick.png
Binary files differ
diff --git a/ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/res/drawable/fab_background.xml b/ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/res/drawable/fab_background.xml
similarity index 100%
rename from ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/res/drawable/fab_background.xml
rename to ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/res/drawable/fab_background.xml
diff --git a/ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/res/drawable/fab_icons.xml b/ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/res/drawable/fab_icons.xml
similarity index 100%
rename from ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/res/drawable/fab_icons.xml
rename to ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/res/drawable/fab_icons.xml
diff --git a/ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/res/layout/fab_layout.xml b/ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/res/layout/fab_layout.xml
similarity index 100%
rename from ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/res/layout/fab_layout.xml
rename to ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/res/layout/fab_layout.xml
diff --git a/ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/res/values/colors.xml b/ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/res/values/colors.xml
similarity index 100%
rename from ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/res/values/colors.xml
rename to ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/res/values/colors.xml
diff --git a/ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/res/values/dimens.xml b/ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/src/main/res/values/dimens.xml
rename to ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/src/main/res/values/dimens.xml
diff --git a/ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/tests/AndroidManifest.xml b/ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/tests/AndroidManifest.xml
rename to ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/tests/AndroidManifest.xml
diff --git a/ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/tests/src/com/example/android/floatingactionbuttonbasic/tests/SampleTests.java b/ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/tests/src/com/example/android/floatingactionbuttonbasic/tests/SampleTests.java
similarity index 100%
rename from ui/views/FloatingActionButton/FloatingActionButtonBasic/FloatingActionButtonBasicSample/tests/src/com/example/android/floatingactionbuttonbasic/tests/SampleTests.java
rename to ui/views/FloatingActionButton/FloatingActionButtonBasic/Application/tests/src/com/example/android/floatingactionbuttonbasic/tests/SampleTests.java
diff --git a/ui/views/FloatingActionButton/FloatingActionButtonBasic/settings.gradle b/ui/views/FloatingActionButton/FloatingActionButtonBasic/settings.gradle
index d22530e..9464a35 100644
--- a/ui/views/FloatingActionButton/FloatingActionButtonBasic/settings.gradle
+++ b/ui/views/FloatingActionButton/FloatingActionButtonBasic/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'FloatingActionButtonBasicSample'
+include 'Application'
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/.gitignore b/ui/views/NavigationDrawer/Application/.gitignore
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/.gitignore
rename to ui/views/NavigationDrawer/Application/.gitignore
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/proguard-project.txt b/ui/views/NavigationDrawer/Application/proguard-project.txt
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/proguard-project.txt
rename to ui/views/NavigationDrawer/Application/proguard-project.txt
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/AndroidManifest.xml b/ui/views/NavigationDrawer/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/AndroidManifest.xml
rename to ui/views/NavigationDrawer/Application/src/main/AndroidManifest.xml
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/java/com/example/android/navigationdrawer/NavigationDrawerActivity.java b/ui/views/NavigationDrawer/Application/src/main/java/com/example/android/navigationdrawer/NavigationDrawerActivity.java
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/java/com/example/android/navigationdrawer/NavigationDrawerActivity.java
rename to ui/views/NavigationDrawer/Application/src/main/java/com/example/android/navigationdrawer/NavigationDrawerActivity.java
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/java/com/example/android/navigationdrawer/PlanetAdapter.java b/ui/views/NavigationDrawer/Application/src/main/java/com/example/android/navigationdrawer/PlanetAdapter.java
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/java/com/example/android/navigationdrawer/PlanetAdapter.java
rename to ui/views/NavigationDrawer/Application/src/main/java/com/example/android/navigationdrawer/PlanetAdapter.java
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-hdpi/action_search.png b/ui/views/NavigationDrawer/Application/src/main/res/drawable-hdpi/action_search.png
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-hdpi/action_search.png
rename to ui/views/NavigationDrawer/Application/src/main/res/drawable-hdpi/action_search.png
Binary files differ
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-hdpi/drawer_shadow.9.png b/ui/views/NavigationDrawer/Application/src/main/res/drawable-hdpi/drawer_shadow.9.png
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-hdpi/drawer_shadow.9.png
rename to ui/views/NavigationDrawer/Application/src/main/res/drawable-hdpi/drawer_shadow.9.png
Binary files differ
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-hdpi/ic_drawer.png b/ui/views/NavigationDrawer/Application/src/main/res/drawable-hdpi/ic_drawer.png
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-hdpi/ic_drawer.png
rename to ui/views/NavigationDrawer/Application/src/main/res/drawable-hdpi/ic_drawer.png
Binary files differ
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/views/NavigationDrawer/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/views/NavigationDrawer/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-mdpi/action_search.png b/ui/views/NavigationDrawer/Application/src/main/res/drawable-mdpi/action_search.png
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-mdpi/action_search.png
rename to ui/views/NavigationDrawer/Application/src/main/res/drawable-mdpi/action_search.png
Binary files differ
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-mdpi/drawer_shadow.9.png b/ui/views/NavigationDrawer/Application/src/main/res/drawable-mdpi/drawer_shadow.9.png
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-mdpi/drawer_shadow.9.png
rename to ui/views/NavigationDrawer/Application/src/main/res/drawable-mdpi/drawer_shadow.9.png
Binary files differ
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-mdpi/ic_drawer.png b/ui/views/NavigationDrawer/Application/src/main/res/drawable-mdpi/ic_drawer.png
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-mdpi/ic_drawer.png
rename to ui/views/NavigationDrawer/Application/src/main/res/drawable-mdpi/ic_drawer.png
Binary files differ
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/views/NavigationDrawer/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/views/NavigationDrawer/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-xhdpi/action_search.png b/ui/views/NavigationDrawer/Application/src/main/res/drawable-xhdpi/action_search.png
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-xhdpi/action_search.png
rename to ui/views/NavigationDrawer/Application/src/main/res/drawable-xhdpi/action_search.png
Binary files differ
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-xhdpi/drawer_shadow.9.png b/ui/views/NavigationDrawer/Application/src/main/res/drawable-xhdpi/drawer_shadow.9.png
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-xhdpi/drawer_shadow.9.png
rename to ui/views/NavigationDrawer/Application/src/main/res/drawable-xhdpi/drawer_shadow.9.png
Binary files differ
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-xhdpi/ic_drawer.png b/ui/views/NavigationDrawer/Application/src/main/res/drawable-xhdpi/ic_drawer.png
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-xhdpi/ic_drawer.png
rename to ui/views/NavigationDrawer/Application/src/main/res/drawable-xhdpi/ic_drawer.png
Binary files differ
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/views/NavigationDrawer/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/views/NavigationDrawer/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/views/NavigationDrawer/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/views/NavigationDrawer/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/earth.jpg b/ui/views/NavigationDrawer/Application/src/main/res/drawable/earth.jpg
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/earth.jpg
rename to ui/views/NavigationDrawer/Application/src/main/res/drawable/earth.jpg
Binary files differ
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/jupiter.jpg b/ui/views/NavigationDrawer/Application/src/main/res/drawable/jupiter.jpg
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/jupiter.jpg
rename to ui/views/NavigationDrawer/Application/src/main/res/drawable/jupiter.jpg
Binary files differ
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/mars.jpg b/ui/views/NavigationDrawer/Application/src/main/res/drawable/mars.jpg
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/mars.jpg
rename to ui/views/NavigationDrawer/Application/src/main/res/drawable/mars.jpg
Binary files differ
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/mercury.jpg b/ui/views/NavigationDrawer/Application/src/main/res/drawable/mercury.jpg
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/mercury.jpg
rename to ui/views/NavigationDrawer/Application/src/main/res/drawable/mercury.jpg
Binary files differ
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/neptune.jpg b/ui/views/NavigationDrawer/Application/src/main/res/drawable/neptune.jpg
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/neptune.jpg
rename to ui/views/NavigationDrawer/Application/src/main/res/drawable/neptune.jpg
Binary files differ
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/saturn.jpg b/ui/views/NavigationDrawer/Application/src/main/res/drawable/saturn.jpg
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/saturn.jpg
rename to ui/views/NavigationDrawer/Application/src/main/res/drawable/saturn.jpg
Binary files differ
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/uranus.jpg b/ui/views/NavigationDrawer/Application/src/main/res/drawable/uranus.jpg
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/uranus.jpg
rename to ui/views/NavigationDrawer/Application/src/main/res/drawable/uranus.jpg
Binary files differ
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/venus.jpg b/ui/views/NavigationDrawer/Application/src/main/res/drawable/venus.jpg
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/venus.jpg
rename to ui/views/NavigationDrawer/Application/src/main/res/drawable/venus.jpg
Binary files differ
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/layout/activity_navigation_drawer.xml b/ui/views/NavigationDrawer/Application/src/main/res/layout/activity_navigation_drawer.xml
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/layout/activity_navigation_drawer.xml
rename to ui/views/NavigationDrawer/Application/src/main/res/layout/activity_navigation_drawer.xml
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/layout/drawer_list_item.xml b/ui/views/NavigationDrawer/Application/src/main/res/layout/drawer_list_item.xml
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/layout/drawer_list_item.xml
rename to ui/views/NavigationDrawer/Application/src/main/res/layout/drawer_list_item.xml
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/layout/fragment_planet.xml b/ui/views/NavigationDrawer/Application/src/main/res/layout/fragment_planet.xml
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/layout/fragment_planet.xml
rename to ui/views/NavigationDrawer/Application/src/main/res/layout/fragment_planet.xml
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/menu/navigation_drawer.xml b/ui/views/NavigationDrawer/Application/src/main/res/menu/navigation_drawer.xml
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/menu/navigation_drawer.xml
rename to ui/views/NavigationDrawer/Application/src/main/res/menu/navigation_drawer.xml
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/values-v20/styles.xml b/ui/views/NavigationDrawer/Application/src/main/res/values-v20/styles.xml
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/values-v20/styles.xml
rename to ui/views/NavigationDrawer/Application/src/main/res/values-v20/styles.xml
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/values/strings.xml b/ui/views/NavigationDrawer/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/src/main/res/values/strings.xml
rename to ui/views/NavigationDrawer/Application/src/main/res/values/strings.xml
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/tests/AndroidManifest.xml b/ui/views/NavigationDrawer/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/tests/AndroidManifest.xml
rename to ui/views/NavigationDrawer/Application/tests/AndroidManifest.xml
diff --git a/ui/views/NavigationDrawer/NavigationDrawerSample/tests/src/com/example/android/navigationdrawer/tests/SampleTests.java b/ui/views/NavigationDrawer/Application/tests/src/com/example/android/navigationdrawer/tests/SampleTests.java
similarity index 100%
rename from ui/views/NavigationDrawer/NavigationDrawerSample/tests/src/com/example/android/navigationdrawer/tests/SampleTests.java
rename to ui/views/NavigationDrawer/Application/tests/src/com/example/android/navigationdrawer/tests/SampleTests.java
diff --git a/ui/views/NavigationDrawer/settings.gradle b/ui/views/NavigationDrawer/settings.gradle
index feade60..9464a35 100644
--- a/ui/views/NavigationDrawer/settings.gradle
+++ b/ui/views/NavigationDrawer/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'NavigationDrawerSample'
+include 'Application'
diff --git a/ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/.gitignore b/ui/views/RevealEffect/RevealEffectBasic/Application/.gitignore
similarity index 100%
rename from ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/.gitignore
rename to ui/views/RevealEffect/RevealEffectBasic/Application/.gitignore
diff --git a/ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/proguard-project.txt b/ui/views/RevealEffect/RevealEffectBasic/Application/proguard-project.txt
similarity index 100%
rename from ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/proguard-project.txt
rename to ui/views/RevealEffect/RevealEffectBasic/Application/proguard-project.txt
diff --git a/ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/src/main/AndroidManifest.xml b/ui/views/RevealEffect/RevealEffectBasic/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/src/main/AndroidManifest.xml
rename to ui/views/RevealEffect/RevealEffectBasic/Application/src/main/AndroidManifest.xml
diff --git a/ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/src/main/java/com/example/android/revealeffectbasic/RevealEffectBasicFragment.java b/ui/views/RevealEffect/RevealEffectBasic/Application/src/main/java/com/example/android/revealeffectbasic/RevealEffectBasicFragment.java
similarity index 100%
rename from ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/src/main/java/com/example/android/revealeffectbasic/RevealEffectBasicFragment.java
rename to ui/views/RevealEffect/RevealEffectBasic/Application/src/main/java/com/example/android/revealeffectbasic/RevealEffectBasicFragment.java
diff --git a/ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/views/RevealEffect/RevealEffectBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/views/RevealEffect/RevealEffectBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/views/RevealEffect/RevealEffectBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/views/RevealEffect/RevealEffectBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/views/RevealEffect/RevealEffectBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/views/RevealEffect/RevealEffectBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/views/RevealEffect/RevealEffectBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/views/RevealEffect/RevealEffectBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/src/main/res/layout/reveal_effect_basic.xml b/ui/views/RevealEffect/RevealEffectBasic/Application/src/main/res/layout/reveal_effect_basic.xml
similarity index 100%
rename from ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/src/main/res/layout/reveal_effect_basic.xml
rename to ui/views/RevealEffect/RevealEffectBasic/Application/src/main/res/layout/reveal_effect_basic.xml
diff --git a/ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/src/main/res/values/colors.xml b/ui/views/RevealEffect/RevealEffectBasic/Application/src/main/res/values/colors.xml
similarity index 100%
rename from ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/src/main/res/values/colors.xml
rename to ui/views/RevealEffect/RevealEffectBasic/Application/src/main/res/values/colors.xml
diff --git a/ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/src/main/res/values/dimens.xml b/ui/views/RevealEffect/RevealEffectBasic/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/src/main/res/values/dimens.xml
rename to ui/views/RevealEffect/RevealEffectBasic/Application/src/main/res/values/dimens.xml
diff --git a/ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/tests/AndroidManifest.xml b/ui/views/RevealEffect/RevealEffectBasic/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/tests/AndroidManifest.xml
rename to ui/views/RevealEffect/RevealEffectBasic/Application/tests/AndroidManifest.xml
diff --git a/ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/tests/src/com/example/android/revealeffectbasic/tests/SampleTests.java b/ui/views/RevealEffect/RevealEffectBasic/Application/tests/src/com/example/android/revealeffectbasic/tests/SampleTests.java
similarity index 100%
rename from ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/tests/src/com/example/android/revealeffectbasic/tests/SampleTests.java
rename to ui/views/RevealEffect/RevealEffectBasic/Application/tests/src/com/example/android/revealeffectbasic/tests/SampleTests.java
diff --git a/ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/README-fragmentview.txt b/ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/README-fragmentview.txt
deleted file mode 100644
index 38d903f..0000000
--- a/ui/views/RevealEffect/RevealEffectBasic/RevealEffectBasicSample/README-fragmentview.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
- Copyright 2013 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.
--->
-
-Steps to implement FragmentView template:
--in template-params.xml.ftl:
- -add the following line to common imports
- <common src="activities"/>
-
--Add a Fragment to show behavior. In your MainActivity.java class, it will reference a Fragment
- called (yourProjectName)Fragment.java. Create that file in your project, using the "main" source
- folder instead of "common" or "templates".
- For instance, if your package name is com.example.foo, create the file
- src/main/java/com/example/foo/FooFragment.java
-
-
--Within this fragment, make sure that the onCreate method has the line
- "setHasOptionsMenu(true);", to enable the fragment to handle menu events.
-
--In order to override menu events, override onOptionsItemSelected.
-
--refer to sampleSamples/fragmentViewSample for a reference implementation of a
-project built on this template.
-
-
diff --git a/ui/views/RevealEffect/RevealEffectBasic/settings.gradle b/ui/views/RevealEffect/RevealEffectBasic/settings.gradle
index a52c8f3..9464a35 100644
--- a/ui/views/RevealEffect/RevealEffectBasic/settings.gradle
+++ b/ui/views/RevealEffect/RevealEffectBasic/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'RevealEffectBasicSample'
+include 'Application'
