DO NOT MERGE: Prebuilts for Sept 2014 samples release
Change-Id: I010b8a9c14f0acc992113c4d3bc244221a2d478e
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/build.gradle b/prebuilts/gradle/ActionBarCompat-Basic/Application/build.gradle
similarity index 96%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/build.gradle
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/build.gradle
index ce2cfb8..a33b185 100644
--- a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/build.gradle
+++ b/prebuilts/gradle/ActionBarCompat-Basic/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/AndroidManifest.xml b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/java/com/example/android/actionbarcompat/basic/MainActivity.java b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/java/com/example/android/actionbarcompat/basic/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/java/com/example/android/actionbarcompat/basic/MainActivity.java
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/java/com/example/android/actionbarcompat/basic/MainActivity.java
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/ic_action_location.png b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/ic_action_location.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/ic_action_location.png
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/ic_action_location.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/ic_action_refresh.png b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/ic_action_refresh.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/ic_action_refresh.png
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/ic_action_refresh.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/ic_action_settings.png b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/ic_action_settings.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/ic_action_settings.png
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/ic_action_settings.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-mdpi/ic_action_location.png b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-mdpi/ic_action_location.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-mdpi/ic_action_location.png
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-mdpi/ic_action_location.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-mdpi/ic_action_refresh.png b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-mdpi/ic_action_refresh.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-mdpi/ic_action_refresh.png
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-mdpi/ic_action_refresh.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-mdpi/ic_action_settings.png b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-mdpi/ic_action_settings.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-mdpi/ic_action_settings.png
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-mdpi/ic_action_settings.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xhdpi/ic_action_location.png b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-xhdpi/ic_action_location.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xhdpi/ic_action_location.png
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-xhdpi/ic_action_location.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xhdpi/ic_action_refresh.png b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-xhdpi/ic_action_refresh.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xhdpi/ic_action_refresh.png
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-xhdpi/ic_action_refresh.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xhdpi/ic_action_settings.png b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-xhdpi/ic_action_settings.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xhdpi/ic_action_settings.png
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-xhdpi/ic_action_settings.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/layout/sample_main.xml b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/layout/sample_main.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/menu/main.xml b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values/ids.xml b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values/ids.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values/ids.xml
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values/ids.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values/strings.xml b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/tests/AndroidManifest.xml b/prebuilts/gradle/ActionBarCompat-Basic/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java b/prebuilts/gradle/ActionBarCompat-Basic/Application/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java
rename to prebuilts/gradle/ActionBarCompat-Basic/Application/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/settings.gradle b/prebuilts/gradle/ActionBarCompat-Basic/settings.gradle
index 21d2b41..9464a35 100644
--- a/prebuilts/gradle/ActionBarCompat-Basic/settings.gradle
+++ b/prebuilts/gradle/ActionBarCompat-Basic/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'ActionBarCompat-BasicSample'
+include 'Application'
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/build.gradle b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/build.gradle
similarity index 96%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/build.gradle
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/build.gradle
index 8634476..adaa6eb 100644
--- a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/build.gradle
+++ b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/AndroidManifest.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/java/com/example/android/actionbarcompat/listpopupmenu/Cheeses.java b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/Cheeses.java
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/java/com/example/android/actionbarcompat/listpopupmenu/Cheeses.java
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/Cheeses.java
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/java/com/example/android/actionbarcompat/listpopupmenu/MainActivity.java b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/java/com/example/android/actionbarcompat/listpopupmenu/MainActivity.java
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/MainActivity.java
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/java/com/example/android/actionbarcompat/listpopupmenu/PopupListFragment.java b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/PopupListFragment.java
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/java/com/example/android/actionbarcompat/listpopupmenu/PopupListFragment.java
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/PopupListFragment.java
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-hdpi/ic_overflow.png b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-hdpi/ic_overflow.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-hdpi/ic_overflow.png
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-hdpi/ic_overflow.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-mdpi/ic_overflow.png b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-mdpi/ic_overflow.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-mdpi/ic_overflow.png
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-mdpi/ic_overflow.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-xhdpi/ic_overflow.png b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-xhdpi/ic_overflow.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-xhdpi/ic_overflow.png
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-xhdpi/ic_overflow.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/layout/list_item.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/layout/list_item.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/layout/list_item.xml
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/layout/list_item.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/layout/sample_main.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/layout/sample_main.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/menu/popup.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/menu/popup.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/menu/popup.xml
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/menu/popup.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values/strings.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/tests/AndroidManifest.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/tests/src/com/example/android/actionbarcompat/listpopupmenu/tests/SampleTests.java b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/tests/src/com/example/android/actionbarcompat/listpopupmenu/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/tests/src/com/example/android/actionbarcompat/listpopupmenu/tests/SampleTests.java
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/tests/src/com/example/android/actionbarcompat/listpopupmenu/tests/SampleTests.java
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/settings.gradle b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/settings.gradle
index 2b794b6..9464a35 100644
--- a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/settings.gradle
+++ b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'ActionBarCompat-ListPopupMenuSample'
+include 'Application'
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/build.gradle b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/build.gradle
deleted file mode 100644
index ce2cfb8..0000000
--- a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/build.gradle
+++ /dev/null
@@ -1,63 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 7
- compile "com.android.support:support-v4:20.+"
- compile "com.android.support:gridlayout-v7:20.+"
-
-
- compile "com.android.support:appcompat-v7:18.0.+"
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-hdpi/tile.9.png
deleted file mode 100644
index 1358628..0000000
--- a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-hdpi/tile.9.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values-sw600dp/template-dimens.xml
deleted file mode 100644
index 22074a2..0000000
--- a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values-sw600dp/template-dimens.xml
+++ /dev/null
@@ -1,24 +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.
- -->
-
-<resources>
-
- <!-- Semantic definitions -->
-
- <dimen name="horizontal_page_margin">@dimen/margin_huge</dimen>
- <dimen name="vertical_page_margin">@dimen/margin_medium</dimen>
-
-</resources>
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values-sw600dp/template-styles.xml
deleted file mode 100644
index 03d1974..0000000
--- a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values-sw600dp/template-styles.xml
+++ /dev/null
@@ -1,25 +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.
- -->
-
-<resources>
-
- <style name="Widget.SampleMessage">
- <item name="android:textAppearance">?android:textAppearanceLarge</item>
- <item name="android:lineSpacingMultiplier">1.2</item>
- <item name="android:shadowDy">-6.5</item>
- </style>
-
-</resources>
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/build.gradle b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/build.gradle
similarity index 96%
copy from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/build.gradle
copy to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/build.gradle
index ce2cfb8..a33b185 100644
--- a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/build.gradle
+++ b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/AndroidManifest.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/assets/photo_1.jpg b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/assets/photo_1.jpg
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/assets/photo_1.jpg
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/assets/photo_1.jpg
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/assets/photo_2.jpg b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/assets/photo_2.jpg
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/assets/photo_2.jpg
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/assets/photo_2.jpg
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/assets/photo_3.jpg b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/assets/photo_3.jpg
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/assets/photo_3.jpg
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/assets/photo_3.jpg
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/java/com/example/android/actionbarcompat/shareactionprovider/MainActivity.java b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/java/com/example/android/actionbarcompat/shareactionprovider/MainActivity.java
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/MainActivity.java
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/AssetProvider.java b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/AssetProvider.java
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/AssetProvider.java
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/AssetProvider.java
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/ContentItem.java b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/ContentItem.java
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/ContentItem.java
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/ContentItem.java
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
copy from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/tile.9.png
copy to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/layout/item_image.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/item_image.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/layout/item_image.xml
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/item_image.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/layout/item_text.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/item_text.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/layout/item_text.xml
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/item_text.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/layout/sample_main.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/sample_main.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/menu/main_menu.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/menu/main_menu.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/menu/main_menu.xml
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/menu/main_menu.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
copy from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values-sw600dp/template-dimens.xml
copy to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
copy from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values-sw600dp/template-styles.xml
copy to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values/strings.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/tests/AndroidManifest.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/settings.gradle b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/settings.gradle
index 343656d..9464a35 100644
--- a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/settings.gradle
+++ b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'ActionBarCompat-ShareActionProviderSample'
+include 'Application'
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/build.gradle b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/build.gradle
deleted file mode 100644
index ce2cfb8..0000000
--- a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/build.gradle
+++ /dev/null
@@ -1,63 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 7
- compile "com.android.support:support-v4:20.+"
- compile "com.android.support:gridlayout-v7:20.+"
-
-
- compile "com.android.support:appcompat-v7:18.0.+"
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/build.gradle b/prebuilts/gradle/ActionBarCompat-Styled/Application/build.gradle
similarity index 96%
copy from prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/build.gradle
copy to prebuilts/gradle/ActionBarCompat-Styled/Application/build.gradle
index ce2cfb8..a33b185 100644
--- a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/build.gradle
+++ b/prebuilts/gradle/ActionBarCompat-Styled/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/AndroidManifest.xml b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/java/com/example/android/actionbarcompat/styled/MainActivity.java b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/java/com/example/android/actionbarcompat/styled/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/java/com/example/android/actionbarcompat/styled/MainActivity.java
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/java/com/example/android/actionbarcompat/styled/MainActivity.java
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ab_bottom_solid_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ab_bottom_solid_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ab_bottom_solid_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ab_bottom_solid_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ab_solid_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ab_solid_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ab_solid_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ab_solid_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ab_stacked_solid_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ab_stacked_solid_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ab_stacked_solid_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ab_stacked_solid_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ic_action_location.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ic_action_location.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ic_action_location.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ic_action_location.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ic_action_refresh.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ic_action_refresh.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ic_action_refresh.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ic_action_refresh.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ic_action_settings.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ic_action_settings.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ic_action_settings.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ic_action_settings.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/list_focused_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/list_focused_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/list_focused_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/list_focused_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/menu_dropdown_panel_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/menu_dropdown_panel_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/menu_dropdown_panel_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/menu_dropdown_panel_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/progress_bg_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/progress_bg_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/progress_bg_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/progress_bg_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/progress_primary_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/progress_primary_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/progress_primary_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/progress_primary_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/progress_secondary_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/progress_secondary_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/progress_secondary_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/progress_secondary_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/spinner_ab_default_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/spinner_ab_default_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/spinner_ab_default_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/spinner_ab_default_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/spinner_ab_disabled_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/spinner_ab_disabled_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/spinner_ab_disabled_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/spinner_ab_disabled_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/spinner_ab_focused_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/spinner_ab_focused_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/spinner_ab_focused_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/spinner_ab_focused_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/spinner_ab_pressed_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/spinner_ab_pressed_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/spinner_ab_pressed_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/spinner_ab_pressed_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_selected_focused_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_selected_focused_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_selected_focused_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_selected_focused_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_selected_pressed_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_selected_pressed_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_selected_pressed_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_selected_pressed_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_selected_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_selected_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_selected_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_selected_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_unselected_focused_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_unselected_focused_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_unselected_focused_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_unselected_focused_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_unselected_pressed_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_unselected_pressed_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_unselected_pressed_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_unselected_pressed_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ab_bottom_solid_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ab_bottom_solid_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ab_bottom_solid_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ab_bottom_solid_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ab_solid_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ab_solid_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ab_solid_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ab_solid_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ab_stacked_solid_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ab_stacked_solid_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ab_stacked_solid_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ab_stacked_solid_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ic_action_location.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ic_action_location.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ic_action_location.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ic_action_location.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ic_action_refresh.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ic_action_refresh.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ic_action_refresh.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ic_action_refresh.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ic_action_settings.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ic_action_settings.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ic_action_settings.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ic_action_settings.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/list_focused_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/list_focused_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/list_focused_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/list_focused_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/menu_dropdown_panel_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/menu_dropdown_panel_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/menu_dropdown_panel_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/menu_dropdown_panel_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/progress_bg_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/progress_bg_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/progress_bg_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/progress_bg_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/progress_primary_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/progress_primary_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/progress_primary_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/progress_primary_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/progress_secondary_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/progress_secondary_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/progress_secondary_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/progress_secondary_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/spinner_ab_default_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/spinner_ab_default_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/spinner_ab_default_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/spinner_ab_default_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/spinner_ab_disabled_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/spinner_ab_disabled_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/spinner_ab_disabled_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/spinner_ab_disabled_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/spinner_ab_focused_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/spinner_ab_focused_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/spinner_ab_focused_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/spinner_ab_focused_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/spinner_ab_pressed_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/spinner_ab_pressed_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/spinner_ab_pressed_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/spinner_ab_pressed_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_selected_focused_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_selected_focused_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_selected_focused_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_selected_focused_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_selected_pressed_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_selected_pressed_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_selected_pressed_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_selected_pressed_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_selected_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_selected_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_selected_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_selected_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_unselected_focused_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_unselected_focused_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_unselected_focused_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_unselected_focused_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_unselected_pressed_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_unselected_pressed_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_unselected_pressed_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_unselected_pressed_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ab_bottom_solid_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ab_bottom_solid_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ab_bottom_solid_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ab_bottom_solid_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ab_solid_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ab_solid_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ab_solid_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ab_solid_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ab_stacked_solid_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ab_stacked_solid_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ab_stacked_solid_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ab_stacked_solid_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ic_action_location.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ic_action_location.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ic_action_location.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ic_action_location.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ic_action_refresh.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ic_action_refresh.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ic_action_refresh.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ic_action_refresh.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ic_action_settings.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ic_action_settings.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ic_action_settings.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ic_action_settings.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/list_focused_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/list_focused_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/list_focused_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/list_focused_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/menu_dropdown_panel_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/menu_dropdown_panel_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/menu_dropdown_panel_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/menu_dropdown_panel_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/progress_bg_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/progress_bg_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/progress_bg_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/progress_bg_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/progress_primary_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/progress_primary_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/progress_primary_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/progress_primary_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/progress_secondary_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/progress_secondary_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/progress_secondary_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/progress_secondary_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/spinner_ab_default_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/spinner_ab_default_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/spinner_ab_default_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/spinner_ab_default_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/spinner_ab_disabled_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/spinner_ab_disabled_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/spinner_ab_disabled_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/spinner_ab_disabled_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/spinner_ab_focused_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/spinner_ab_focused_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/spinner_ab_focused_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/spinner_ab_focused_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/spinner_ab_pressed_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/spinner_ab_pressed_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/spinner_ab_pressed_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/spinner_ab_pressed_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_selected_focused_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_selected_focused_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_selected_focused_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_selected_focused_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_selected_pressed_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_selected_pressed_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_selected_pressed_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_selected_pressed_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_selected_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_selected_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_selected_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_selected_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_unselected_focused_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_unselected_focused_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_unselected_focused_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_unselected_focused_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_unselected_pressed_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_unselected_pressed_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_unselected_pressed_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_unselected_pressed_styled.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/pressed_background.xml b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable/pressed_background.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/pressed_background.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable/pressed_background.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/progress_horizontal.xml b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable/progress_horizontal.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/progress_horizontal.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable/progress_horizontal.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/selectable_background.xml b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable/selectable_background.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/selectable_background.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable/selectable_background.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/spinner_background_ab.xml b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable/spinner_background_ab.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/spinner_background_ab.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable/spinner_background_ab.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/tab_indicator_ab.xml b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable/tab_indicator_ab.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/tab_indicator_ab.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable/tab_indicator_ab.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/layout/sample_main.xml b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/layout/sample_main.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/menu/main.xml b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values-v14/styles.xml b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values-v14/styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values-v14/styles.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values-v14/styles.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/colors.xml b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values/colors.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/colors.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values/colors.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/strings.xml b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/styles.xml b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/styles.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values/styles.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/tests/AndroidManifest.xml b/prebuilts/gradle/ActionBarCompat-Styled/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/tests/src/com/example/android/actionbarcompat/styled/tests/SampleTests.java b/prebuilts/gradle/ActionBarCompat-Styled/Application/tests/src/com/example/android/actionbarcompat/styled/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/tests/src/com/example/android/actionbarcompat/styled/tests/SampleTests.java
rename to prebuilts/gradle/ActionBarCompat-Styled/Application/tests/src/com/example/android/actionbarcompat/styled/tests/SampleTests.java
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/settings.gradle b/prebuilts/gradle/ActionBarCompat-Styled/settings.gradle
index eb7d66b..9464a35 100644
--- a/prebuilts/gradle/ActionBarCompat-Styled/settings.gradle
+++ b/prebuilts/gradle/ActionBarCompat-Styled/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'ActionBarCompat-StyledSample'
+include 'Application'
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle b/prebuilts/gradle/ActivityInstrumentation/Application/build.gradle
similarity index 95%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
rename to prebuilts/gradle/ActivityInstrumentation/Application/build.gradle
index 299b515..ef913c3 100644
--- a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
+++ b/prebuilts/gradle/ActivityInstrumentation/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/AndroidManifest.xml b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/ActivityInstrumentation/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/activityinstrumentation/MainActivity.java b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/activityinstrumentation/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/activityinstrumentation/MainActivity.java
rename to prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/activityinstrumentation/MainActivity.java
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/layout/sample_main.xml b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/layout/sample_main.xml
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values-sw720dp-land/dimens.xml b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values-sw720dp-land/dimens.xml
rename to prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values-sw720dp-land/dimens.xml
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values/dimens.xml b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values/dimens.xml
rename to prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values/dimens.xml
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values/strings.xml b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/tests/AndroidManifest.xml b/prebuilts/gradle/ActivityInstrumentation/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/ActivityInstrumentation/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/tests/src/com/example/android/activityinstrumentation/SampleTests.java b/prebuilts/gradle/ActivityInstrumentation/Application/tests/src/com/example/android/activityinstrumentation/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/tests/src/com/example/android/activityinstrumentation/SampleTests.java
rename to prebuilts/gradle/ActivityInstrumentation/Application/tests/src/com/example/android/activityinstrumentation/SampleTests.java
diff --git a/prebuilts/gradle/ActivityInstrumentation/settings.gradle b/prebuilts/gradle/ActivityInstrumentation/settings.gradle
index 0f010ba..9464a35 100644
--- a/prebuilts/gradle/ActivityInstrumentation/settings.gradle
+++ b/prebuilts/gradle/ActivityInstrumentation/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'ActivityInstrumentationSample'
+include 'Application'
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle b/prebuilts/gradle/AdapterTransition/Application/build.gradle
similarity index 95%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle
rename to prebuilts/gradle/AdapterTransition/Application/build.gradle
index 6150c29..a6b62fa 100644
--- a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle
+++ b/prebuilts/gradle/AdapterTransition/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/AndroidManifest.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/AdapterTransition/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/adaptertransition/AdapterTransitionFragment.java b/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/AdapterTransitionFragment.java
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/adaptertransition/AdapterTransitionFragment.java
rename to prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/AdapterTransitionFragment.java
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/adaptertransition/MainActivity.java b/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/MainActivity.java
similarity index 91%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/adaptertransition/MainActivity.java
rename to prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/MainActivity.java
index cfe52e1..0adb842 100644
--- a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/adaptertransition/MainActivity.java
+++ b/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/MainActivity.java
@@ -47,10 +47,12 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
- FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
- AdapterTransitionFragment fragment = new AdapterTransitionFragment();
- transaction.replace(R.id.sample_content_fragment, fragment);
- transaction.commit();
+ if (savedInstanceState == null) {
+ FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+ AdapterTransitionFragment fragment = new AdapterTransitionFragment();
+ transaction.replace(R.id.sample_content_fragment, fragment);
+ transaction.commit();
+ }
}
@Override
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/adaptertransition/Meat.java b/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/Meat.java
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/adaptertransition/Meat.java
rename to prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/Meat.java
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/adaptertransition/MeatAdapter.java b/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/MeatAdapter.java
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/adaptertransition/MeatAdapter.java
rename to prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/MeatAdapter.java
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java b/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java
rename to prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java b/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java
rename to prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-hdpi/ic_action_grid.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_action_grid.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-hdpi/ic_action_grid.png
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_action_grid.png
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-hdpi/ic_action_list.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_action_list.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-hdpi/ic_action_list.png
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_action_list.png
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-mdpi/ic_action_grid.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_action_grid.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-mdpi/ic_action_grid.png
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_action_grid.png
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-mdpi/ic_action_list.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_action_list.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-mdpi/ic_action_list.png
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_action_list.png
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p1.jpg b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p1.jpg
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p1.jpg
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p1.jpg
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p10.jpg b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p10.jpg
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p10.jpg
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p10.jpg
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p11.jpg b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p11.jpg
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p11.jpg
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p11.jpg
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p2.jpg b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p2.jpg
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p2.jpg
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p2.jpg
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p3.jpg b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p3.jpg
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p3.jpg
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p3.jpg
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p4.jpg b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p4.jpg
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p4.jpg
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p4.jpg
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p5.jpg b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p5.jpg
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p5.jpg
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p5.jpg
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p6.jpg b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p6.jpg
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p6.jpg
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p6.jpg
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p7.jpg b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p7.jpg
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p7.jpg
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p7.jpg
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p8.jpg b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p8.jpg
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p8.jpg
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p8.jpg
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p9.jpg b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p9.jpg
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p9.jpg
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p9.jpg
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xhdpi/ic_action_grid.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_action_grid.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xhdpi/ic_action_grid.png
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_action_grid.png
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xhdpi/ic_action_list.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_action_list.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xhdpi/ic_action_list.png
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_action_list.png
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xxhdpi/ic_action_grid.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_action_grid.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xxhdpi/ic_action_grid.png
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_action_grid.png
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xxhdpi/ic_action_list.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_action_list.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xxhdpi/ic_action_list.png
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_action_list.png
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/layout-w720dp/activity_main.xml
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout/fragment_adapter_transition.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/fragment_adapter_transition.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout/fragment_adapter_transition.xml
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/fragment_adapter_transition.xml
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout/fragment_meat_grid.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/fragment_meat_grid.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout/fragment_meat_grid.xml
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/fragment_meat_grid.xml
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout/fragment_meat_list.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/fragment_meat_list.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout/fragment_meat_list.xml
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/fragment_meat_list.xml
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout/item_meat_grid.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/item_meat_grid.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout/item_meat_grid.xml
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/item_meat_grid.xml
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout/item_meat_list.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/item_meat_list.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout/item_meat_list.xml
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/item_meat_list.xml
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/menu/fragment_adapter_transition.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/menu/fragment_adapter_transition.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/menu/fragment_adapter_transition.xml
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/menu/fragment_adapter_transition.xml
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/menu/main.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/values/fragmentview_strings.xml
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/strings.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/AdapterTransition/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/AdapterTransition/settings.gradle b/prebuilts/gradle/AdapterTransition/settings.gradle
index 3284a23..9464a35 100644
--- a/prebuilts/gradle/AdapterTransition/settings.gradle
+++ b/prebuilts/gradle/AdapterTransition/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'AdapterTransitionSample'
+include 'Application'
diff --git a/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/build.gradle b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/build.gradle
index 299b515..ef913c3 100644
--- a/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/build.gradle
+++ b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/advancedimmersivemode/MainActivity.java b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/advancedimmersivemode/MainActivity.java
index b229868..4fc40af 100644
--- a/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/advancedimmersivemode/MainActivity.java
+++ b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/advancedimmersivemode/MainActivity.java
@@ -47,10 +47,12 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
- FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
- AdvancedImmersiveModeFragment fragment = new AdvancedImmersiveModeFragment();
- transaction.replace(R.id.sample_content_fragment, fragment);
- transaction.commit();
+ if (savedInstanceState == null) {
+ FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+ AdvancedImmersiveModeFragment fragment = new AdvancedImmersiveModeFragment();
+ transaction.replace(R.id.sample_content_fragment, fragment);
+ transaction.commit();
+ }
}
@Override
diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/README-fragmentview.txt b/prebuilts/gradle/AdvancedImmersiveMode/Application/README-fragmentview.txt
new file mode 100644
index 0000000..38d903f
--- /dev/null
+++ b/prebuilts/gradle/AdvancedImmersiveMode/Application/README-fragmentview.txt
@@ -0,0 +1,37 @@
+<!--
+ 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/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/AndroidManifest.xml b/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/advancedimmersivemode/AdvancedImmersiveModeFragment.java b/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/java/com/example/android/advancedimmersivemode/AdvancedImmersiveModeFragment.java
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/advancedimmersivemode/AdvancedImmersiveModeFragment.java
rename to prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/java/com/example/android/advancedimmersivemode/AdvancedImmersiveModeFragment.java
diff --git a/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/layout/fragment_flags.xml b/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/layout/fragment_flags.xml
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/layout/fragment_flags.xml
rename to prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/layout/fragment_flags.xml
diff --git a/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/tests/AndroidManifest.xml b/prebuilts/gradle/AdvancedImmersiveMode/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/AdvancedImmersiveMode/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/tests/src/com/example/android/advancedimmersivemode/tests/SampleTests.java b/prebuilts/gradle/AdvancedImmersiveMode/Application/tests/src/com/example/android/advancedimmersivemode/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/tests/src/com/example/android/advancedimmersivemode/tests/SampleTests.java
rename to prebuilts/gradle/AdvancedImmersiveMode/Application/tests/src/com/example/android/advancedimmersivemode/tests/SampleTests.java
diff --git a/prebuilts/gradle/AdvancedImmersiveMode/settings.gradle b/prebuilts/gradle/AdvancedImmersiveMode/settings.gradle
index 0f7ed4b..9464a35 100644
--- a/prebuilts/gradle/AdvancedImmersiveMode/settings.gradle
+++ b/prebuilts/gradle/AdvancedImmersiveMode/settings.gradle
@@ -1 +1 @@
-include 'AdvancedImmersiveModeSample'
+include 'Application'
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/build.gradle b/prebuilts/gradle/AppRestrictions/Application/build.gradle
similarity index 95%
rename from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/build.gradle
rename to prebuilts/gradle/AppRestrictions/Application/build.gradle
index f69eb2d..bab0cfd 100644
--- a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/build.gradle
+++ b/prebuilts/gradle/AppRestrictions/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/AndroidManifest.xml b/prebuilts/gradle/AppRestrictions/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/AppRestrictions/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/java/com/example/android/apprestrictions/CustomRestrictionsActivity.java b/prebuilts/gradle/AppRestrictions/Application/src/main/java/com/example/android/apprestrictions/CustomRestrictionsActivity.java
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/java/com/example/android/apprestrictions/CustomRestrictionsActivity.java
rename to prebuilts/gradle/AppRestrictions/Application/src/main/java/com/example/android/apprestrictions/CustomRestrictionsActivity.java
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/java/com/example/android/apprestrictions/CustomRestrictionsFragment.java b/prebuilts/gradle/AppRestrictions/Application/src/main/java/com/example/android/apprestrictions/CustomRestrictionsFragment.java
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/java/com/example/android/apprestrictions/CustomRestrictionsFragment.java
rename to prebuilts/gradle/AppRestrictions/Application/src/main/java/com/example/android/apprestrictions/CustomRestrictionsFragment.java
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/java/com/example/android/apprestrictions/GetRestrictionsReceiver.java b/prebuilts/gradle/AppRestrictions/Application/src/main/java/com/example/android/apprestrictions/GetRestrictionsReceiver.java
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/java/com/example/android/apprestrictions/GetRestrictionsReceiver.java
rename to prebuilts/gradle/AppRestrictions/Application/src/main/java/com/example/android/apprestrictions/GetRestrictionsReceiver.java
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/java/com/example/android/apprestrictions/MainActivity.java b/prebuilts/gradle/AppRestrictions/Application/src/main/java/com/example/android/apprestrictions/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/java/com/example/android/apprestrictions/MainActivity.java
rename to prebuilts/gradle/AppRestrictions/Application/src/main/java/com/example/android/apprestrictions/MainActivity.java
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/AppRestrictions/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/AppRestrictions/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/AppRestrictions/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/AppRestrictions/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/AppRestrictions/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/AppRestrictions/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/AppRestrictions/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/AppRestrictions/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/AppRestrictions/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/AppRestrictions/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/AppRestrictions/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/AppRestrictions/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/layout/main.xml b/prebuilts/gradle/AppRestrictions/Application/src/main/res/layout/main.xml
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/layout/main.xml
rename to prebuilts/gradle/AppRestrictions/Application/src/main/res/layout/main.xml
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/AppRestrictions/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/AppRestrictions/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/AppRestrictions/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/AppRestrictions/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/AppRestrictions/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/AppRestrictions/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/AppRestrictions/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/AppRestrictions/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values/strings.xml b/prebuilts/gradle/AppRestrictions/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/AppRestrictions/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/AppRestrictions/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/AppRestrictions/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/AppRestrictions/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/AppRestrictions/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/xml/custom_prefs.xml b/prebuilts/gradle/AppRestrictions/Application/src/main/res/xml/custom_prefs.xml
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/xml/custom_prefs.xml
rename to prebuilts/gradle/AppRestrictions/Application/src/main/res/xml/custom_prefs.xml
diff --git a/prebuilts/gradle/AppRestrictions/settings.gradle b/prebuilts/gradle/AppRestrictions/settings.gradle
index 02aef49..9464a35 100644
--- a/prebuilts/gradle/AppRestrictions/settings.gradle
+++ b/prebuilts/gradle/AppRestrictions/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'AppRestrictionsSample'
+include 'Application'
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/build.gradle b/prebuilts/gradle/BasicAccessibility/Application/build.gradle
similarity index 96%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/build.gradle
rename to prebuilts/gradle/BasicAccessibility/Application/build.gradle
index d371a8c..0ad0136 100644
--- a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/build.gradle
+++ b/prebuilts/gradle/BasicAccessibility/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicAccessibility/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/basicaccessibility/DialView.java b/prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/basicaccessibility/DialView.java
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/basicaccessibility/DialView.java
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/basicaccessibility/DialView.java
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/basicaccessibility/MainActivity.java b/prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/basicaccessibility/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/basicaccessibility/MainActivity.java
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/basicaccessibility/MainActivity.java
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/ic_action_discard.png b/prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-hdpi/ic_action_discard.png
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/ic_action_discard.png
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-hdpi/ic_action_discard.png
Binary files differ
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/ic_action_info.png b/prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-hdpi/ic_action_info.png
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/ic_action_info.png
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-hdpi/ic_action_info.png
Binary files differ
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/partly_cloudy.png b/prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-hdpi/partly_cloudy.png
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/partly_cloudy.png
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-hdpi/partly_cloudy.png
Binary files differ
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-mdpi/ic_action_discard.png b/prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-mdpi/ic_action_discard.png
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-mdpi/ic_action_discard.png
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-mdpi/ic_action_discard.png
Binary files differ
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-mdpi/ic_action_info.png b/prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-mdpi/ic_action_info.png
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-mdpi/ic_action_info.png
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-mdpi/ic_action_info.png
Binary files differ
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-xhdpi/ic_action_discard.png b/prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-xhdpi/ic_action_discard.png
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-xhdpi/ic_action_discard.png
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-xhdpi/ic_action_discard.png
Binary files differ
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-xhdpi/ic_action_info.png b/prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-xhdpi/ic_action_info.png
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-xhdpi/ic_action_info.png
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-xhdpi/ic_action_info.png
Binary files differ
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicAccessibility/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/layout/sample_main.xml b/prebuilts/gradle/BasicAccessibility/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/res/layout/sample_main.xml
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicAccessibility/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicAccessibility/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values-sw720dp-land/dimens.xml b/prebuilts/gradle/BasicAccessibility/Application/src/main/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values-sw720dp-land/dimens.xml
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/res/values-sw720dp-land/dimens.xml
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicAccessibility/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicAccessibility/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values/dimens.xml b/prebuilts/gradle/BasicAccessibility/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values/dimens.xml
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/res/values/dimens.xml
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values/strings.xml b/prebuilts/gradle/BasicAccessibility/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicAccessibility/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicAccessibility/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicAccessibility/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/tests/AndroidManifest.xml b/prebuilts/gradle/BasicAccessibility/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/tests/AndroidManifest.xml
rename to prebuilts/gradle/BasicAccessibility/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/tests/src/com/example/android/basicaccessibility/tests/SampleTests.java b/prebuilts/gradle/BasicAccessibility/Application/tests/src/com/example/android/basicaccessibility/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/tests/src/com/example/android/basicaccessibility/tests/SampleTests.java
rename to prebuilts/gradle/BasicAccessibility/Application/tests/src/com/example/android/basicaccessibility/tests/SampleTests.java
diff --git a/prebuilts/gradle/BasicAccessibility/settings.gradle b/prebuilts/gradle/BasicAccessibility/settings.gradle
index 7900b3d..9464a35 100644
--- a/prebuilts/gradle/BasicAccessibility/settings.gradle
+++ b/prebuilts/gradle/BasicAccessibility/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicAccessibilitySample'
+include 'Application'
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/build.gradle b/prebuilts/gradle/BasicAndroidKeyStore/Application/build.gradle
similarity index 95%
copy from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/build.gradle
copy to prebuilts/gradle/BasicAndroidKeyStore/Application/build.gradle
index f69eb2d..bab0cfd 100644
--- a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/build.gradle
+++ b/prebuilts/gradle/BasicAndroidKeyStore/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/basicandroidkeystore/BasicAndroidKeyStoreFragment.java b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/basicandroidkeystore/BasicAndroidKeyStoreFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/basicandroidkeystore/BasicAndroidKeyStoreFragment.java
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/basicandroidkeystore/BasicAndroidKeyStoreFragment.java
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/basicandroidkeystore/MainActivity.java b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/basicandroidkeystore/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/basicandroidkeystore/MainActivity.java
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/basicandroidkeystore/MainActivity.java
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/basicandroidkeystore/SecurityConstants.java b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/basicandroidkeystore/SecurityConstants.java
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/basicandroidkeystore/SecurityConstants.java
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/basicandroidkeystore/SecurityConstants.java
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/layout-sw600dp-land/activity_main.xml b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/layout-sw600dp-land/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/layout-sw600dp-land/activity_main.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/layout-sw600dp-land/activity_main.xml
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/layout-sw600dp/activity_main.xml b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/layout-sw600dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/layout-sw600dp/activity_main.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/layout-sw600dp/activity_main.xml
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/menu/main.xml b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values/strings.xml b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/tests/AndroidManifest.xml b/prebuilts/gradle/BasicAndroidKeyStore/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/tests/src/com/example/android/basicandroidkeystore/tests/SampleTests.java b/prebuilts/gradle/BasicAndroidKeyStore/Application/tests/src/com/example/android/basicandroidkeystore/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/tests/src/com/example/android/basicandroidkeystore/tests/SampleTests.java
rename to prebuilts/gradle/BasicAndroidKeyStore/Application/tests/src/com/example/android/basicandroidkeystore/tests/SampleTests.java
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/build.gradle b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/build.gradle
deleted file mode 100644
index f69eb2d..0000000
--- a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 18
- compile "com.android.support:support-v13:20.+"
-
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/settings.gradle b/prebuilts/gradle/BasicAndroidKeyStore/settings.gradle
index e4b36fe..9464a35 100644
--- a/prebuilts/gradle/BasicAndroidKeyStore/settings.gradle
+++ b/prebuilts/gradle/BasicAndroidKeyStore/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicAndroidKeyStoreSample'
+include 'Application'
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/build.gradle b/prebuilts/gradle/BasicContactables/Application/build.gradle
similarity index 95%
copy from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/build.gradle
copy to prebuilts/gradle/BasicContactables/Application/build.gradle
index f69eb2d..bab0cfd 100644
--- a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/build.gradle
+++ b/prebuilts/gradle/BasicContactables/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicContactables/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BasicContactables/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/basiccontactables/ContactablesLoaderCallbacks.java b/prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/basiccontactables/ContactablesLoaderCallbacks.java
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/basiccontactables/ContactablesLoaderCallbacks.java
rename to prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/basiccontactables/ContactablesLoaderCallbacks.java
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/basiccontactables/MainActivity.java b/prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/basiccontactables/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/basiccontactables/MainActivity.java
rename to prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/basiccontactables/MainActivity.java
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-hdpi/ic_search_api_holo_light.png b/prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-hdpi/ic_search_api_holo_light.png
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-hdpi/ic_search_api_holo_light.png
rename to prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-hdpi/ic_search_api_holo_light.png
Binary files differ
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-mdpi/ic_search_api_holo_light.png b/prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-mdpi/ic_search_api_holo_light.png
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-mdpi/ic_search_api_holo_light.png
rename to prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-mdpi/ic_search_api_holo_light.png
Binary files differ
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-xhdpi/ic_search_api_holo_light.png b/prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-xhdpi/ic_search_api_holo_light.png
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-xhdpi/ic_search_api_holo_light.png
rename to prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-xhdpi/ic_search_api_holo_light.png
Binary files differ
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicContactables/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicContactables/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/layout/sample_main.xml b/prebuilts/gradle/BasicContactables/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/BasicContactables/Application/src/main/res/layout/sample_main.xml
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/menu/main.xml b/prebuilts/gradle/BasicContactables/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/BasicContactables/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicContactables/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicContactables/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicContactables/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicContactables/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicContactables/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicContactables/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicContactables/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicContactables/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values/strings.xml b/prebuilts/gradle/BasicContactables/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicContactables/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values/styles.xml b/prebuilts/gradle/BasicContactables/Application/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values/styles.xml
rename to prebuilts/gradle/BasicContactables/Application/src/main/res/values/styles.xml
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicContactables/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicContactables/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicContactables/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicContactables/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/xml/searchable.xml b/prebuilts/gradle/BasicContactables/Application/src/main/res/xml/searchable.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/xml/searchable.xml
rename to prebuilts/gradle/BasicContactables/Application/src/main/res/xml/searchable.xml
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/tests/AndroidManifest.xml b/prebuilts/gradle/BasicContactables/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/BasicContactables/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/tests/src/com/example/android/basiccontactables/tests/SampleTests.java b/prebuilts/gradle/BasicContactables/Application/tests/src/com/example/android/basiccontactables/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/BasicContactables/BasicContactablesSample/tests/src/com/example/android/basiccontactables/tests/SampleTests.java
rename to prebuilts/gradle/BasicContactables/Application/tests/src/com/example/android/basiccontactables/tests/SampleTests.java
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/build.gradle b/prebuilts/gradle/BasicContactables/BasicContactablesSample/build.gradle
deleted file mode 100644
index f69eb2d..0000000
--- a/prebuilts/gradle/BasicContactables/BasicContactablesSample/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 18
- compile "com.android.support:support-v13:20.+"
-
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/BasicContactables/settings.gradle b/prebuilts/gradle/BasicContactables/settings.gradle
index 5fec49c..9464a35 100644
--- a/prebuilts/gradle/BasicContactables/settings.gradle
+++ b/prebuilts/gradle/BasicContactables/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicContactablesSample'
+include 'Application'
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/build.gradle b/prebuilts/gradle/BasicGestureDetect/Application/build.gradle
similarity index 95%
copy from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/build.gradle
copy to prebuilts/gradle/BasicGestureDetect/Application/build.gradle
index f69eb2d..bab0cfd 100644
--- a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/build.gradle
+++ b/prebuilts/gradle/BasicGestureDetect/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicGestureDetect/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/basicgesturedetect/BasicGestureDetectFragment.java b/prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/basicgesturedetect/BasicGestureDetectFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/basicgesturedetect/BasicGestureDetectFragment.java
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/basicgesturedetect/BasicGestureDetectFragment.java
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/basicgesturedetect/GestureListener.java b/prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/basicgesturedetect/GestureListener.java
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/basicgesturedetect/GestureListener.java
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/basicgesturedetect/GestureListener.java
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/basicgesturedetect/MainActivity.java b/prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/basicgesturedetect/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/basicgesturedetect/MainActivity.java
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/basicgesturedetect/MainActivity.java
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/layout-sw600dp-land/activity_main.xml b/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/layout-sw600dp-land/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/layout-sw600dp-land/activity_main.xml
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/res/layout-sw600dp-land/activity_main.xml
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/layout-sw600dp/activity_main.xml b/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/layout-sw600dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/layout-sw600dp/activity_main.xml
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/res/layout-sw600dp/activity_main.xml
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/menu/main.xml b/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values/strings.xml b/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/tests/AndroidManifest.xml b/prebuilts/gradle/BasicGestureDetect/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/BasicGestureDetect/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/tests/src/com/example/android/basicgesturedetect/tests/SampleTests.java b/prebuilts/gradle/BasicGestureDetect/Application/tests/src/com/example/android/basicgesturedetect/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/tests/src/com/example/android/basicgesturedetect/tests/SampleTests.java
rename to prebuilts/gradle/BasicGestureDetect/Application/tests/src/com/example/android/basicgesturedetect/tests/SampleTests.java
diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/build.gradle b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/build.gradle
deleted file mode 100644
index f69eb2d..0000000
--- a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 18
- compile "com.android.support:support-v13:20.+"
-
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/BasicGestureDetect/settings.gradle b/prebuilts/gradle/BasicGestureDetect/settings.gradle
index ba7e8c0..9464a35 100644
--- a/prebuilts/gradle/BasicGestureDetect/settings.gradle
+++ b/prebuilts/gradle/BasicGestureDetect/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicGestureDetectSample'
+include 'Application'
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle b/prebuilts/gradle/BasicImmersiveMode/Application/build.gradle
similarity index 95%
copy from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle
copy to prebuilts/gradle/BasicImmersiveMode/Application/build.gradle
index 6150c29..a6b62fa 100644
--- a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle
+++ b/prebuilts/gradle/BasicImmersiveMode/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/basicimmersivemode/BasicImmersiveModeFragment.java b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/basicimmersivemode/BasicImmersiveModeFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/basicimmersivemode/BasicImmersiveModeFragment.java
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/basicimmersivemode/BasicImmersiveModeFragment.java
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/basicimmersivemode/MainActivity.java b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/basicimmersivemode/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/basicimmersivemode/MainActivity.java
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/basicimmersivemode/MainActivity.java
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/layout-sw600dp-land/activity_main.xml b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/layout-sw600dp-land/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/layout-sw600dp-land/activity_main.xml
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/layout-sw600dp-land/activity_main.xml
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/layout-sw600dp/activity_main.xml b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/layout-sw600dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/layout-sw600dp/activity_main.xml
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/layout-sw600dp/activity_main.xml
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/menu/main.xml b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values/strings.xml b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/tests/AndroidManifest.xml b/prebuilts/gradle/BasicImmersiveMode/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/BasicImmersiveMode/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/tests/src/com/example/android/basicimmersivemode/tests/SampleTests.java b/prebuilts/gradle/BasicImmersiveMode/Application/tests/src/com/example/android/basicimmersivemode/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/tests/src/com/example/android/basicimmersivemode/tests/SampleTests.java
rename to prebuilts/gradle/BasicImmersiveMode/Application/tests/src/com/example/android/basicimmersivemode/tests/SampleTests.java
diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/build.gradle b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/build.gradle
deleted file mode 100644
index 6150c29..0000000
--- a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 19
- compile "com.android.support:support-v13:20.+"
-
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/BasicImmersiveMode/settings.gradle b/prebuilts/gradle/BasicImmersiveMode/settings.gradle
index 8dda383..9464a35 100644
--- a/prebuilts/gradle/BasicImmersiveMode/settings.gradle
+++ b/prebuilts/gradle/BasicImmersiveMode/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicImmersiveModeSample'
+include 'Application'
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/build.gradle b/prebuilts/gradle/BasicMediaDecoder/Application/build.gradle
similarity index 95%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/build.gradle
rename to prebuilts/gradle/BasicMediaDecoder/Application/build.gradle
index fa8a5b2..f773006 100644
--- a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/build.gradle
+++ b/prebuilts/gradle/BasicMediaDecoder/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/java/com/example/android/basicmediadecoder/MainActivity.java b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/java/com/example/android/basicmediadecoder/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/java/com/example/android/basicmediadecoder/MainActivity.java
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/java/com/example/android/basicmediadecoder/MainActivity.java
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/java/com/example/android/common/media/CameraHelper.java b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/java/com/example/android/common/media/CameraHelper.java
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/java/com/example/android/common/media/CameraHelper.java
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/java/com/example/android/common/media/CameraHelper.java
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/java/com/example/android/common/media/MediaCodecWrapper.java b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/java/com/example/android/common/media/MediaCodecWrapper.java
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/java/com/example/android/common/media/MediaCodecWrapper.java
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/java/com/example/android/common/media/MediaCodecWrapper.java
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-hdpi/ic_action_play.png b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-hdpi/ic_action_play.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-hdpi/ic_action_play.png
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-hdpi/ic_action_play.png
Binary files differ
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-hdpi/ic_action_play_disabled.png b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-hdpi/ic_action_play_disabled.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-hdpi/ic_action_play_disabled.png
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-hdpi/ic_action_play_disabled.png
Binary files differ
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-mdpi/ic_action_play.png b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-mdpi/ic_action_play.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-mdpi/ic_action_play.png
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-mdpi/ic_action_play.png
Binary files differ
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-mdpi/ic_action_play_disabled.png b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-mdpi/ic_action_play_disabled.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-mdpi/ic_action_play_disabled.png
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-mdpi/ic_action_play_disabled.png
Binary files differ
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-xhdpi/ic_action_play.png b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-xhdpi/ic_action_play.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-xhdpi/ic_action_play.png
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-xhdpi/ic_action_play.png
Binary files differ
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-xhdpi/ic_action_play_disabled.png b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-xhdpi/ic_action_play_disabled.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-xhdpi/ic_action_play_disabled.png
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-xhdpi/ic_action_play_disabled.png
Binary files differ
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable/selector_play.xml b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable/selector_play.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable/selector_play.xml
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable/selector_play.xml
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/layout/sample_main.xml b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/layout/sample_main.xml
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/menu/action_menu.xml b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/menu/action_menu.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/menu/action_menu.xml
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/menu/action_menu.xml
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/raw/vid_bigbuckbunny.mp4 b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/raw/vid_bigbuckbunny.mp4
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/raw/vid_bigbuckbunny.mp4
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/raw/vid_bigbuckbunny.mp4
Binary files differ
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values/strings.xml b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/BasicMediaDecoder/settings.gradle b/prebuilts/gradle/BasicMediaDecoder/settings.gradle
index 1e76e09..9464a35 100644
--- a/prebuilts/gradle/BasicMediaDecoder/settings.gradle
+++ b/prebuilts/gradle/BasicMediaDecoder/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicMediaDecoderSample'
+include 'Application'
diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/build.gradle b/prebuilts/gradle/BasicMediaRouter/Application/build.gradle
similarity index 95%
copy from prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/build.gradle
copy to prebuilts/gradle/BasicMediaRouter/Application/build.gradle
index fa8a5b2..f773006 100644
--- a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/build.gradle
+++ b/prebuilts/gradle/BasicMediaRouter/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicMediaRouter/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/basicmediarouter/MainActivity.java b/prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/basicmediarouter/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/basicmediarouter/MainActivity.java
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/basicmediarouter/MainActivity.java
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/basicmediarouter/SamplePresentation.java b/prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/basicmediarouter/SamplePresentation.java
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/basicmediarouter/SamplePresentation.java
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/basicmediarouter/SamplePresentation.java
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/layout/display.xml b/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/layout/display.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/layout/display.xml
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/res/layout/display.xml
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/layout/sample_main.xml b/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/res/layout/sample_main.xml
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/menu/main.xml b/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/colors.xml b/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values/colors.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/colors.xml
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values/colors.xml
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/strings.xml b/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/styles.xml b/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/styles.xml
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values/styles.xml
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/tests/AndroidManifest.xml b/prebuilts/gradle/BasicMediaRouter/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/BasicMediaRouter/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/tests/src/com/example/android/basicmediarouter/tests/SampleTests.java b/prebuilts/gradle/BasicMediaRouter/Application/tests/src/com/example/android/basicmediarouter/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/tests/src/com/example/android/basicmediarouter/tests/SampleTests.java
rename to prebuilts/gradle/BasicMediaRouter/Application/tests/src/com/example/android/basicmediarouter/tests/SampleTests.java
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/build.gradle b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/build.gradle
deleted file mode 100644
index fa8a5b2..0000000
--- a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 17
- compile "com.android.support:support-v13:20.+"
-
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/BasicMediaRouter/settings.gradle b/prebuilts/gradle/BasicMediaRouter/settings.gradle
index 9d5cbc2..9464a35 100644
--- a/prebuilts/gradle/BasicMediaRouter/settings.gradle
+++ b/prebuilts/gradle/BasicMediaRouter/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicMediaRouterSample'
+include 'Application'
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/build.gradle b/prebuilts/gradle/BasicMultitouch/Application/build.gradle
similarity index 96%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/build.gradle
rename to prebuilts/gradle/BasicMultitouch/Application/build.gradle
index 181b1a2..c36485e 100644
--- a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/build.gradle
+++ b/prebuilts/gradle/BasicMultitouch/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicMultitouch/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/basicmultitouch/MainActivity.java b/prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/basicmultitouch/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/basicmultitouch/MainActivity.java
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/basicmultitouch/MainActivity.java
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/basicmultitouch/Pools.java b/prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/basicmultitouch/Pools.java
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/basicmultitouch/Pools.java
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/basicmultitouch/Pools.java
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/basicmultitouch/TouchDisplayView.java b/prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/basicmultitouch/TouchDisplayView.java
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/basicmultitouch/TouchDisplayView.java
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/basicmultitouch/TouchDisplayView.java
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicMultitouch/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicMultitouch/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicMultitouch/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicMultitouch/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicMultitouch/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicMultitouch/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/layout/layout_mainactivity.xml b/prebuilts/gradle/BasicMultitouch/Application/src/main/res/layout/layout_mainactivity.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/layout/layout_mainactivity.xml
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/res/layout/layout_mainactivity.xml
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicMultitouch/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicMultitouch/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values-v11/styles.xml b/prebuilts/gradle/BasicMultitouch/Application/src/main/res/values-v11/styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values-v11/styles.xml
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/res/values-v11/styles.xml
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicMultitouch/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values-v14/styles.xml b/prebuilts/gradle/BasicMultitouch/Application/src/main/res/values-v14/styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values-v14/styles.xml
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/res/values-v14/styles.xml
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicMultitouch/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values/strings.xml b/prebuilts/gradle/BasicMultitouch/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values/styles.xml b/prebuilts/gradle/BasicMultitouch/Application/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values/styles.xml
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/res/values/styles.xml
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicMultitouch/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicMultitouch/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicMultitouch/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/BasicMultitouch/settings.gradle b/prebuilts/gradle/BasicMultitouch/settings.gradle
index 6e6c5ba..9464a35 100644
--- a/prebuilts/gradle/BasicMultitouch/settings.gradle
+++ b/prebuilts/gradle/BasicMultitouch/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicMultitouchSample'
+include 'Application'
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle b/prebuilts/gradle/BasicNetworking/Application/build.gradle
similarity index 95%
copy from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
copy to prebuilts/gradle/BasicNetworking/Application/build.gradle
index 299b515..ef913c3 100644
--- a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
+++ b/prebuilts/gradle/BasicNetworking/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicNetworking/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BasicNetworking/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/basicnetworking/MainActivity.java b/prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/basicnetworking/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/basicnetworking/MainActivity.java
rename to prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/basicnetworking/MainActivity.java
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/basicnetworking/SimpleTextFragment.java b/prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/basicnetworking/SimpleTextFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/basicnetworking/SimpleTextFragment.java
rename to prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/basicnetworking/SimpleTextFragment.java
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicNetworking/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicNetworking/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicNetworking/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicNetworking/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicNetworking/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicNetworking/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicNetworking/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicNetworking/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicNetworking/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicNetworking/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicNetworking/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicNetworking/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/layout/sample_main.xml b/prebuilts/gradle/BasicNetworking/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/BasicNetworking/Application/src/main/res/layout/sample_main.xml
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/menu/main.xml b/prebuilts/gradle/BasicNetworking/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/BasicNetworking/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicNetworking/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicNetworking/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicNetworking/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicNetworking/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicNetworking/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicNetworking/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicNetworking/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicNetworking/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values/strings.xml b/prebuilts/gradle/BasicNetworking/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicNetworking/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values/styles.xml b/prebuilts/gradle/BasicNetworking/Application/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values/styles.xml
rename to prebuilts/gradle/BasicNetworking/Application/src/main/res/values/styles.xml
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicNetworking/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicNetworking/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicNetworking/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicNetworking/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/tests/AndroidManifest.xml b/prebuilts/gradle/BasicNetworking/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/BasicNetworking/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/tests/src/com/example/android/basicnetworking/tests/SampleTests.java b/prebuilts/gradle/BasicNetworking/Application/tests/src/com/example/android/basicnetworking/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/BasicNetworkingSample/tests/src/com/example/android/basicnetworking/tests/SampleTests.java
rename to prebuilts/gradle/BasicNetworking/Application/tests/src/com/example/android/basicnetworking/tests/SampleTests.java
diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/build.gradle b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/build.gradle
deleted file mode 100644
index 299b515..0000000
--- a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 4
- compile "com.android.support:support-v4:20.+"
-
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/BasicNetworking/settings.gradle b/prebuilts/gradle/BasicNetworking/settings.gradle
index 453e7cd..9464a35 100644
--- a/prebuilts/gradle/BasicNetworking/settings.gradle
+++ b/prebuilts/gradle/BasicNetworking/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicNetworkingSample'
+include 'Application'
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/build.gradle b/prebuilts/gradle/BasicNotifications/Application/build.gradle
similarity index 96%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/build.gradle
rename to prebuilts/gradle/BasicNotifications/Application/build.gradle
index 181b1a2..c36485e 100644
--- a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/build.gradle
+++ b/prebuilts/gradle/BasicNotifications/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicNotifications/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BasicNotifications/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/java/com/example/android/basicnotifications/MainActivity.java b/prebuilts/gradle/BasicNotifications/Application/src/main/java/com/example/android/basicnotifications/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/java/com/example/android/basicnotifications/MainActivity.java
rename to prebuilts/gradle/BasicNotifications/Application/src/main/java/com/example/android/basicnotifications/MainActivity.java
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi-v11/ic_stat_notification.png b/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-hdpi-v11/ic_stat_notification.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi-v11/ic_stat_notification.png
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-hdpi-v11/ic_stat_notification.png
Binary files differ
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi-v9/ic_stat_notification.png b/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-hdpi-v9/ic_stat_notification.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi-v9/ic_stat_notification.png
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-hdpi-v9/ic_stat_notification.png
Binary files differ
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi/ic_stat_notification.png b/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-hdpi/ic_stat_notification.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi/ic_stat_notification.png
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-hdpi/ic_stat_notification.png
Binary files differ
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-ldpi-v11/ic_stat_notification.png b/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-ldpi-v11/ic_stat_notification.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-ldpi-v11/ic_stat_notification.png
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-ldpi-v11/ic_stat_notification.png
Binary files differ
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-ldpi-v9/ic_stat_notification.png b/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-ldpi-v9/ic_stat_notification.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-ldpi-v9/ic_stat_notification.png
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-ldpi-v9/ic_stat_notification.png
Binary files differ
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-mdpi-v11/ic_stat_notification.png b/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-mdpi-v11/ic_stat_notification.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-mdpi-v11/ic_stat_notification.png
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-mdpi-v11/ic_stat_notification.png
Binary files differ
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-mdpi-v9/ic_stat_notification.png b/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-mdpi-v9/ic_stat_notification.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-mdpi-v9/ic_stat_notification.png
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-mdpi-v9/ic_stat_notification.png
Binary files differ
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-mdpi/ic_stat_notification.png b/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-mdpi/ic_stat_notification.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-mdpi/ic_stat_notification.png
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-mdpi/ic_stat_notification.png
Binary files differ
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xhdpi-v11/ic_stat_notification.png b/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-xhdpi-v11/ic_stat_notification.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xhdpi-v11/ic_stat_notification.png
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-xhdpi-v11/ic_stat_notification.png
Binary files differ
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xhdpi-v9/ic_stat_notification.png b/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-xhdpi-v9/ic_stat_notification.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xhdpi-v9/ic_stat_notification.png
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-xhdpi-v9/ic_stat_notification.png
Binary files differ
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xhdpi/ic_stat_notification.png b/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-xhdpi/ic_stat_notification.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xhdpi/ic_stat_notification.png
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-xhdpi/ic_stat_notification.png
Binary files differ
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicNotifications/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/layout/sample_layout.xml b/prebuilts/gradle/BasicNotifications/Application/src/main/res/layout/sample_layout.xml
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/layout/sample_layout.xml
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/layout/sample_layout.xml
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicNotifications/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicNotifications/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicNotifications/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicNotifications/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values/strings.xml b/prebuilts/gradle/BasicNotifications/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicNotifications/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicNotifications/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicNotifications/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/tests/AndroidManifest.xml b/prebuilts/gradle/BasicNotifications/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/BasicNotifications/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/tests/src/com/example/android/basicnotifications/tests/SampleTests.java b/prebuilts/gradle/BasicNotifications/Application/tests/src/com/example/android/basicnotifications/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/BasicNotificationsSample/tests/src/com/example/android/basicnotifications/tests/SampleTests.java
rename to prebuilts/gradle/BasicNotifications/Application/tests/src/com/example/android/basicnotifications/tests/SampleTests.java
diff --git a/prebuilts/gradle/BasicNotifications/settings.gradle b/prebuilts/gradle/BasicNotifications/settings.gradle
index b33d67f..9464a35 100644
--- a/prebuilts/gradle/BasicNotifications/settings.gradle
+++ b/prebuilts/gradle/BasicNotifications/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicNotificationsSample'
+include 'Application'
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/AndroidManifest.xml b/prebuilts/gradle/BasicRenderScript/Application/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/AndroidManifest.xml
rename to prebuilts/gradle/BasicRenderScript/Application/AndroidManifest.xml
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/build.gradle b/prebuilts/gradle/BasicRenderScript/Application/build.gradle
similarity index 96%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/build.gradle
rename to prebuilts/gradle/BasicRenderScript/Application/build.gradle
index a4e8534..49c9f9f 100644
--- a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/build.gradle
+++ b/prebuilts/gradle/BasicRenderScript/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/project.properties b/prebuilts/gradle/BasicRenderScript/Application/project.properties
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/project.properties
rename to prebuilts/gradle/BasicRenderScript/Application/project.properties
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicRenderScript/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BasicRenderScript/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/java/com/example/android/basicrenderscript/MainActivity.java b/prebuilts/gradle/BasicRenderScript/Application/src/main/java/com/example/android/basicrenderscript/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/java/com/example/android/basicrenderscript/MainActivity.java
rename to prebuilts/gradle/BasicRenderScript/Application/src/main/java/com/example/android/basicrenderscript/MainActivity.java
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/java/com/example/android/common/media/CameraHelper.java b/prebuilts/gradle/BasicRenderScript/Application/src/main/java/com/example/android/common/media/CameraHelper.java
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/java/com/example/android/common/media/CameraHelper.java
rename to prebuilts/gradle/BasicRenderScript/Application/src/main/java/com/example/android/common/media/CameraHelper.java
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/java/com/example/android/common/media/MediaCodecWrapper.java b/prebuilts/gradle/BasicRenderScript/Application/src/main/java/com/example/android/common/media/MediaCodecWrapper.java
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/java/com/example/android/common/media/MediaCodecWrapper.java
rename to prebuilts/gradle/BasicRenderScript/Application/src/main/java/com/example/android/common/media/MediaCodecWrapper.java
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicRenderScript/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicRenderScript/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicRenderScript/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicRenderScript/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicRenderScript/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicRenderScript/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-nodpi/data.jpg b/prebuilts/gradle/BasicRenderScript/Application/src/main/res/drawable-nodpi/data.jpg
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-nodpi/data.jpg
rename to prebuilts/gradle/BasicRenderScript/Application/src/main/res/drawable-nodpi/data.jpg
Binary files differ
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicRenderScript/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicRenderScript/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicRenderScript/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicRenderScript/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicRenderScript/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicRenderScript/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/layout/main_layout.xml b/prebuilts/gradle/BasicRenderScript/Application/src/main/res/layout/main_layout.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/layout/main_layout.xml
rename to prebuilts/gradle/BasicRenderScript/Application/src/main/res/layout/main_layout.xml
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicRenderScript/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicRenderScript/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values-v11/styles.xml b/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values-v11/styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values-v11/styles.xml
rename to prebuilts/gradle/BasicRenderScript/Application/src/main/res/values-v11/styles.xml
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicRenderScript/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values-v14/styles.xml b/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values-v14/styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values-v14/styles.xml
rename to prebuilts/gradle/BasicRenderScript/Application/src/main/res/values-v14/styles.xml
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/attrs.xml b/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/attrs.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/attrs.xml
rename to prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/attrs.xml
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/colors.xml b/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/colors.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/colors.xml
rename to prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/colors.xml
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/styles.xml b/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/styles.xml
rename to prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/styles.xml
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/rs/saturation.rs b/prebuilts/gradle/BasicRenderScript/Application/src/main/rs/saturation.rs
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/rs/saturation.rs
rename to prebuilts/gradle/BasicRenderScript/Application/src/main/rs/saturation.rs
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/tests/AndroidManifest.xml b/prebuilts/gradle/BasicRenderScript/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/BasicRenderScript/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/tests/src/com/example/android/basicrenderscript/tests/SampleTests.java b/prebuilts/gradle/BasicRenderScript/Application/tests/src/com/example/android/basicrenderscript/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/tests/src/com/example/android/basicrenderscript/tests/SampleTests.java
rename to prebuilts/gradle/BasicRenderScript/Application/tests/src/com/example/android/basicrenderscript/tests/SampleTests.java
diff --git a/prebuilts/gradle/BasicRenderScript/settings.gradle b/prebuilts/gradle/BasicRenderScript/settings.gradle
index cb17006..9464a35 100644
--- a/prebuilts/gradle/BasicRenderScript/settings.gradle
+++ b/prebuilts/gradle/BasicRenderScript/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicRenderScriptSample'
+include 'Application'
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/build.gradle b/prebuilts/gradle/BasicSyncAdapter/Application/build.gradle
similarity index 96%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/build.gradle
rename to prebuilts/gradle/BasicSyncAdapter/Application/build.gradle
index 095d740..e194097 100644
--- a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/build.gradle
+++ b/prebuilts/gradle/BasicSyncAdapter/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/EntryListActivity.java b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/EntryListActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/EntryListActivity.java
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/EntryListActivity.java
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/EntryListFragment.java b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/EntryListFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/EntryListFragment.java
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/EntryListFragment.java
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/SyncAdapter.java b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/SyncAdapter.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/SyncAdapter.java
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/SyncAdapter.java
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/SyncService.java b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/SyncService.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/SyncService.java
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/SyncService.java
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/SyncUtils.java b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/SyncUtils.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/SyncUtils.java
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/SyncUtils.java
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/net/FeedParser.java b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/net/FeedParser.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/net/FeedParser.java
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/net/FeedParser.java
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/provider/FeedContract.java b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/provider/FeedContract.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/provider/FeedContract.java
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/provider/FeedContract.java
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/provider/FeedProvider.java b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/provider/FeedProvider.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/provider/FeedProvider.java
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/provider/FeedProvider.java
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/accounts/GenericAccountService.java b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/accounts/GenericAccountService.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/accounts/GenericAccountService.java
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/accounts/GenericAccountService.java
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/db/SelectionBuilder.java b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/db/SelectionBuilder.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/db/SelectionBuilder.java
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/db/SelectionBuilder.java
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-xhdpi/ic_action_refresh.png b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/drawable-xhdpi/ic_action_refresh.png
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-xhdpi/ic_action_refresh.png
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/drawable-xhdpi/ic_action_refresh.png
Binary files differ
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/layout/actionbar_indeterminate_progress.xml b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/layout/actionbar_indeterminate_progress.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/layout/actionbar_indeterminate_progress.xml
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/layout/actionbar_indeterminate_progress.xml
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/layout/activity_entry_list.xml b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/layout/activity_entry_list.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/layout/activity_entry_list.xml
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/layout/activity_entry_list.xml
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/menu/main.xml b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/attrs.xml b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values/attrs.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/attrs.xml
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values/attrs.xml
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/dimen.xml b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values/dimen.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/dimen.xml
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values/dimen.xml
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/strings.xml b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/xml/authenticator.xml b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/xml/authenticator.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/xml/authenticator.xml
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/xml/authenticator.xml
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/xml/syncadapter.xml b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/xml/syncadapter.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/xml/syncadapter.xml
rename to prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/xml/syncadapter.xml
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/tests/AndroidManifest.xml b/prebuilts/gradle/BasicSyncAdapter/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/BasicSyncAdapter/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/tests/src/com/example/android/basicsyncadapter/tests/SampleTests.java b/prebuilts/gradle/BasicSyncAdapter/Application/tests/src/com/example/android/basicsyncadapter/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/tests/src/com/example/android/basicsyncadapter/tests/SampleTests.java
rename to prebuilts/gradle/BasicSyncAdapter/Application/tests/src/com/example/android/basicsyncadapter/tests/SampleTests.java
diff --git a/prebuilts/gradle/BasicSyncAdapter/settings.gradle b/prebuilts/gradle/BasicSyncAdapter/settings.gradle
index a691e9e..9464a35 100644
--- a/prebuilts/gradle/BasicSyncAdapter/settings.gradle
+++ b/prebuilts/gradle/BasicSyncAdapter/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicSyncAdapterSample'
+include 'Application'
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle b/prebuilts/gradle/BasicTransition/Application/build.gradle
similarity index 95%
copy from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle
copy to prebuilts/gradle/BasicTransition/Application/build.gradle
index 6150c29..a6b62fa 100644
--- a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle
+++ b/prebuilts/gradle/BasicTransition/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicTransition/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BasicTransition/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/basictransition/BasicTransitionFragment.java b/prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/basictransition/BasicTransitionFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/basictransition/BasicTransitionFragment.java
rename to prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/basictransition/BasicTransitionFragment.java
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/basictransition/MainActivity.java b/prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/basictransition/MainActivity.java
similarity index 91%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/basictransition/MainActivity.java
rename to prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/basictransition/MainActivity.java
index 32158b7..7eeac2e 100644
--- a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/basictransition/MainActivity.java
+++ b/prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/basictransition/MainActivity.java
@@ -47,10 +47,12 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
- FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
- BasicTransitionFragment fragment = new BasicTransitionFragment();
- transaction.replace(R.id.sample_content_fragment, fragment);
- transaction.commit();
+ if (savedInstanceState == null) {
+ FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+ BasicTransitionFragment fragment = new BasicTransitionFragment();
+ transaction.replace(R.id.sample_content_fragment, fragment);
+ transaction.commit();
+ }
}
@Override
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java b/prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java
rename to prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java b/prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java
rename to prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicTransition/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/drawable/oval.xml b/prebuilts/gradle/BasicTransition/Application/src/main/res/drawable/oval.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/drawable/oval.xml
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/drawable/oval.xml
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/BasicTransition/Application/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/layout-w720dp/activity_main.xml
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout/activity_basic_transition.xml b/prebuilts/gradle/BasicTransition/Application/src/main/res/layout/activity_basic_transition.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout/activity_basic_transition.xml
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/layout/activity_basic_transition.xml
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicTransition/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout/fragment_basic_transition.xml b/prebuilts/gradle/BasicTransition/Application/src/main/res/layout/fragment_basic_transition.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout/fragment_basic_transition.xml
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/layout/fragment_basic_transition.xml
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout/scene1.xml b/prebuilts/gradle/BasicTransition/Application/src/main/res/layout/scene1.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout/scene1.xml
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/layout/scene1.xml
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout/scene2.xml b/prebuilts/gradle/BasicTransition/Application/src/main/res/layout/scene2.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout/scene2.xml
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/layout/scene2.xml
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout/scene3.xml b/prebuilts/gradle/BasicTransition/Application/src/main/res/layout/scene3.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout/scene3.xml
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/layout/scene3.xml
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/menu/main.xml b/prebuilts/gradle/BasicTransition/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/transition/changebounds_fadein_together.xml b/prebuilts/gradle/BasicTransition/Application/src/main/res/transition/changebounds_fadein_together.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/transition/changebounds_fadein_together.xml
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/transition/changebounds_fadein_together.xml
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/transition/scene3_transition_manager.xml b/prebuilts/gradle/BasicTransition/Application/src/main/res/transition/scene3_transition_manager.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/transition/scene3_transition_manager.xml
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/transition/scene3_transition_manager.xml
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicTransition/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicTransition/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicTransition/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values-w820dp/dimens.xml b/prebuilts/gradle/BasicTransition/Application/src/main/res/values-w820dp/dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values-w820dp/dimens.xml
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/values-w820dp/dimens.xml
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicTransition/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/dimens.xml b/prebuilts/gradle/BasicTransition/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/dimens.xml
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/values/dimens.xml
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/BasicTransition/Application/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/values/fragmentview_strings.xml
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/strings.xml b/prebuilts/gradle/BasicTransition/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicTransition/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicTransition/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicTransition/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/build.gradle b/prebuilts/gradle/BasicTransition/BasicTransitionSample/build.gradle
deleted file mode 100644
index 6150c29..0000000
--- a/prebuilts/gradle/BasicTransition/BasicTransitionSample/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 19
- compile "com.android.support:support-v13:20.+"
-
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/BasicTransition/settings.gradle b/prebuilts/gradle/BasicTransition/settings.gradle
index fae2688..9464a35 100644
--- a/prebuilts/gradle/BasicTransition/settings.gradle
+++ b/prebuilts/gradle/BasicTransition/settings.gradle
@@ -1 +1 @@
-include 'BasicTransitionSample'
+include 'Application'
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle b/prebuilts/gradle/BatchStepSensor/Application/build.gradle
similarity index 95%
copy from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle
copy to prebuilts/gradle/BatchStepSensor/Application/build.gradle
index 6150c29..a6b62fa 100644
--- a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle
+++ b/prebuilts/gradle/BatchStepSensor/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/AndroidManifest.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/BatchStepSensorFragment.java b/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/BatchStepSensorFragment.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/BatchStepSensorFragment.java
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/BatchStepSensorFragment.java
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/MainActivity.java b/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/MainActivity.java
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/MainActivity.java
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/Card.java b/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/Card.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/Card.java
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/Card.java
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardActionButton.java b/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardActionButton.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardActionButton.java
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardActionButton.java
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardLayout.java b/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardLayout.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardLayout.java
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardLayout.java
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardStream.java b/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardStream.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardStream.java
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardStream.java
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamAnimator.java b/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamAnimator.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamAnimator.java
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamAnimator.java
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamFragment.java b/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamFragment.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamFragment.java
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamFragment.java
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamLinearLayout.java b/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamLinearLayout.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamLinearLayout.java
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamLinearLayout.java
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamState.java b/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamState.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamState.java
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamState.java
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/DefaultCardStreamAnimator.java b/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/DefaultCardStreamAnimator.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/DefaultCardStreamAnimator.java
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/DefaultCardStreamAnimator.java
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/OnCardClickListener.java b/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/OnCardClickListener.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/OnCardClickListener.java
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/OnCardClickListener.java
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/StreamRetentionFragment.java b/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/StreamRetentionFragment.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/StreamRetentionFragment.java
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/StreamRetentionFragment.java
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-hdpi/ic_action_cancel.png b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-hdpi/ic_action_cancel.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-hdpi/ic_action_cancel.png
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-hdpi/ic_action_cancel.png
Binary files differ
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-mdpi/ic_action_cancel.png b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-mdpi/ic_action_cancel.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-mdpi/ic_action_cancel.png
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-mdpi/ic_action_cancel.png
Binary files differ
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/card_bg.9.png b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/card_bg.9.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/card_bg.9.png
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/card_bg.9.png
Binary files differ
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_cardaction_negative.png b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_cardaction_negative.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_cardaction_negative.png
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_cardaction_negative.png
Binary files differ
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_cardaction_negative_pressed.png b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_cardaction_negative_pressed.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_cardaction_negative_pressed.png
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_cardaction_negative_pressed.png
Binary files differ
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_cardaction_neutral.png b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_cardaction_neutral.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_cardaction_neutral.png
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_cardaction_neutral.png
Binary files differ
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_cardaction_neutral_pressed.png b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_cardaction_neutral_pressed.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_cardaction_neutral_pressed.png
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_cardaction_neutral_pressed.png
Binary files differ
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_cardaction_positive.png b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_cardaction_positive.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_cardaction_positive.png
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_cardaction_positive.png
Binary files differ
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_cardaction_positive_pressed.png b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_cardaction_positive_pressed.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_cardaction_positive_pressed.png
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_cardaction_positive_pressed.png
Binary files differ
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xxhdpi/ic_action_cancel.png b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xxhdpi/ic_action_cancel.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xxhdpi/ic_action_cancel.png
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xxhdpi/ic_action_cancel.png
Binary files differ
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_bg.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_bg.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_bg.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_bg.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_bg_negative.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_bg_negative.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_bg_negative.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_bg_negative.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_bg_positive.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_bg_positive.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_bg_positive.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_bg_positive.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_icon_negative.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_icon_negative.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_icon_negative.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_icon_negative.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_icon_neutral.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_icon_neutral.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_icon_neutral.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_icon_neutral.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_icon_positive.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_icon_positive.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_icon_positive.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_icon_positive.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_text.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_text.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_text.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_text.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_text_negative.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_text_negative.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_text_negative.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_text_negative.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_text_positive.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_text_positive.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_text_positive.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_text_positive.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_overlay_focused.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_overlay_focused.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_overlay_focused.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_overlay_focused.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_separator.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_separator.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_separator.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_separator.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/card.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/card.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/card.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/card.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/card_button_negative.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/card_button_negative.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/card_button_negative.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/card_button_negative.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/card_button_neutral.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/card_button_neutral.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/card_button_neutral.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/card_button_neutral.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/card_button_positive.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/card_button_positive.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/card_button_positive.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/card_button_positive.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/card_button_seperator.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/card_button_seperator.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/card_button_seperator.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/card_button_seperator.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/card_progress.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/card_progress.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/card_progress.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/card_progress.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/cardstream.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/cardstream.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/cardstream.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/cardstream.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-sw720dp-land/dimens.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-sw720dp-land/dimens.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-sw720dp-land/dimens.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-v11/styles.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-v11/styles.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-v11/styles.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-v11/styles.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-v14/styles.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-v14/styles.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-v14/styles.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-v14/styles.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-v16/styles.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-v16/styles.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-v16/styles.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-v16/styles.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/attrs.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/attrs.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/attrs.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/attrs.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/color.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/color.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/color.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/color.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/dimens.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/dimens.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/dimens.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/ids.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/ids.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/ids.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/ids.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/strings.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/styles.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/styles.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/styles.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/build.gradle b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/build.gradle
deleted file mode 100644
index 6150c29..0000000
--- a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 19
- compile "com.android.support:support-v13:20.+"
-
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/BatchStepSensor/settings.gradle b/prebuilts/gradle/BatchStepSensor/settings.gradle
index 18ebefc..9464a35 100644
--- a/prebuilts/gradle/BatchStepSensor/settings.gradle
+++ b/prebuilts/gradle/BatchStepSensor/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BatchStepSensorSample'
+include 'Application'
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/build.gradle b/prebuilts/gradle/BluetoothLeGatt/Application/build.gradle
similarity index 95%
copy from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/build.gradle
copy to prebuilts/gradle/BluetoothLeGatt/Application/build.gradle
index f69eb2d..bab0cfd 100644
--- a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/build.gradle
+++ b/prebuilts/gradle/BluetoothLeGatt/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/AndroidManifest.xml b/prebuilts/gradle/BluetoothLeGatt/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BluetoothLeGatt/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/java/com/example/android/bluetoothlegatt/BluetoothLeService.java b/prebuilts/gradle/BluetoothLeGatt/Application/src/main/java/com/example/android/bluetoothlegatt/BluetoothLeService.java
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/java/com/example/android/bluetoothlegatt/BluetoothLeService.java
rename to prebuilts/gradle/BluetoothLeGatt/Application/src/main/java/com/example/android/bluetoothlegatt/BluetoothLeService.java
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/java/com/example/android/bluetoothlegatt/DeviceControlActivity.java b/prebuilts/gradle/BluetoothLeGatt/Application/src/main/java/com/example/android/bluetoothlegatt/DeviceControlActivity.java
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/java/com/example/android/bluetoothlegatt/DeviceControlActivity.java
rename to prebuilts/gradle/BluetoothLeGatt/Application/src/main/java/com/example/android/bluetoothlegatt/DeviceControlActivity.java
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/java/com/example/android/bluetoothlegatt/DeviceScanActivity.java b/prebuilts/gradle/BluetoothLeGatt/Application/src/main/java/com/example/android/bluetoothlegatt/DeviceScanActivity.java
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/java/com/example/android/bluetoothlegatt/DeviceScanActivity.java
rename to prebuilts/gradle/BluetoothLeGatt/Application/src/main/java/com/example/android/bluetoothlegatt/DeviceScanActivity.java
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/java/com/example/android/bluetoothlegatt/SampleGattAttributes.java b/prebuilts/gradle/BluetoothLeGatt/Application/src/main/java/com/example/android/bluetoothlegatt/SampleGattAttributes.java
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/java/com/example/android/bluetoothlegatt/SampleGattAttributes.java
rename to prebuilts/gradle/BluetoothLeGatt/Application/src/main/java/com/example/android/bluetoothlegatt/SampleGattAttributes.java
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/layout/actionbar_indeterminate_progress.xml b/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/layout/actionbar_indeterminate_progress.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/layout/actionbar_indeterminate_progress.xml
rename to prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/layout/actionbar_indeterminate_progress.xml
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/layout/gatt_services_characteristics.xml b/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/layout/gatt_services_characteristics.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/layout/gatt_services_characteristics.xml
rename to prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/layout/gatt_services_characteristics.xml
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/layout/listitem_device.xml b/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/layout/listitem_device.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/layout/listitem_device.xml
rename to prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/layout/listitem_device.xml
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/menu/gatt_services.xml b/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/menu/gatt_services.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/menu/gatt_services.xml
rename to prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/menu/gatt_services.xml
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/menu/main.xml b/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values/strings.xml b/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/build.gradle b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/build.gradle
deleted file mode 100644
index f69eb2d..0000000
--- a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 18
- compile "com.android.support:support-v13:20.+"
-
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/BluetoothLeGatt/settings.gradle b/prebuilts/gradle/BluetoothLeGatt/settings.gradle
index 05cae43..9464a35 100644
--- a/prebuilts/gradle/BluetoothLeGatt/settings.gradle
+++ b/prebuilts/gradle/BluetoothLeGatt/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BluetoothLeGattSample'
+include 'Application'
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/build.gradle b/prebuilts/gradle/BorderlessButtons/Application/build.gradle
similarity index 95%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/build.gradle
rename to prebuilts/gradle/BorderlessButtons/Application/build.gradle
index bcc2350..6442a01 100644
--- a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/build.gradle
+++ b/prebuilts/gradle/BorderlessButtons/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/AndroidManifest.xml b/prebuilts/gradle/BorderlessButtons/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/borderlessbuttons/MainActivity.java b/prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/borderlessbuttons/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/borderlessbuttons/MainActivity.java
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/borderlessbuttons/MainActivity.java
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-hdpi/ic_action_delete.png b/prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-hdpi/ic_action_delete.png
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-hdpi/ic_action_delete.png
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-hdpi/ic_action_delete.png
Binary files differ
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-mdpi/ic_action_delete.png b/prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-mdpi/ic_action_delete.png
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-mdpi/ic_action_delete.png
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-mdpi/ic_action_delete.png
Binary files differ
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-xhdpi/ic_action_delete.png b/prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-xhdpi/ic_action_delete.png
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-xhdpi/ic_action_delete.png
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-xhdpi/ic_action_delete.png
Binary files differ
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BorderlessButtons/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/layout/list_item.xml b/prebuilts/gradle/BorderlessButtons/Application/src/main/res/layout/list_item.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/layout/list_item.xml
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/res/layout/list_item.xml
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/layout/sample_main.xml b/prebuilts/gradle/BorderlessButtons/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/res/layout/sample_main.xml
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/menu/main.xml b/prebuilts/gradle/BorderlessButtons/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BorderlessButtons/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BorderlessButtons/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BorderlessButtons/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/BorderlessButtons/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/dimens.xml b/prebuilts/gradle/BorderlessButtons/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/dimens.xml
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/res/values/dimens.xml
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/strings.xml b/prebuilts/gradle/BorderlessButtons/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/styles.xml b/prebuilts/gradle/BorderlessButtons/Application/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/styles.xml
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/res/values/styles.xml
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BorderlessButtons/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/BorderlessButtons/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BorderlessButtons/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/BorderlessButtons/settings.gradle b/prebuilts/gradle/BorderlessButtons/settings.gradle
index f5220c4..9464a35 100644
--- a/prebuilts/gradle/BorderlessButtons/settings.gradle
+++ b/prebuilts/gradle/BorderlessButtons/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BorderlessButtonsSample'
+include 'Application'
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle b/prebuilts/gradle/CardEmulation/Application/build.gradle
similarity index 95%
copy from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle
copy to prebuilts/gradle/CardEmulation/Application/build.gradle
index 6150c29..a6b62fa 100644
--- a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle
+++ b/prebuilts/gradle/CardEmulation/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/AndroidManifest.xml b/prebuilts/gradle/CardEmulation/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/CardEmulation/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/cardemulation/AccountStorage.java b/prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/cardemulation/AccountStorage.java
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/cardemulation/AccountStorage.java
rename to prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/cardemulation/AccountStorage.java
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/cardemulation/CardEmulationFragment.java b/prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/cardemulation/CardEmulationFragment.java
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/cardemulation/CardEmulationFragment.java
rename to prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/cardemulation/CardEmulationFragment.java
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/cardemulation/CardService.java b/prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/cardemulation/CardService.java
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/cardemulation/CardService.java
rename to prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/cardemulation/CardService.java
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/cardemulation/MainActivity.java b/prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/cardemulation/MainActivity.java
similarity index 91%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/cardemulation/MainActivity.java
rename to prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/cardemulation/MainActivity.java
index 19abe36..af0b9f3 100644
--- a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/cardemulation/MainActivity.java
+++ b/prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/cardemulation/MainActivity.java
@@ -47,10 +47,12 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
- FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
- CardEmulationFragment fragment = new CardEmulationFragment();
- transaction.replace(R.id.sample_content_fragment, fragment);
- transaction.commit();
+ if (savedInstanceState == null) {
+ FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+ CardEmulationFragment fragment = new CardEmulationFragment();
+ transaction.replace(R.id.sample_content_fragment, fragment);
+ transaction.commit();
+ }
}
@Override
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/CardEmulation/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/CardEmulation/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/CardEmulation/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/CardEmulation/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/CardEmulation/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/CardEmulation/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/CardEmulation/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/CardEmulation/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/drawable-xxhdpi/card_background.png b/prebuilts/gradle/CardEmulation/Application/src/main/res/drawable-xxhdpi/card_background.png
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/drawable-xxhdpi/card_background.png
rename to prebuilts/gradle/CardEmulation/Application/src/main/res/drawable-xxhdpi/card_background.png
Binary files differ
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/CardEmulation/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/CardEmulation/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/CardEmulation/Application/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/CardEmulation/Application/src/main/res/layout-w720dp/activity_main.xml
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/CardEmulation/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/CardEmulation/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/layout/main_fragment.xml b/prebuilts/gradle/CardEmulation/Application/src/main/res/layout/main_fragment.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/layout/main_fragment.xml
rename to prebuilts/gradle/CardEmulation/Application/src/main/res/layout/main_fragment.xml
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/menu/main.xml b/prebuilts/gradle/CardEmulation/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/CardEmulation/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/CardEmulation/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/CardEmulation/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/CardEmulation/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/CardEmulation/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/CardEmulation/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/CardEmulation/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/CardEmulation/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/CardEmulation/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/CardEmulation/Application/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/CardEmulation/Application/src/main/res/values/fragmentview_strings.xml
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/strings.xml b/prebuilts/gradle/CardEmulation/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/CardEmulation/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/CardEmulation/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/CardEmulation/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/CardEmulation/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/CardEmulation/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/xml/aid_list.xml b/prebuilts/gradle/CardEmulation/Application/src/main/res/xml/aid_list.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/xml/aid_list.xml
rename to prebuilts/gradle/CardEmulation/Application/src/main/res/xml/aid_list.xml
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/tests/AndroidManifest.xml b/prebuilts/gradle/CardEmulation/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/CardEmulation/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/tests/src/com/example/android/cardemulation/tests/SampleTests.java b/prebuilts/gradle/CardEmulation/Application/tests/src/com/example/android/cardemulation/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/CardEmulation/CardEmulationSample/tests/src/com/example/android/cardemulation/tests/SampleTests.java
rename to prebuilts/gradle/CardEmulation/Application/tests/src/com/example/android/cardemulation/tests/SampleTests.java
diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/build.gradle b/prebuilts/gradle/CardEmulation/CardEmulationSample/build.gradle
deleted file mode 100644
index 6150c29..0000000
--- a/prebuilts/gradle/CardEmulation/CardEmulationSample/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 19
- compile "com.android.support:support-v13:20.+"
-
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/CardEmulation/settings.gradle b/prebuilts/gradle/CardEmulation/settings.gradle
index 32b4942..9464a35 100644
--- a/prebuilts/gradle/CardEmulation/settings.gradle
+++ b/prebuilts/gradle/CardEmulation/settings.gradle
@@ -1 +1 @@
-include 'CardEmulationSample'
+include 'Application'
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle b/prebuilts/gradle/CardReader/Application/build.gradle
similarity index 95%
copy from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle
copy to prebuilts/gradle/CardReader/Application/build.gradle
index 6150c29..a6b62fa 100644
--- a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle
+++ b/prebuilts/gradle/CardReader/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/AndroidManifest.xml b/prebuilts/gradle/CardReader/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/CardReader/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/cardreader/CardReaderFragment.java b/prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/cardreader/CardReaderFragment.java
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/cardreader/CardReaderFragment.java
rename to prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/cardreader/CardReaderFragment.java
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/cardreader/LoyaltyCardReader.java b/prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/cardreader/LoyaltyCardReader.java
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/cardreader/LoyaltyCardReader.java
rename to prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/cardreader/LoyaltyCardReader.java
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/cardreader/MainActivity.java b/prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/cardreader/MainActivity.java
similarity index 91%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/cardreader/MainActivity.java
rename to prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/cardreader/MainActivity.java
index bca1aea..ac6327d 100644
--- a/prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/cardreader/MainActivity.java
+++ b/prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/cardreader/MainActivity.java
@@ -47,10 +47,12 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
- FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
- CardReaderFragment fragment = new CardReaderFragment();
- transaction.replace(R.id.sample_content_fragment, fragment);
- transaction.commit();
+ if (savedInstanceState == null) {
+ FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+ CardReaderFragment fragment = new CardReaderFragment();
+ transaction.replace(R.id.sample_content_fragment, fragment);
+ transaction.commit();
+ }
}
@Override
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/CardReader/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/CardReader/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/CardReader/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/CardReader/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/CardReader/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/CardReader/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/CardReader/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/CardReader/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/drawable-xxhdpi/card_background.png b/prebuilts/gradle/CardReader/Application/src/main/res/drawable-xxhdpi/card_background.png
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/res/drawable-xxhdpi/card_background.png
rename to prebuilts/gradle/CardReader/Application/src/main/res/drawable-xxhdpi/card_background.png
Binary files differ
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/CardReader/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/CardReader/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/CardReader/Application/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/CardReader/Application/src/main/res/layout-w720dp/activity_main.xml
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/CardReader/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/CardReader/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/layout/main_fragment.xml b/prebuilts/gradle/CardReader/Application/src/main/res/layout/main_fragment.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/res/layout/main_fragment.xml
rename to prebuilts/gradle/CardReader/Application/src/main/res/layout/main_fragment.xml
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/menu/main.xml b/prebuilts/gradle/CardReader/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/CardReader/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/CardReader/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/CardReader/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/CardReader/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/CardReader/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/CardReader/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/CardReader/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/CardReader/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/CardReader/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/CardReader/Application/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/CardReader/Application/src/main/res/values/fragmentview_strings.xml
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/strings.xml b/prebuilts/gradle/CardReader/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/CardReader/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/CardReader/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/CardReader/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/CardReader/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/CardReader/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/xml/nfc_tech_filter.xml b/prebuilts/gradle/CardReader/Application/src/main/res/xml/nfc_tech_filter.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/src/main/res/xml/nfc_tech_filter.xml
rename to prebuilts/gradle/CardReader/Application/src/main/res/xml/nfc_tech_filter.xml
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/tests/AndroidManifest.xml b/prebuilts/gradle/CardReader/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/CardReader/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/tests/src/com/example/android/cardreader/tests/SampleTests.java b/prebuilts/gradle/CardReader/Application/tests/src/com/example/android/cardreader/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/CardReader/CardReaderSample/tests/src/com/example/android/cardreader/tests/SampleTests.java
rename to prebuilts/gradle/CardReader/Application/tests/src/com/example/android/cardreader/tests/SampleTests.java
diff --git a/prebuilts/gradle/CardReader/CardReaderSample/build.gradle b/prebuilts/gradle/CardReader/CardReaderSample/build.gradle
deleted file mode 100644
index 6150c29..0000000
--- a/prebuilts/gradle/CardReader/CardReaderSample/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 19
- compile "com.android.support:support-v13:20.+"
-
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/CardReader/settings.gradle b/prebuilts/gradle/CardReader/settings.gradle
index d1d7333..9464a35 100644
--- a/prebuilts/gradle/CardReader/settings.gradle
+++ b/prebuilts/gradle/CardReader/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'CardReaderSample'
+include 'Application'
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/build.gradle b/prebuilts/gradle/CustomChoiceList/Application/build.gradle
similarity index 95%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/build.gradle
rename to prebuilts/gradle/CustomChoiceList/Application/build.gradle
index 19a3fc4..de6b170 100644
--- a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/build.gradle
+++ b/prebuilts/gradle/CustomChoiceList/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/AndroidManifest.xml b/prebuilts/gradle/CustomChoiceList/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/customchoicelist/CheckableLinearLayout.java b/prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/customchoicelist/CheckableLinearLayout.java
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/customchoicelist/CheckableLinearLayout.java
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/customchoicelist/CheckableLinearLayout.java
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/customchoicelist/Cheeses.java b/prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/customchoicelist/Cheeses.java
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/customchoicelist/Cheeses.java
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/customchoicelist/Cheeses.java
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/customchoicelist/MainActivity.java b/prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/customchoicelist/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/customchoicelist/MainActivity.java
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/customchoicelist/MainActivity.java
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/color/hideable_text_color.xml b/prebuilts/gradle/CustomChoiceList/Application/src/main/res/color/hideable_text_color.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/color/hideable_text_color.xml
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/res/color/hideable_text_color.xml
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-xhdpi/ic_hideable_item_checked.png b/prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-xhdpi/ic_hideable_item_checked.png
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-xhdpi/ic_hideable_item_checked.png
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-xhdpi/ic_hideable_item_checked.png
Binary files differ
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-xhdpi/ic_hideable_item_unchecked.png b/prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-xhdpi/ic_hideable_item_unchecked.png
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-xhdpi/ic_hideable_item_unchecked.png
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-xhdpi/ic_hideable_item_unchecked.png
Binary files differ
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable/ic_hideable_item.xml b/prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable/ic_hideable_item.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable/ic_hideable_item.xml
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable/ic_hideable_item.xml
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/CustomChoiceList/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/layout/list_item.xml b/prebuilts/gradle/CustomChoiceList/Application/src/main/res/layout/list_item.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/layout/list_item.xml
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/res/layout/list_item.xml
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/layout/sample_main.xml b/prebuilts/gradle/CustomChoiceList/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/res/layout/sample_main.xml
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/CustomChoiceList/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/CustomChoiceList/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/CustomChoiceList/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/CustomChoiceList/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values/dimens.xml b/prebuilts/gradle/CustomChoiceList/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values/dimens.xml
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/res/values/dimens.xml
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values/styles.xml b/prebuilts/gradle/CustomChoiceList/Application/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values/styles.xml
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/res/values/styles.xml
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/CustomChoiceList/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/CustomChoiceList/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/CustomChoiceList/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/CustomChoiceList/settings.gradle b/prebuilts/gradle/CustomChoiceList/settings.gradle
index 6d876cf..9464a35 100644
--- a/prebuilts/gradle/CustomChoiceList/settings.gradle
+++ b/prebuilts/gradle/CustomChoiceList/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'CustomChoiceListSample'
+include 'Application'
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle b/prebuilts/gradle/CustomNotifications/Application/build.gradle
similarity index 95%
copy from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
copy to prebuilts/gradle/CustomNotifications/Application/build.gradle
index 299b515..ef913c3 100644
--- a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
+++ b/prebuilts/gradle/CustomNotifications/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/AndroidManifest.xml b/prebuilts/gradle/CustomNotifications/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/CustomNotifications/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/java/com/example/android/customnotifications/MainActivity.java b/prebuilts/gradle/CustomNotifications/Application/src/main/java/com/example/android/customnotifications/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/java/com/example/android/customnotifications/MainActivity.java
rename to prebuilts/gradle/CustomNotifications/Application/src/main/java/com/example/android/customnotifications/MainActivity.java
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi-v11/ic_stat_custom.png b/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-hdpi-v11/ic_stat_custom.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi-v11/ic_stat_custom.png
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-hdpi-v11/ic_stat_custom.png
Binary files differ
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi-v9/ic_stat_custom.png b/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-hdpi-v9/ic_stat_custom.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi-v9/ic_stat_custom.png
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-hdpi-v9/ic_stat_custom.png
Binary files differ
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi/ic_stat_custom.png b/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-hdpi/ic_stat_custom.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi/ic_stat_custom.png
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-hdpi/ic_stat_custom.png
Binary files differ
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-ldpi-v11/ic_stat_custom.png b/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-ldpi-v11/ic_stat_custom.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-ldpi-v11/ic_stat_custom.png
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-ldpi-v11/ic_stat_custom.png
Binary files differ
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-ldpi-v9/ic_stat_custom.png b/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-ldpi-v9/ic_stat_custom.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-ldpi-v9/ic_stat_custom.png
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-ldpi-v9/ic_stat_custom.png
Binary files differ
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-mdpi-v11/ic_stat_custom.png b/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-mdpi-v11/ic_stat_custom.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-mdpi-v11/ic_stat_custom.png
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-mdpi-v11/ic_stat_custom.png
Binary files differ
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-mdpi-v9/ic_stat_custom.png b/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-mdpi-v9/ic_stat_custom.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-mdpi-v9/ic_stat_custom.png
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-mdpi-v9/ic_stat_custom.png
Binary files differ
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-mdpi/ic_stat_custom.png b/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-mdpi/ic_stat_custom.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-mdpi/ic_stat_custom.png
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-mdpi/ic_stat_custom.png
Binary files differ
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi-v11/ic_stat_custom.png b/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xhdpi-v11/ic_stat_custom.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi-v11/ic_stat_custom.png
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xhdpi-v11/ic_stat_custom.png
Binary files differ
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi-v9/ic_stat_custom.png b/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xhdpi-v9/ic_stat_custom.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi-v9/ic_stat_custom.png
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xhdpi-v9/ic_stat_custom.png
Binary files differ
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi/ic_stat_custom.png b/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xhdpi/ic_stat_custom.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi/ic_stat_custom.png
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xhdpi/ic_stat_custom.png
Binary files differ
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi/robot.png b/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xhdpi/robot.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi/robot.png
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xhdpi/robot.png
Binary files differ
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi/robot_expanded.png b/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xhdpi/robot_expanded.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi/robot_expanded.png
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xhdpi/robot_expanded.png
Binary files differ
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/CustomNotifications/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/layout/notification.xml b/prebuilts/gradle/CustomNotifications/Application/src/main/res/layout/notification.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/layout/notification.xml
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/layout/notification.xml
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/layout/notification_expanded.xml b/prebuilts/gradle/CustomNotifications/Application/src/main/res/layout/notification_expanded.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/layout/notification_expanded.xml
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/layout/notification_expanded.xml
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/layout/sample_main.xml b/prebuilts/gradle/CustomNotifications/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/layout/sample_main.xml
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/CustomNotifications/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/CustomNotifications/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values-sw720dp-land/dimens.xml b/prebuilts/gradle/CustomNotifications/Application/src/main/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values-sw720dp-land/dimens.xml
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/values-sw720dp-land/dimens.xml
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/CustomNotifications/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values-v9/styles.xml b/prebuilts/gradle/CustomNotifications/Application/src/main/res/values-v9/styles.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values-v9/styles.xml
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/values-v9/styles.xml
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/CustomNotifications/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values/dimens.xml b/prebuilts/gradle/CustomNotifications/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values/dimens.xml
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/values/dimens.xml
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values/strings.xml b/prebuilts/gradle/CustomNotifications/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values/styles.xml b/prebuilts/gradle/CustomNotifications/Application/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values/styles.xml
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/values/styles.xml
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/CustomNotifications/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/CustomNotifications/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/CustomNotifications/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/build.gradle b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/build.gradle
deleted file mode 100644
index 299b515..0000000
--- a/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 4
- compile "com.android.support:support-v4:20.+"
-
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/CustomNotifications/settings.gradle b/prebuilts/gradle/CustomNotifications/settings.gradle
index 71d4992..9464a35 100644
--- a/prebuilts/gradle/CustomNotifications/settings.gradle
+++ b/prebuilts/gradle/CustomNotifications/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'CustomNotificationsSample'
+include 'Application'
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle b/prebuilts/gradle/CustomTransition/Application/build.gradle
similarity index 95%
copy from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle
copy to prebuilts/gradle/CustomTransition/Application/build.gradle
index 6150c29..a6b62fa 100644
--- a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle
+++ b/prebuilts/gradle/CustomTransition/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/AndroidManifest.xml b/prebuilts/gradle/CustomTransition/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/CustomTransition/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/customtransition/ChangeColor.java b/prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/customtransition/ChangeColor.java
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/customtransition/ChangeColor.java
rename to prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/customtransition/ChangeColor.java
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/customtransition/CustomTransitionFragment.java b/prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/customtransition/CustomTransitionFragment.java
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/customtransition/CustomTransitionFragment.java
rename to prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/customtransition/CustomTransitionFragment.java
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/customtransition/MainActivity.java b/prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/customtransition/MainActivity.java
similarity index 91%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/customtransition/MainActivity.java
rename to prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/customtransition/MainActivity.java
index a2b3562..bbb6dc0 100644
--- a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/customtransition/MainActivity.java
+++ b/prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/customtransition/MainActivity.java
@@ -47,10 +47,12 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
- FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
- CustomTransitionFragment fragment = new CustomTransitionFragment();
- transaction.replace(R.id.sample_content_fragment, fragment);
- transaction.commit();
+ if (savedInstanceState == null) {
+ FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+ CustomTransitionFragment fragment = new CustomTransitionFragment();
+ transaction.replace(R.id.sample_content_fragment, fragment);
+ transaction.commit();
+ }
}
@Override
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/CustomTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/CustomTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/CustomTransition/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/CustomTransition/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/CustomTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/CustomTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/CustomTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/CustomTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/CustomTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/CustomTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/CustomTransition/Application/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/CustomTransition/Application/src/main/res/layout-w720dp/activity_main.xml
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/CustomTransition/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/CustomTransition/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/layout/fragment_custom_transition.xml b/prebuilts/gradle/CustomTransition/Application/src/main/res/layout/fragment_custom_transition.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/layout/fragment_custom_transition.xml
rename to prebuilts/gradle/CustomTransition/Application/src/main/res/layout/fragment_custom_transition.xml
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/layout/scene1.xml b/prebuilts/gradle/CustomTransition/Application/src/main/res/layout/scene1.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/layout/scene1.xml
rename to prebuilts/gradle/CustomTransition/Application/src/main/res/layout/scene1.xml
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/layout/scene2.xml b/prebuilts/gradle/CustomTransition/Application/src/main/res/layout/scene2.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/layout/scene2.xml
rename to prebuilts/gradle/CustomTransition/Application/src/main/res/layout/scene2.xml
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/layout/scene3.xml b/prebuilts/gradle/CustomTransition/Application/src/main/res/layout/scene3.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/layout/scene3.xml
rename to prebuilts/gradle/CustomTransition/Application/src/main/res/layout/scene3.xml
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/menu/main.xml b/prebuilts/gradle/CustomTransition/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/CustomTransition/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/CustomTransition/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/CustomTransition/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/CustomTransition/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/CustomTransition/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/CustomTransition/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/CustomTransition/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/CustomTransition/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/CustomTransition/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/CustomTransition/Application/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/CustomTransition/Application/src/main/res/values/fragmentview_strings.xml
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/CustomTransition/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/CustomTransition/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/CustomTransition/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/CustomTransition/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/build.gradle b/prebuilts/gradle/CustomTransition/CustomTransitionSample/build.gradle
deleted file mode 100644
index 6150c29..0000000
--- a/prebuilts/gradle/CustomTransition/CustomTransitionSample/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 19
- compile "com.android.support:support-v13:20.+"
-
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/CustomTransition/settings.gradle b/prebuilts/gradle/CustomTransition/settings.gradle
index 3813ba8..9464a35 100644
--- a/prebuilts/gradle/CustomTransition/settings.gradle
+++ b/prebuilts/gradle/CustomTransition/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'CustomTransitionSample'
+include 'Application'
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/build.gradle b/prebuilts/gradle/DisplayingBitmaps/Application/build.gradle
similarity index 96%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/build.gradle
rename to prebuilts/gradle/DisplayingBitmaps/Application/build.gradle
index 095d740..e194097 100644
--- a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/build.gradle
+++ b/prebuilts/gradle/DisplayingBitmaps/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/AndroidManifest.xml b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/provider/Images.java b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/provider/Images.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/provider/Images.java
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/provider/Images.java
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/ImageDetailActivity.java b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/ImageDetailActivity.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/ImageDetailActivity.java
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/ImageDetailActivity.java
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/ImageDetailFragment.java b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/ImageDetailFragment.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/ImageDetailFragment.java
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/ImageDetailFragment.java
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/ImageGridActivity.java b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/ImageGridActivity.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/ImageGridActivity.java
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/ImageGridActivity.java
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/ImageGridFragment.java b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/ImageGridFragment.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/ImageGridFragment.java
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/ImageGridFragment.java
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/RecyclingImageView.java b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/RecyclingImageView.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/RecyclingImageView.java
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/RecyclingImageView.java
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/AsyncTask.java b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/AsyncTask.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/AsyncTask.java
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/AsyncTask.java
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/DiskLruCache.java b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/DiskLruCache.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/DiskLruCache.java
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/DiskLruCache.java
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/ImageCache.java b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/ImageCache.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/ImageCache.java
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/ImageCache.java
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/ImageFetcher.java b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/ImageFetcher.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/ImageFetcher.java
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/ImageFetcher.java
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/ImageResizer.java b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/ImageResizer.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/ImageResizer.java
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/ImageResizer.java
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/ImageWorker.java b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/ImageWorker.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/ImageWorker.java
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/ImageWorker.java
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/RecyclingBitmapDrawable.java b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/RecyclingBitmapDrawable.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/RecyclingBitmapDrawable.java
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/RecyclingBitmapDrawable.java
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/Utils.java b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/Utils.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/Utils.java
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/Utils.java
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-nodpi/empty_photo.png b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable-nodpi/empty_photo.png
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-nodpi/empty_photo.png
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable-nodpi/empty_photo.png
Binary files differ
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable/photogrid_list_selector.xml b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable/photogrid_list_selector.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable/photogrid_list_selector.xml
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable/photogrid_list_selector.xml
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/layout/image_detail_fragment.xml b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/layout/image_detail_fragment.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/layout/image_detail_fragment.xml
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/layout/image_detail_fragment.xml
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/layout/image_detail_pager.xml b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/layout/image_detail_pager.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/layout/image_detail_pager.xml
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/layout/image_detail_pager.xml
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/layout/image_grid_fragment.xml b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/layout/image_grid_fragment.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/layout/image_grid_fragment.xml
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/layout/image_grid_fragment.xml
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/menu/main_menu.xml b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/menu/main_menu.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/menu/main_menu.xml
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/menu/main_menu.xml
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-large/dimens.xml b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values-large/dimens.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-large/dimens.xml
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values-large/dimens.xml
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-v11/styles.xml b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values-v11/styles.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-v11/styles.xml
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values-v11/styles.xml
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-xlarge/dimens.xml b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values-xlarge/dimens.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-xlarge/dimens.xml
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values-xlarge/dimens.xml
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/colors.xml b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/colors.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/colors.xml
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/colors.xml
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/dimens.xml b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/dimens.xml
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/dimens.xml
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/strings.xml b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/styles.xml b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/styles.xml
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/styles.xml
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/tests/AndroidManifest.xml b/prebuilts/gradle/DisplayingBitmaps/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/DisplayingBitmaps/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/tests/src/com/example/android/displayingbitmaps/tests/SampleTests.java b/prebuilts/gradle/DisplayingBitmaps/Application/tests/src/com/example/android/displayingbitmaps/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/tests/src/com/example/android/displayingbitmaps/tests/SampleTests.java
rename to prebuilts/gradle/DisplayingBitmaps/Application/tests/src/com/example/android/displayingbitmaps/tests/SampleTests.java
diff --git a/prebuilts/gradle/DisplayingBitmaps/settings.gradle b/prebuilts/gradle/DisplayingBitmaps/settings.gradle
index a5c5699..9464a35 100644
--- a/prebuilts/gradle/DisplayingBitmaps/settings.gradle
+++ b/prebuilts/gradle/DisplayingBitmaps/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'DisplayingBitmapsSample'
+include 'Application'
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/build.gradle b/prebuilts/gradle/DoneBar/Application/build.gradle
similarity index 95%
copy from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/build.gradle
copy to prebuilts/gradle/DoneBar/Application/build.gradle
index bcc2350..6442a01 100644
--- a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/build.gradle
+++ b/prebuilts/gradle/DoneBar/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/AndroidManifest.xml b/prebuilts/gradle/DoneBar/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/DoneBar/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/java/com/example/android/donebar/DoneBarActivity.java b/prebuilts/gradle/DoneBar/Application/src/main/java/com/example/android/donebar/DoneBarActivity.java
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/java/com/example/android/donebar/DoneBarActivity.java
rename to prebuilts/gradle/DoneBar/Application/src/main/java/com/example/android/donebar/DoneBarActivity.java
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/java/com/example/android/donebar/DoneButtonActivity.java b/prebuilts/gradle/DoneBar/Application/src/main/java/com/example/android/donebar/DoneButtonActivity.java
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/java/com/example/android/donebar/DoneButtonActivity.java
rename to prebuilts/gradle/DoneBar/Application/src/main/java/com/example/android/donebar/DoneButtonActivity.java
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/java/com/example/android/donebar/MainActivity.java b/prebuilts/gradle/DoneBar/Application/src/main/java/com/example/android/donebar/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/java/com/example/android/donebar/MainActivity.java
rename to prebuilts/gradle/DoneBar/Application/src/main/java/com/example/android/donebar/MainActivity.java
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-hdpi/ic_action_cancel.png b/prebuilts/gradle/DoneBar/Application/src/main/res/drawable-hdpi/ic_action_cancel.png
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-hdpi/ic_action_cancel.png
rename to prebuilts/gradle/DoneBar/Application/src/main/res/drawable-hdpi/ic_action_cancel.png
Binary files differ
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-hdpi/ic_action_done.png b/prebuilts/gradle/DoneBar/Application/src/main/res/drawable-hdpi/ic_action_done.png
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-hdpi/ic_action_done.png
rename to prebuilts/gradle/DoneBar/Application/src/main/res/drawable-hdpi/ic_action_done.png
Binary files differ
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/DoneBar/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/DoneBar/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/DoneBar/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/DoneBar/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-mdpi/ic_action_cancel.png b/prebuilts/gradle/DoneBar/Application/src/main/res/drawable-mdpi/ic_action_cancel.png
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-mdpi/ic_action_cancel.png
rename to prebuilts/gradle/DoneBar/Application/src/main/res/drawable-mdpi/ic_action_cancel.png
Binary files differ
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-mdpi/ic_action_done.png b/prebuilts/gradle/DoneBar/Application/src/main/res/drawable-mdpi/ic_action_done.png
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-mdpi/ic_action_done.png
rename to prebuilts/gradle/DoneBar/Application/src/main/res/drawable-mdpi/ic_action_done.png
Binary files differ
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/DoneBar/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/DoneBar/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-xhdpi/ic_action_cancel.png b/prebuilts/gradle/DoneBar/Application/src/main/res/drawable-xhdpi/ic_action_cancel.png
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-xhdpi/ic_action_cancel.png
rename to prebuilts/gradle/DoneBar/Application/src/main/res/drawable-xhdpi/ic_action_cancel.png
Binary files differ
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-xhdpi/ic_action_done.png b/prebuilts/gradle/DoneBar/Application/src/main/res/drawable-xhdpi/ic_action_done.png
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-xhdpi/ic_action_done.png
rename to prebuilts/gradle/DoneBar/Application/src/main/res/drawable-xhdpi/ic_action_done.png
Binary files differ
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/DoneBar/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/DoneBar/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-xhdpi/sample_dashboard_item_background.9.png b/prebuilts/gradle/DoneBar/Application/src/main/res/drawable-xhdpi/sample_dashboard_item_background.9.png
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-xhdpi/sample_dashboard_item_background.9.png
rename to prebuilts/gradle/DoneBar/Application/src/main/res/drawable-xhdpi/sample_dashboard_item_background.9.png
Binary files differ
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/DoneBar/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/DoneBar/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/actionbar_custom_view_done.xml b/prebuilts/gradle/DoneBar/Application/src/main/res/layout/actionbar_custom_view_done.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/actionbar_custom_view_done.xml
rename to prebuilts/gradle/DoneBar/Application/src/main/res/layout/actionbar_custom_view_done.xml
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/actionbar_custom_view_done_cancel.xml b/prebuilts/gradle/DoneBar/Application/src/main/res/layout/actionbar_custom_view_done_cancel.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/actionbar_custom_view_done_cancel.xml
rename to prebuilts/gradle/DoneBar/Application/src/main/res/layout/actionbar_custom_view_done_cancel.xml
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/activity_done_bar.xml b/prebuilts/gradle/DoneBar/Application/src/main/res/layout/activity_done_bar.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/activity_done_bar.xml
rename to prebuilts/gradle/DoneBar/Application/src/main/res/layout/activity_done_bar.xml
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/activity_done_button.xml b/prebuilts/gradle/DoneBar/Application/src/main/res/layout/activity_done_button.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/activity_done_button.xml
rename to prebuilts/gradle/DoneBar/Application/src/main/res/layout/activity_done_button.xml
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/DoneBar/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/DoneBar/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/activity_sample_dashboard.xml b/prebuilts/gradle/DoneBar/Application/src/main/res/layout/activity_sample_dashboard.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/activity_sample_dashboard.xml
rename to prebuilts/gradle/DoneBar/Application/src/main/res/layout/activity_sample_dashboard.xml
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/include_cancel_button.xml b/prebuilts/gradle/DoneBar/Application/src/main/res/layout/include_cancel_button.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/include_cancel_button.xml
rename to prebuilts/gradle/DoneBar/Application/src/main/res/layout/include_cancel_button.xml
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/include_done_button.xml b/prebuilts/gradle/DoneBar/Application/src/main/res/layout/include_done_button.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/include_done_button.xml
rename to prebuilts/gradle/DoneBar/Application/src/main/res/layout/include_done_button.xml
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/sample_dashboard_item.xml b/prebuilts/gradle/DoneBar/Application/src/main/res/layout/sample_dashboard_item.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/sample_dashboard_item.xml
rename to prebuilts/gradle/DoneBar/Application/src/main/res/layout/sample_dashboard_item.xml
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/menu/cancel.xml b/prebuilts/gradle/DoneBar/Application/src/main/res/menu/cancel.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/menu/cancel.xml
rename to prebuilts/gradle/DoneBar/Application/src/main/res/menu/cancel.xml
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/DoneBar/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/DoneBar/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/DoneBar/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/DoneBar/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/DoneBar/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/DoneBar/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values/activitycards-strings.xml b/prebuilts/gradle/DoneBar/Application/src/main/res/values/activitycards-strings.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values/activitycards-strings.xml
rename to prebuilts/gradle/DoneBar/Application/src/main/res/values/activitycards-strings.xml
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/DoneBar/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/DoneBar/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values/strings.xml b/prebuilts/gradle/DoneBar/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/DoneBar/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/DoneBar/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/DoneBar/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/DoneBar/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/DoneBar/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/tests/AndroidManifest.xml b/prebuilts/gradle/DoneBar/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/DoneBar/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/tests/src/com/example/android/donebar/tests/SampleTests.java b/prebuilts/gradle/DoneBar/Application/tests/src/com/example/android/donebar/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/DoneBar/DoneBarSample/tests/src/com/example/android/donebar/tests/SampleTests.java
rename to prebuilts/gradle/DoneBar/Application/tests/src/com/example/android/donebar/tests/SampleTests.java
diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/build.gradle b/prebuilts/gradle/DoneBar/DoneBarSample/build.gradle
deleted file mode 100644
index bcc2350..0000000
--- a/prebuilts/gradle/DoneBar/DoneBarSample/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 14
- compile "com.android.support:support-v13:20.+"
-
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/DoneBar/settings.gradle b/prebuilts/gradle/DoneBar/settings.gradle
index d060dc7..9464a35 100644
--- a/prebuilts/gradle/DoneBar/settings.gradle
+++ b/prebuilts/gradle/DoneBar/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'DoneBarSample'
+include 'Application'
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle b/prebuilts/gradle/FragmentTransition/Application/build.gradle
similarity index 95%
copy from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle
copy to prebuilts/gradle/FragmentTransition/Application/build.gradle
index 6150c29..a6b62fa 100644
--- a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle
+++ b/prebuilts/gradle/FragmentTransition/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/AndroidManifest.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/FragmentTransition/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java
rename to prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java
rename to prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/DetailFragment.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/DetailFragment.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/DetailFragment.java
rename to prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/DetailFragment.java
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/FragmentTransitionFragment.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/FragmentTransitionFragment.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/FragmentTransitionFragment.java
rename to prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/FragmentTransitionFragment.java
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/MainActivity.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/MainActivity.java
similarity index 91%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/MainActivity.java
rename to prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/MainActivity.java
index 90e54b2..fa019be 100644
--- a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/MainActivity.java
+++ b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/MainActivity.java
@@ -47,10 +47,12 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
- FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
- FragmentTransitionFragment fragment = new FragmentTransitionFragment();
- transaction.replace(R.id.sample_content_fragment, fragment);
- transaction.commit();
+ if (savedInstanceState == null) {
+ FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+ FragmentTransitionFragment fragment = new FragmentTransitionFragment();
+ transaction.replace(R.id.sample_content_fragment, fragment);
+ transaction.commit();
+ }
}
@Override
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/Meat.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/Meat.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/Meat.java
rename to prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/Meat.java
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/MeatAdapter.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/MeatAdapter.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/MeatAdapter.java
rename to prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/MeatAdapter.java
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p1.jpg b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p1.jpg
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p1.jpg
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p1.jpg
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p10.jpg b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p10.jpg
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p10.jpg
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p10.jpg
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p11.jpg b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p11.jpg
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p11.jpg
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p11.jpg
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p2.jpg b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p2.jpg
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p2.jpg
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p2.jpg
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p3.jpg b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p3.jpg
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p3.jpg
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p3.jpg
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p4.jpg b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p4.jpg
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p4.jpg
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p4.jpg
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p5.jpg b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p5.jpg
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p5.jpg
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p5.jpg
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p6.jpg b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p6.jpg
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p6.jpg
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p6.jpg
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p7.jpg b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p7.jpg
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p7.jpg
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p7.jpg
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p8.jpg b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p8.jpg
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p8.jpg
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p8.jpg
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p9.jpg b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p9.jpg
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p9.jpg
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p9.jpg
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/layout-w720dp/activity_main.xml
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/layout/fragment_detail.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/fragment_detail.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/layout/fragment_detail.xml
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/fragment_detail.xml
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/layout/fragment_detail_content.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/fragment_detail_content.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/layout/fragment_detail_content.xml
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/fragment_detail_content.xml
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/layout/fragment_fragment_transition.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/fragment_fragment_transition.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/layout/fragment_fragment_transition.xml
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/fragment_fragment_transition.xml
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/layout/item_meat_grid.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/item_meat_grid.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/layout/item_meat_grid.xml
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/item_meat_grid.xml
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/menu/main.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/values/fragmentview_strings.xml
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/strings.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/FragmentTransition/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/build.gradle b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/build.gradle
deleted file mode 100644
index 6150c29..0000000
--- a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 19
- compile "com.android.support:support-v13:20.+"
-
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/FragmentTransition/settings.gradle b/prebuilts/gradle/FragmentTransition/settings.gradle
index 7e39b44..9464a35 100644
--- a/prebuilts/gradle/FragmentTransition/settings.gradle
+++ b/prebuilts/gradle/FragmentTransition/settings.gradle
@@ -1 +1 @@
-include 'FragmentTransitionSample'
+include 'Application'
diff --git a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/build.gradle b/prebuilts/gradle/HorizontalPaging/Application/build.gradle
similarity index 96%
rename from prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/build.gradle
rename to prebuilts/gradle/HorizontalPaging/Application/build.gradle
index d371a8c..0ad0136 100644
--- a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/build.gradle
+++ b/prebuilts/gradle/HorizontalPaging/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/AndroidManifest.xml b/prebuilts/gradle/HorizontalPaging/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/HorizontalPaging/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/java/com/example/android/horizontalpaging/MainActivity.java b/prebuilts/gradle/HorizontalPaging/Application/src/main/java/com/example/android/horizontalpaging/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/java/com/example/android/horizontalpaging/MainActivity.java
rename to prebuilts/gradle/HorizontalPaging/Application/src/main/java/com/example/android/horizontalpaging/MainActivity.java
diff --git a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/HorizontalPaging/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/HorizontalPaging/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/HorizontalPaging/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/HorizontalPaging/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/HorizontalPaging/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/HorizontalPaging/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/HorizontalPaging/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/HorizontalPaging/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/HorizontalPaging/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/HorizontalPaging/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/layout/fragment_main_dummy.xml b/prebuilts/gradle/HorizontalPaging/Application/src/main/res/layout/fragment_main_dummy.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/layout/fragment_main_dummy.xml
rename to prebuilts/gradle/HorizontalPaging/Application/src/main/res/layout/fragment_main_dummy.xml
diff --git a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/layout/sample_main.xml b/prebuilts/gradle/HorizontalPaging/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/HorizontalPaging/Application/src/main/res/layout/sample_main.xml
diff --git a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/HorizontalPaging/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/HorizontalPaging/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/HorizontalPaging/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/HorizontalPaging/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/HorizontalPaging/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/HorizontalPaging/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/HorizontalPaging/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/HorizontalPaging/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values/dimens.xml b/prebuilts/gradle/HorizontalPaging/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values/dimens.xml
rename to prebuilts/gradle/HorizontalPaging/Application/src/main/res/values/dimens.xml
diff --git a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values/strings.xml b/prebuilts/gradle/HorizontalPaging/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/HorizontalPaging/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/HorizontalPaging/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/HorizontalPaging/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/HorizontalPaging/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/HorizontalPaging/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values/values-sw720dp-land/dimens.xml b/prebuilts/gradle/HorizontalPaging/Application/src/main/res/values/values-sw720dp-land/dimens.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values/values-sw720dp-land/dimens.xml
rename to prebuilts/gradle/HorizontalPaging/Application/src/main/res/values/values-sw720dp-land/dimens.xml
diff --git a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/tests/AndroidManifest.xml b/prebuilts/gradle/HorizontalPaging/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/HorizontalPaging/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/tests/src/com/example/android/horizontalpaging/tests/SampleTests.java b/prebuilts/gradle/HorizontalPaging/Application/tests/src/com/example/android/horizontalpaging/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/tests/src/com/example/android/horizontalpaging/tests/SampleTests.java
rename to prebuilts/gradle/HorizontalPaging/Application/tests/src/com/example/android/horizontalpaging/tests/SampleTests.java
diff --git a/prebuilts/gradle/HorizontalPaging/settings.gradle b/prebuilts/gradle/HorizontalPaging/settings.gradle
index f70f0f1..9464a35 100644
--- a/prebuilts/gradle/HorizontalPaging/settings.gradle
+++ b/prebuilts/gradle/HorizontalPaging/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'HorizontalPagingSample'
+include 'Application'
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle b/prebuilts/gradle/ImmersiveMode/Application/build.gradle
similarity index 95%
copy from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
copy to prebuilts/gradle/ImmersiveMode/Application/build.gradle
index 299b515..ef913c3 100644
--- a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
+++ b/prebuilts/gradle/ImmersiveMode/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/AndroidManifest.xml b/prebuilts/gradle/ImmersiveMode/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/immersivemode/ImmersiveModeFragment.java b/prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/immersivemode/ImmersiveModeFragment.java
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/immersivemode/ImmersiveModeFragment.java
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/immersivemode/ImmersiveModeFragment.java
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/immersivemode/MainActivity.java b/prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/immersivemode/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/immersivemode/MainActivity.java
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/immersivemode/MainActivity.java
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/ImmersiveMode/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/ImmersiveMode/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/ImmersiveMode/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/ImmersiveMode/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/ImmersiveMode/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/layout-sw600dp-land/activity_main.xml b/prebuilts/gradle/ImmersiveMode/Application/src/main/res/layout-sw600dp-land/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/layout-sw600dp-land/activity_main.xml
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/res/layout-sw600dp-land/activity_main.xml
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/layout-sw600dp/activity_main.xml b/prebuilts/gradle/ImmersiveMode/Application/src/main/res/layout-sw600dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/layout-sw600dp/activity_main.xml
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/res/layout-sw600dp/activity_main.xml
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/ImmersiveMode/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/menu/main.xml b/prebuilts/gradle/ImmersiveMode/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/ImmersiveMode/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/ImmersiveMode/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/ImmersiveMode/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/ImmersiveMode/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values/strings.xml b/prebuilts/gradle/ImmersiveMode/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/ImmersiveMode/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/ImmersiveMode/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/ImmersiveMode/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/tests/AndroidManifest.xml b/prebuilts/gradle/ImmersiveMode/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/ImmersiveMode/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/tests/src/com/example/android/immersivemode/tests/ImmersiveModeSampleTests.java b/prebuilts/gradle/ImmersiveMode/Application/tests/src/com/example/android/immersivemode/tests/ImmersiveModeSampleTests.java
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/tests/src/com/example/android/immersivemode/tests/ImmersiveModeSampleTests.java
rename to prebuilts/gradle/ImmersiveMode/Application/tests/src/com/example/android/immersivemode/tests/ImmersiveModeSampleTests.java
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/tests/src/com/example/android/immersivemode/tests/SampleTests.java b/prebuilts/gradle/ImmersiveMode/Application/tests/src/com/example/android/immersivemode/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/tests/src/com/example/android/immersivemode/tests/SampleTests.java
rename to prebuilts/gradle/ImmersiveMode/Application/tests/src/com/example/android/immersivemode/tests/SampleTests.java
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/build.gradle b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/build.gradle
deleted file mode 100644
index 299b515..0000000
--- a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 4
- compile "com.android.support:support-v4:20.+"
-
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/ImmersiveMode/settings.gradle b/prebuilts/gradle/ImmersiveMode/settings.gradle
index d13a7a1..9464a35 100644
--- a/prebuilts/gradle/ImmersiveMode/settings.gradle
+++ b/prebuilts/gradle/ImmersiveMode/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'ImmersiveModeSample'
+include 'Application'
diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/build.gradle b/prebuilts/gradle/MediaRecorder/Application/build.gradle
similarity index 95%
copy from prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/build.gradle
copy to prebuilts/gradle/MediaRecorder/Application/build.gradle
index bcc2350..6442a01 100644
--- a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/build.gradle
+++ b/prebuilts/gradle/MediaRecorder/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/AndroidManifest.xml b/prebuilts/gradle/MediaRecorder/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/MediaRecorder/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/java/com/example/android/common/media/CameraHelper.java b/prebuilts/gradle/MediaRecorder/Application/src/main/java/com/example/android/common/media/CameraHelper.java
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/java/com/example/android/common/media/CameraHelper.java
rename to prebuilts/gradle/MediaRecorder/Application/src/main/java/com/example/android/common/media/CameraHelper.java
diff --git a/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/java/com/example/android/common/media/MediaCodecWrapper.java b/prebuilts/gradle/MediaRecorder/Application/src/main/java/com/example/android/common/media/MediaCodecWrapper.java
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/java/com/example/android/common/media/MediaCodecWrapper.java
rename to prebuilts/gradle/MediaRecorder/Application/src/main/java/com/example/android/common/media/MediaCodecWrapper.java
diff --git a/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/java/com/example/android/mediarecorder/MainActivity.java b/prebuilts/gradle/MediaRecorder/Application/src/main/java/com/example/android/mediarecorder/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/java/com/example/android/mediarecorder/MainActivity.java
rename to prebuilts/gradle/MediaRecorder/Application/src/main/java/com/example/android/mediarecorder/MainActivity.java
diff --git a/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/MediaRecorder/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/MediaRecorder/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/MediaRecorder/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/MediaRecorder/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/MediaRecorder/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/MediaRecorder/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/MediaRecorder/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/MediaRecorder/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/MediaRecorder/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/MediaRecorder/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/MediaRecorder/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/MediaRecorder/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/layout/sample_main.xml b/prebuilts/gradle/MediaRecorder/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/MediaRecorder/Application/src/main/res/layout/sample_main.xml
diff --git a/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/MediaRecorder/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/MediaRecorder/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/MediaRecorder/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/MediaRecorder/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values-sw720dp-land/dimens.xml b/prebuilts/gradle/MediaRecorder/Application/src/main/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values-sw720dp-land/dimens.xml
rename to prebuilts/gradle/MediaRecorder/Application/src/main/res/values-sw720dp-land/dimens.xml
diff --git a/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/MediaRecorder/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/MediaRecorder/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/MediaRecorder/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/MediaRecorder/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values/dimens.xml b/prebuilts/gradle/MediaRecorder/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values/dimens.xml
rename to prebuilts/gradle/MediaRecorder/Application/src/main/res/values/dimens.xml
diff --git a/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values/strings.xml b/prebuilts/gradle/MediaRecorder/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/MediaRecorder/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/MediaRecorder/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/MediaRecorder/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/MediaRecorder/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/MediaRecorder/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/MediaRecorder/MediaRecorderSample/build.gradle b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/build.gradle
deleted file mode 100644
index bcc2350..0000000
--- a/prebuilts/gradle/MediaRecorder/MediaRecorderSample/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 14
- compile "com.android.support:support-v13:20.+"
-
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/MediaRecorder/settings.gradle b/prebuilts/gradle/MediaRecorder/settings.gradle
index 61e4032..9464a35 100644
--- a/prebuilts/gradle/MediaRecorder/settings.gradle
+++ b/prebuilts/gradle/MediaRecorder/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'MediaRecorderSample'
+include 'Application'
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/build.gradle b/prebuilts/gradle/MediaRouter/Application/build.gradle
similarity index 96%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/build.gradle
rename to prebuilts/gradle/MediaRouter/Application/build.gradle
index a374e37..d679e84 100644
--- a/prebuilts/gradle/MediaRouter/MediaRouterSample/build.gradle
+++ b/prebuilts/gradle/MediaRouter/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/AndroidManifest.xml b/prebuilts/gradle/MediaRouter/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/MediaRouter/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/LocalPlayer.java b/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/LocalPlayer.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/LocalPlayer.java
rename to prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/LocalPlayer.java
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/MainActivity.java b/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/MainActivity.java
rename to prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/MainActivity.java
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/OverlayDisplayWindow.java b/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/OverlayDisplayWindow.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/OverlayDisplayWindow.java
rename to prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/OverlayDisplayWindow.java
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/Player.java b/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/Player.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/Player.java
rename to prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/Player.java
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/PlaylistItem.java b/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/PlaylistItem.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/PlaylistItem.java
rename to prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/PlaylistItem.java
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/RemotePlayer.java b/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/RemotePlayer.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/RemotePlayer.java
rename to prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/RemotePlayer.java
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/SampleMediaButtonReceiver.java b/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/SampleMediaButtonReceiver.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/SampleMediaButtonReceiver.java
rename to prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/SampleMediaButtonReceiver.java
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/SessionManager.java b/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/SessionManager.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/SessionManager.java
rename to prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/SessionManager.java
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/provider/SampleMediaRouteProvider.java b/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/provider/SampleMediaRouteProvider.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/provider/SampleMediaRouteProvider.java
rename to prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/provider/SampleMediaRouteProvider.java
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/provider/SampleMediaRouteProviderService.java b/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/provider/SampleMediaRouteProviderService.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/provider/SampleMediaRouteProviderService.java
rename to prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/provider/SampleMediaRouteProviderService.java
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_action_pause.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_action_pause.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_action_pause.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_action_pause.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_action_play.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_action_play.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_action_play.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_action_play.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_action_stop.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_action_stop.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_action_stop.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_action_stop.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_media_pause.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_media_pause.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_media_pause.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_media_pause.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_media_play.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_media_play.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_media_play.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_media_play.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_media_stop.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_media_stop.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_media_stop.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_media_stop.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_menu_add.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_menu_add.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_menu_add.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_menu_add.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_menu_delete.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_menu_delete.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_menu_delete.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_menu_delete.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_action_pause.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_action_pause.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_action_pause.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_action_pause.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_action_play.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_action_play.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_action_play.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_action_play.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_action_stop.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_action_stop.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_action_stop.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_action_stop.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_media_pause.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_media_pause.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_media_pause.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_media_pause.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_media_play.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_media_play.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_media_play.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_media_play.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_media_stop.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_media_stop.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_media_stop.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_media_stop.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_menu_add.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_menu_add.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_menu_add.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_menu_add.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_menu_delete.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_menu_delete.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_menu_delete.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_menu_delete.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xhdpi/ic_action_pause.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xhdpi/ic_action_pause.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xhdpi/ic_action_pause.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xhdpi/ic_action_pause.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xhdpi/ic_action_play.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xhdpi/ic_action_play.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xhdpi/ic_action_play.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xhdpi/ic_action_play.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xhdpi/ic_action_stop.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xhdpi/ic_action_stop.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xhdpi/ic_action_stop.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xhdpi/ic_action_stop.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_action_pause.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_action_pause.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_action_pause.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_action_pause.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_action_play.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_action_play.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_action_play.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_action_play.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_action_stop.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_action_stop.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_action_stop.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_action_stop.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_suggestions_add.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_suggestions_add.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_suggestions_add.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_suggestions_add.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_suggestions_delete.png b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_suggestions_delete.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_suggestions_delete.png
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_suggestions_delete.png
Binary files differ
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable/list_background.xml b/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable/list_background.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable/list_background.xml
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/drawable/list_background.xml
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/layout-land/grid_layout_2.xml b/prebuilts/gradle/MediaRouter/Application/src/main/res/layout-land/grid_layout_2.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/layout-land/grid_layout_2.xml
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/layout-land/grid_layout_2.xml
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/MediaRouter/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/layout/media_item.xml b/prebuilts/gradle/MediaRouter/Application/src/main/res/layout/media_item.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/layout/media_item.xml
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/layout/media_item.xml
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/layout/overlay_display_window.xml b/prebuilts/gradle/MediaRouter/Application/src/main/res/layout/overlay_display_window.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/layout/overlay_display_window.xml
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/layout/overlay_display_window.xml
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/layout/sample_media_router.xml b/prebuilts/gradle/MediaRouter/Application/src/main/res/layout/sample_media_router.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/layout/sample_media_router.xml
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/layout/sample_media_router.xml
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/layout/sample_media_router_presentation.xml b/prebuilts/gradle/MediaRouter/Application/src/main/res/layout/sample_media_router_presentation.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/layout/sample_media_router_presentation.xml
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/layout/sample_media_router_presentation.xml
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/menu/sample_media_router_menu.xml b/prebuilts/gradle/MediaRouter/Application/src/main/res/menu/sample_media_router_menu.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/menu/sample_media_router_menu.xml
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/menu/sample_media_router_menu.xml
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/MediaRouter/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/MediaRouter/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/MediaRouter/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values/arrays.xml b/prebuilts/gradle/MediaRouter/Application/src/main/res/values/arrays.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values/arrays.xml
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/values/arrays.xml
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/MediaRouter/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values/colors.xml b/prebuilts/gradle/MediaRouter/Application/src/main/res/values/colors.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values/colors.xml
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/values/colors.xml
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values/strings.xml b/prebuilts/gradle/MediaRouter/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/MediaRouter/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/MediaRouter/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/MediaRouter/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/tests/AndroidManifest.xml b/prebuilts/gradle/MediaRouter/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/MediaRouter/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/tests/src/com/example/android/mediarouter/tests/SampleTests.java b/prebuilts/gradle/MediaRouter/Application/tests/src/com/example/android/mediarouter/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/MediaRouterSample/tests/src/com/example/android/mediarouter/tests/SampleTests.java
rename to prebuilts/gradle/MediaRouter/Application/tests/src/com/example/android/mediarouter/tests/SampleTests.java
diff --git a/prebuilts/gradle/MediaRouter/settings.gradle b/prebuilts/gradle/MediaRouter/settings.gradle
index fff93ae..9464a35 100644
--- a/prebuilts/gradle/MediaRouter/settings.gradle
+++ b/prebuilts/gradle/MediaRouter/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'MediaRouterSample'
+include 'Application'
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/build.gradle b/prebuilts/gradle/NetworkConnect/Application/build.gradle
similarity index 96%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/build.gradle
rename to prebuilts/gradle/NetworkConnect/Application/build.gradle
index 181b1a2..c36485e 100644
--- a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/build.gradle
+++ b/prebuilts/gradle/NetworkConnect/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/AndroidManifest.xml b/prebuilts/gradle/NetworkConnect/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/NetworkConnect/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/networkconnect/MainActivity.java b/prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/networkconnect/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/networkconnect/MainActivity.java
rename to prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/networkconnect/MainActivity.java
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/networkconnect/SimpleTextFragment.java b/prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/networkconnect/SimpleTextFragment.java
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/networkconnect/SimpleTextFragment.java
rename to prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/networkconnect/SimpleTextFragment.java
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/NetworkConnect/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/NetworkConnect/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/NetworkConnect/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/NetworkConnect/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/NetworkConnect/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/NetworkConnect/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/NetworkConnect/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/NetworkConnect/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/NetworkConnect/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/NetworkConnect/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/NetworkConnect/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/NetworkConnect/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/layout/sample_main.xml b/prebuilts/gradle/NetworkConnect/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/NetworkConnect/Application/src/main/res/layout/sample_main.xml
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/menu/main.xml b/prebuilts/gradle/NetworkConnect/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/NetworkConnect/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/NetworkConnect/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/NetworkConnect/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/NetworkConnect/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/NetworkConnect/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/NetworkConnect/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/NetworkConnect/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/NetworkConnect/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/NetworkConnect/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values/strings.xml b/prebuilts/gradle/NetworkConnect/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/NetworkConnect/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/NetworkConnect/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/NetworkConnect/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/NetworkConnect/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/NetworkConnect/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/tests/AndroidManifest.xml b/prebuilts/gradle/NetworkConnect/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/NetworkConnect/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/tests/src/com/example/android/networkconnect/tests/SampleTests.java b/prebuilts/gradle/NetworkConnect/Application/tests/src/com/example/android/networkconnect/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/NetworkConnectSample/tests/src/com/example/android/networkconnect/tests/SampleTests.java
rename to prebuilts/gradle/NetworkConnect/Application/tests/src/com/example/android/networkconnect/tests/SampleTests.java
diff --git a/prebuilts/gradle/NetworkConnect/settings.gradle b/prebuilts/gradle/NetworkConnect/settings.gradle
index ebae091..9464a35 100644
--- a/prebuilts/gradle/NetworkConnect/settings.gradle
+++ b/prebuilts/gradle/NetworkConnect/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'NetworkConnectSample'
+include 'Application'
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/build.gradle b/prebuilts/gradle/RenderScriptIntrinsic/Application/build.gradle
similarity index 96%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/build.gradle
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/build.gradle
index 14a29ec..d78e724 100644
--- a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/build.gradle
+++ b/prebuilts/gradle/RenderScriptIntrinsic/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/AndroidManifest.xml b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/renderscriptintrinsic/MainActivity.java b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/renderscriptintrinsic/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/renderscriptintrinsic/MainActivity.java
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/renderscriptintrinsic/MainActivity.java
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/renderscriptintrinsic/ThumbnailRadioButton.java b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/renderscriptintrinsic/ThumbnailRadioButton.java
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/renderscriptintrinsic/ThumbnailRadioButton.java
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/renderscriptintrinsic/ThumbnailRadioButton.java
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-nodpi/data.jpg b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/drawable-nodpi/data.jpg
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-nodpi/data.jpg
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/drawable-nodpi/data.jpg
Binary files differ
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/layout/main_layout.xml b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/layout/main_layout.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/layout/main_layout.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/layout/main_layout.xml
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values-v11/styles.xml b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values-v11/styles.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values-v11/styles.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values-v11/styles.xml
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values-v14/styles.xml b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values-v14/styles.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values-v14/styles.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values-v14/styles.xml
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/attrs.xml b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values/attrs.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/attrs.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values/attrs.xml
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/colors.xml b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values/colors.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/colors.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values/colors.xml
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/styles.xml b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/styles.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values/styles.xml
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/tests/AndroidManifest.xml b/prebuilts/gradle/RenderScriptIntrinsic/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/tests/src/com/example/android/renderscriptintrinsic/tests/SampleTests.java b/prebuilts/gradle/RenderScriptIntrinsic/Application/tests/src/com/example/android/renderscriptintrinsic/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/tests/src/com/example/android/renderscriptintrinsic/tests/SampleTests.java
rename to prebuilts/gradle/RenderScriptIntrinsic/Application/tests/src/com/example/android/renderscriptintrinsic/tests/SampleTests.java
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/settings.gradle b/prebuilts/gradle/RenderScriptIntrinsic/settings.gradle
index 702ca57..9464a35 100644
--- a/prebuilts/gradle/RenderScriptIntrinsic/settings.gradle
+++ b/prebuilts/gradle/RenderScriptIntrinsic/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'RenderScriptIntrinsicSample'
+include 'Application'
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle b/prebuilts/gradle/RepeatingAlarm/Application/build.gradle
similarity index 95%
copy from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
copy to prebuilts/gradle/RepeatingAlarm/Application/build.gradle
index 299b515..ef913c3 100644
--- a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
+++ b/prebuilts/gradle/RepeatingAlarm/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/AndroidManifest.xml b/prebuilts/gradle/RepeatingAlarm/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/repeatingalarm/MainActivity.java b/prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/repeatingalarm/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/repeatingalarm/MainActivity.java
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/repeatingalarm/MainActivity.java
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/repeatingalarm/RepeatingAlarmFragment.java b/prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/repeatingalarm/RepeatingAlarmFragment.java
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/repeatingalarm/RepeatingAlarmFragment.java
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/repeatingalarm/RepeatingAlarmFragment.java
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/layout-sw600dp-land/activity_main.xml b/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/layout-sw600dp-land/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/layout-sw600dp-land/activity_main.xml
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/res/layout-sw600dp-land/activity_main.xml
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/layout-sw600dp/activity_main.xml b/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/layout-sw600dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/layout-sw600dp/activity_main.xml
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/res/layout-sw600dp/activity_main.xml
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/menu/main.xml b/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values/strings.xml b/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/build.gradle b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/build.gradle
deleted file mode 100644
index 299b515..0000000
--- a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 4
- compile "com.android.support:support-v4:20.+"
-
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/RepeatingAlarm/settings.gradle b/prebuilts/gradle/RepeatingAlarm/settings.gradle
index 0f14173..9464a35 100644
--- a/prebuilts/gradle/RepeatingAlarm/settings.gradle
+++ b/prebuilts/gradle/RepeatingAlarm/settings.gradle
@@ -1 +1 @@
-include 'RepeatingAlarmSample'
+include 'Application'
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle b/prebuilts/gradle/SlidingTabsBasic/Application/build.gradle
similarity index 95%
copy from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
copy to prebuilts/gradle/SlidingTabsBasic/Application/build.gradle
index 299b515..ef913c3 100644
--- a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
+++ b/prebuilts/gradle/SlidingTabsBasic/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/AndroidManifest.xml b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/slidingtabsbasic/MainActivity.java b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/slidingtabsbasic/MainActivity.java
similarity index 91%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/slidingtabsbasic/MainActivity.java
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/slidingtabsbasic/MainActivity.java
index 3f808bb..d7d2ff5 100644
--- a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/slidingtabsbasic/MainActivity.java
+++ b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/slidingtabsbasic/MainActivity.java
@@ -47,10 +47,12 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
- FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
- SlidingTabsBasicFragment fragment = new SlidingTabsBasicFragment();
- transaction.replace(R.id.sample_content_fragment, fragment);
- transaction.commit();
+ if (savedInstanceState == null) {
+ FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+ SlidingTabsBasicFragment fragment = new SlidingTabsBasicFragment();
+ transaction.replace(R.id.sample_content_fragment, fragment);
+ transaction.commit();
+ }
}
@Override
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/slidingtabsbasic/SlidingTabsBasicFragment.java b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/slidingtabsbasic/SlidingTabsBasicFragment.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/slidingtabsbasic/SlidingTabsBasicFragment.java
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/slidingtabsbasic/SlidingTabsBasicFragment.java
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/layout-w720dp/activity_main.xml
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/layout/fragment_sample.xml b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/layout/fragment_sample.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/layout/fragment_sample.xml
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/layout/fragment_sample.xml
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/layout/pager_item.xml b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/layout/pager_item.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/layout/pager_item.xml
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/layout/pager_item.xml
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/menu/main.xml b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values/fragmentview_strings.xml
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/tests/AndroidManifest.xml b/prebuilts/gradle/SlidingTabsBasic/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/SlidingTabsBasic/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/tests/src/com/example/android/slidingtabsbasic/tests/SampleTests.java b/prebuilts/gradle/SlidingTabsBasic/Application/tests/src/com/example/android/slidingtabsbasic/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/tests/src/com/example/android/slidingtabsbasic/tests/SampleTests.java
rename to prebuilts/gradle/SlidingTabsBasic/Application/tests/src/com/example/android/slidingtabsbasic/tests/SampleTests.java
diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/build.gradle b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/build.gradle
deleted file mode 100644
index 299b515..0000000
--- a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 4
- compile "com.android.support:support-v4:20.+"
-
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/SlidingTabsBasic/settings.gradle b/prebuilts/gradle/SlidingTabsBasic/settings.gradle
index 4accfbd..9464a35 100644
--- a/prebuilts/gradle/SlidingTabsBasic/settings.gradle
+++ b/prebuilts/gradle/SlidingTabsBasic/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'SlidingTabsBasicSample'
+include 'Application'
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle b/prebuilts/gradle/SlidingTabsColors/Application/build.gradle
similarity index 95%
copy from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
copy to prebuilts/gradle/SlidingTabsColors/Application/build.gradle
index 299b515..ef913c3 100644
--- a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
+++ b/prebuilts/gradle/SlidingTabsColors/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/AndroidManifest.xml b/prebuilts/gradle/SlidingTabsColors/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java b/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java b/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/slidingtabscolors/ContentFragment.java b/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/slidingtabscolors/ContentFragment.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/slidingtabscolors/ContentFragment.java
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/slidingtabscolors/ContentFragment.java
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/slidingtabscolors/MainActivity.java b/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/slidingtabscolors/MainActivity.java
similarity index 91%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/slidingtabscolors/MainActivity.java
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/slidingtabscolors/MainActivity.java
index b4293b6..dc1205b 100644
--- a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/slidingtabscolors/MainActivity.java
+++ b/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/slidingtabscolors/MainActivity.java
@@ -47,10 +47,12 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
- FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
- SlidingTabsColorsFragment fragment = new SlidingTabsColorsFragment();
- transaction.replace(R.id.sample_content_fragment, fragment);
- transaction.commit();
+ if (savedInstanceState == null) {
+ FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+ SlidingTabsColorsFragment fragment = new SlidingTabsColorsFragment();
+ transaction.replace(R.id.sample_content_fragment, fragment);
+ transaction.commit();
+ }
}
@Override
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/slidingtabscolors/SlidingTabsColorsFragment.java b/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/slidingtabscolors/SlidingTabsColorsFragment.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/slidingtabscolors/SlidingTabsColorsFragment.java
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/slidingtabscolors/SlidingTabsColorsFragment.java
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/res/layout-w720dp/activity_main.xml
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/layout/fragment_sample.xml b/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/layout/fragment_sample.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/layout/fragment_sample.xml
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/res/layout/fragment_sample.xml
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/layout/pager_item.xml b/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/layout/pager_item.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/layout/pager_item.xml
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/res/layout/pager_item.xml
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/menu/main.xml b/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values/fragmentview_strings.xml
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/strings.xml b/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/tests/AndroidManifest.xml b/prebuilts/gradle/SlidingTabsColors/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/SlidingTabsColors/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/tests/src/com/example/android/slidingtabscolors/tests/SampleTests.java b/prebuilts/gradle/SlidingTabsColors/Application/tests/src/com/example/android/slidingtabscolors/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/tests/src/com/example/android/slidingtabscolors/tests/SampleTests.java
rename to prebuilts/gradle/SlidingTabsColors/Application/tests/src/com/example/android/slidingtabscolors/tests/SampleTests.java
diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/build.gradle b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/build.gradle
deleted file mode 100644
index 299b515..0000000
--- a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 4
- compile "com.android.support:support-v4:20.+"
-
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/SlidingTabsColors/settings.gradle b/prebuilts/gradle/SlidingTabsColors/settings.gradle
index 3c5586a..9464a35 100644
--- a/prebuilts/gradle/SlidingTabsColors/settings.gradle
+++ b/prebuilts/gradle/SlidingTabsColors/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'SlidingTabsColorsSample'
+include 'Application'
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle b/prebuilts/gradle/StorageClient/Application/build.gradle
similarity index 95%
copy from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
copy to prebuilts/gradle/StorageClient/Application/build.gradle
index 299b515..ef913c3 100644
--- a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
+++ b/prebuilts/gradle/StorageClient/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/AndroidManifest.xml b/prebuilts/gradle/StorageClient/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/StorageClient/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/storageclient/MainActivity.java b/prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/storageclient/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/storageclient/MainActivity.java
rename to prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/storageclient/MainActivity.java
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/storageclient/StorageClientFragment.java b/prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/storageclient/StorageClientFragment.java
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/storageclient/StorageClientFragment.java
rename to prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/storageclient/StorageClientFragment.java
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/StorageClient/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/StorageClient/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/StorageClient/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/StorageClient/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/StorageClient/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/StorageClient/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/StorageClient/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/StorageClient/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/StorageClient/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/StorageClient/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/layout-sw600dp-land/activity_main.xml b/prebuilts/gradle/StorageClient/Application/src/main/res/layout-sw600dp-land/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/layout-sw600dp-land/activity_main.xml
rename to prebuilts/gradle/StorageClient/Application/src/main/res/layout-sw600dp-land/activity_main.xml
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/layout-sw600dp/activity_main.xml b/prebuilts/gradle/StorageClient/Application/src/main/res/layout-sw600dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/layout-sw600dp/activity_main.xml
rename to prebuilts/gradle/StorageClient/Application/src/main/res/layout-sw600dp/activity_main.xml
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/StorageClient/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/StorageClient/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/menu/main.xml b/prebuilts/gradle/StorageClient/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/StorageClient/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/StorageClient/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/StorageClient/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/StorageClient/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/StorageClient/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/StorageClient/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/StorageClient/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/StorageClient/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/StorageClient/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values/strings.xml b/prebuilts/gradle/StorageClient/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/StorageClient/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/StorageClient/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/StorageClient/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/StorageClient/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/StorageClient/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/tests/AndroidManifest.xml b/prebuilts/gradle/StorageClient/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/StorageClient/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/tests/src/com/example/android/storageclient/tests/SampleTests.java b/prebuilts/gradle/StorageClient/Application/tests/src/com/example/android/storageclient/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/StorageClient/StorageClientSample/tests/src/com/example/android/storageclient/tests/SampleTests.java
rename to prebuilts/gradle/StorageClient/Application/tests/src/com/example/android/storageclient/tests/SampleTests.java
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/build.gradle b/prebuilts/gradle/StorageClient/StorageClientSample/build.gradle
deleted file mode 100644
index 299b515..0000000
--- a/prebuilts/gradle/StorageClient/StorageClientSample/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 4
- compile "com.android.support:support-v4:20.+"
-
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/StorageClient/settings.gradle b/prebuilts/gradle/StorageClient/settings.gradle
index 73cfad8..9464a35 100644
--- a/prebuilts/gradle/StorageClient/settings.gradle
+++ b/prebuilts/gradle/StorageClient/settings.gradle
@@ -1 +1 @@
-include 'StorageClientSample'
+include 'Application'
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle b/prebuilts/gradle/StorageProvider/Application/build.gradle
similarity index 95%
copy from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle
copy to prebuilts/gradle/StorageProvider/Application/build.gradle
index 6150c29..a6b62fa 100644
--- a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle
+++ b/prebuilts/gradle/StorageProvider/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/AndroidManifest.xml b/prebuilts/gradle/StorageProvider/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/StorageProvider/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/storageprovider/MainActivity.java b/prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/storageprovider/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/storageprovider/MainActivity.java
rename to prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/storageprovider/MainActivity.java
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/storageprovider/MyCloudFragment.java b/prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/storageprovider/MyCloudFragment.java
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/storageprovider/MyCloudFragment.java
rename to prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/storageprovider/MyCloudFragment.java
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/storageprovider/MyCloudProvider.java b/prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/storageprovider/MyCloudProvider.java
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/storageprovider/MyCloudProvider.java
rename to prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/storageprovider/MyCloudProvider.java
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/StorageProvider/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/StorageProvider/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/StorageProvider/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/StorageProvider/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/StorageProvider/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/ic_launcher.png b/prebuilts/gradle/StorageProvider/Application/src/main/res/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/ic_launcher.png
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/layout-sw600dp-land/activity_main.xml b/prebuilts/gradle/StorageProvider/Application/src/main/res/layout-sw600dp-land/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/layout-sw600dp-land/activity_main.xml
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/layout-sw600dp-land/activity_main.xml
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/layout-sw600dp/activity_main.xml b/prebuilts/gradle/StorageProvider/Application/src/main/res/layout-sw600dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/layout-sw600dp/activity_main.xml
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/layout-sw600dp/activity_main.xml
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/StorageProvider/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/menu/main.xml b/prebuilts/gradle/StorageProvider/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/android_computer_android_studio.jpg b/prebuilts/gradle/StorageProvider/Application/src/main/res/raw/android_computer_android_studio.jpg
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/android_computer_android_studio.jpg
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/raw/android_computer_android_studio.jpg
Binary files differ
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/android_computer_back.jpg b/prebuilts/gradle/StorageProvider/Application/src/main/res/raw/android_computer_back.jpg
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/android_computer_back.jpg
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/raw/android_computer_back.jpg
Binary files differ
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/android_dinner.jpg b/prebuilts/gradle/StorageProvider/Application/src/main/res/raw/android_dinner.jpg
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/android_dinner.jpg
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/raw/android_dinner.jpg
Binary files differ
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/android_pumpkins_fall.jpg b/prebuilts/gradle/StorageProvider/Application/src/main/res/raw/android_pumpkins_fall.jpg
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/android_pumpkins_fall.jpg
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/raw/android_pumpkins_fall.jpg
Binary files differ
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/android_rose.jpg b/prebuilts/gradle/StorageProvider/Application/src/main/res/raw/android_rose.jpg
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/android_rose.jpg
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/raw/android_rose.jpg
Binary files differ
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/cat_names.txt b/prebuilts/gradle/StorageProvider/Application/src/main/res/raw/cat_names.txt
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/cat_names.txt
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/raw/cat_names.txt
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/dog_names.txt b/prebuilts/gradle/StorageProvider/Application/src/main/res/raw/dog_names.txt
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/dog_names.txt
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/raw/dog_names.txt
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/example.docx b/prebuilts/gradle/StorageProvider/Application/src/main/res/raw/example.docx
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/example.docx
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/raw/example.docx
Binary files differ
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/StorageProvider/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/StorageProvider/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/StorageProvider/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/app_strings.xml b/prebuilts/gradle/StorageProvider/Application/src/main/res/values/app_strings.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/app_strings.xml
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/values/app_strings.xml
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/arrays.xml b/prebuilts/gradle/StorageProvider/Application/src/main/res/values/arrays.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/arrays.xml
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/values/arrays.xml
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/StorageProvider/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/strings.xml b/prebuilts/gradle/StorageProvider/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/styles.xml b/prebuilts/gradle/StorageProvider/Application/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/styles.xml
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/values/styles.xml
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/StorageProvider/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/StorageProvider/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/StorageProvider/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/build.gradle b/prebuilts/gradle/StorageProvider/StorageProviderSample/build.gradle
deleted file mode 100644
index 6150c29..0000000
--- a/prebuilts/gradle/StorageProvider/StorageProviderSample/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 19
- compile "com.android.support:support-v13:20.+"
-
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/StorageProvider/settings.gradle b/prebuilts/gradle/StorageProvider/settings.gradle
index d4b818f..9464a35 100644
--- a/prebuilts/gradle/StorageProvider/settings.gradle
+++ b/prebuilts/gradle/StorageProvider/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'StorageProviderSample'
+include 'Application'
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/build.gradle b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/build.gradle
similarity index 96%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/build.gradle
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/build.gradle
index aebc50f..81a5fe9 100644
--- a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/build.gradle
+++ b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/AndroidManifest.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/dummydata/Cheeses.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/dummydata/Cheeses.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/dummydata/Cheeses.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/dummydata/Cheeses.java
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/swiperefreshlayoutbasic/MainActivity.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/swiperefreshlayoutbasic/MainActivity.java
similarity index 91%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/swiperefreshlayoutbasic/MainActivity.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/swiperefreshlayoutbasic/MainActivity.java
index 8162d4a..61e70fc 100644
--- a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/swiperefreshlayoutbasic/MainActivity.java
+++ b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/swiperefreshlayoutbasic/MainActivity.java
@@ -47,10 +47,12 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
- FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
- SwipeRefreshLayoutBasicFragment fragment = new SwipeRefreshLayoutBasicFragment();
- transaction.replace(R.id.sample_content_fragment, fragment);
- transaction.commit();
+ if (savedInstanceState == null) {
+ FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+ SwipeRefreshLayoutBasicFragment fragment = new SwipeRefreshLayoutBasicFragment();
+ transaction.replace(R.id.sample_content_fragment, fragment);
+ transaction.commit();
+ }
}
@Override
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/swiperefreshlayoutbasic/SwipeRefreshLayoutBasicFragment.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/swiperefreshlayoutbasic/SwipeRefreshLayoutBasicFragment.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/swiperefreshlayoutbasic/SwipeRefreshLayoutBasicFragment.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/swiperefreshlayoutbasic/SwipeRefreshLayoutBasicFragment.java
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/layout-w720dp/activity_main.xml
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/layout/fragment_sample.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/layout/fragment_sample.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/layout/fragment_sample.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/layout/fragment_sample.xml
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/menu/main.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/menu/main_menu.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/menu/main_menu.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/menu/main_menu.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/menu/main_menu.xml
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/colors.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values/colors.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/colors.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values/colors.xml
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values/fragmentview_strings.xml
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/strings.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/tests/AndroidManifest.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/tests/src/com/example/android/swiperefreshlayoutbasic/tests/SampleTests.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/tests/src/com/example/android/swiperefreshlayoutbasic/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/tests/src/com/example/android/swiperefreshlayoutbasic/tests/SampleTests.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/Application/tests/src/com/example/android/swiperefreshlayoutbasic/tests/SampleTests.java
diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/settings.gradle b/prebuilts/gradle/SwipeRefreshLayoutBasic/settings.gradle
index 3a38e28..9464a35 100644
--- a/prebuilts/gradle/SwipeRefreshLayoutBasic/settings.gradle
+++ b/prebuilts/gradle/SwipeRefreshLayoutBasic/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'SwipeRefreshLayoutBasicSample'
+include 'Application'
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/build.gradle b/prebuilts/gradle/SwipeRefreshListFragment/Application/build.gradle
similarity index 96%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/build.gradle
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/build.gradle
index aebc50f..81a5fe9 100644
--- a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/build.gradle
+++ b/prebuilts/gradle/SwipeRefreshListFragment/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/libs/android-support-v4.jar b/prebuilts/gradle/SwipeRefreshListFragment/Application/libs/android-support-v4.jar
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/libs/android-support-v4.jar
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/libs/android-support-v4.jar
Binary files differ
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/AndroidManifest.xml b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/dummydata/Cheeses.java b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/dummydata/Cheeses.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/dummydata/Cheeses.java
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/dummydata/Cheeses.java
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/swiperefreshlistfragment/MainActivity.java b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/swiperefreshlistfragment/MainActivity.java
similarity index 91%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/swiperefreshlistfragment/MainActivity.java
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/swiperefreshlistfragment/MainActivity.java
index 6ebf85f..ca3a5bf 100644
--- a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/swiperefreshlistfragment/MainActivity.java
+++ b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/swiperefreshlistfragment/MainActivity.java
@@ -47,10 +47,12 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
- FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
- SwipeRefreshListFragmentFragment fragment = new SwipeRefreshListFragmentFragment();
- transaction.replace(R.id.sample_content_fragment, fragment);
- transaction.commit();
+ if (savedInstanceState == null) {
+ FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+ SwipeRefreshListFragmentFragment fragment = new SwipeRefreshListFragmentFragment();
+ transaction.replace(R.id.sample_content_fragment, fragment);
+ transaction.commit();
+ }
}
@Override
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragment.java b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragment.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragment.java
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragment.java
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragmentFragment.java b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragmentFragment.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragmentFragment.java
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragmentFragment.java
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/layout-w720dp/activity_main.xml
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/menu/main.xml b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/menu/main_menu.xml b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/menu/main_menu.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/menu/main_menu.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/menu/main_menu.xml
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/colors.xml b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values/colors.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/colors.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values/colors.xml
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values/fragmentview_strings.xml
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/strings.xml b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/tests/AndroidManifest.xml b/prebuilts/gradle/SwipeRefreshListFragment/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/tests/src/com/example/android/swiperefreshlistfragment/tests/SampleTests.java b/prebuilts/gradle/SwipeRefreshListFragment/Application/tests/src/com/example/android/swiperefreshlistfragment/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/tests/src/com/example/android/swiperefreshlistfragment/tests/SampleTests.java
rename to prebuilts/gradle/SwipeRefreshListFragment/Application/tests/src/com/example/android/swiperefreshlistfragment/tests/SampleTests.java
diff --git a/prebuilts/gradle/SwipeRefreshListFragment/settings.gradle b/prebuilts/gradle/SwipeRefreshListFragment/settings.gradle
index 01af4e2..9464a35 100644
--- a/prebuilts/gradle/SwipeRefreshListFragment/settings.gradle
+++ b/prebuilts/gradle/SwipeRefreshListFragment/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'SwipeRefreshListFragmentSample'
+include 'Application'
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/build.gradle b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/build.gradle
similarity index 96%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/build.gradle
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/build.gradle
index aebc50f..81a5fe9 100644
--- a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/build.gradle
+++ b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/AndroidManifest.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/dummydata/Cheeses.java b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/dummydata/Cheeses.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/dummydata/Cheeses.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/dummydata/Cheeses.java
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/swiperefreshmultipleviews/MainActivity.java b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/MainActivity.java
similarity index 91%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/swiperefreshmultipleviews/MainActivity.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/MainActivity.java
index 0d708c9..a8bbf4d 100644
--- a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/swiperefreshmultipleviews/MainActivity.java
+++ b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/MainActivity.java
@@ -47,10 +47,12 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
- FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
- SwipeRefreshMultipleViewsFragment fragment = new SwipeRefreshMultipleViewsFragment();
- transaction.replace(R.id.sample_content_fragment, fragment);
- transaction.commit();
+ if (savedInstanceState == null) {
+ FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+ SwipeRefreshMultipleViewsFragment fragment = new SwipeRefreshMultipleViewsFragment();
+ transaction.replace(R.id.sample_content_fragment, fragment);
+ transaction.commit();
+ }
}
@Override
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/swiperefreshmultipleviews/MultiSwipeRefreshLayout.java b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/MultiSwipeRefreshLayout.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/swiperefreshmultipleviews/MultiSwipeRefreshLayout.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/MultiSwipeRefreshLayout.java
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/swiperefreshmultipleviews/SwipeRefreshMultipleViewsFragment.java b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/SwipeRefreshMultipleViewsFragment.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/swiperefreshmultipleviews/SwipeRefreshMultipleViewsFragment.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/SwipeRefreshMultipleViewsFragment.java
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/layout-w720dp/activity_main.xml
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/layout/fragment_sample.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/layout/fragment_sample.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/layout/fragment_sample.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/layout/fragment_sample.xml
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/menu/main.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/menu/main.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/menu/main.xml
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/menu/main_menu.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/menu/main_menu.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/menu/main_menu.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/menu/main_menu.xml
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/color.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values/color.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/color.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values/color.xml
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values/fragmentview_strings.xml
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/strings.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/tests/AndroidManifest.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/tests/AndroidManifest.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/tests/src/com/example/android/swiperefreshmultipleviews/tests/SampleTests.java b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/tests/src/com/example/android/swiperefreshmultipleviews/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/tests/src/com/example/android/swiperefreshmultipleviews/tests/SampleTests.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/Application/tests/src/com/example/android/swiperefreshmultipleviews/tests/SampleTests.java
diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/settings.gradle b/prebuilts/gradle/SwipeRefreshMultipleViews/settings.gradle
index 716f424..9464a35 100644
--- a/prebuilts/gradle/SwipeRefreshMultipleViews/settings.gradle
+++ b/prebuilts/gradle/SwipeRefreshMultipleViews/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'SwipeRefreshMultipleViewsSample'
+include 'Application'
diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/build.gradle b/prebuilts/gradle/SynchronizedNotifications/Application/build.gradle
similarity index 77%
copy from prebuilts/gradle/MediaRouter/MediaRouterSample/build.gradle
copy to prebuilts/gradle/SynchronizedNotifications/Application/build.gradle
index a374e37..5d83798 100644
--- a/prebuilts/gradle/MediaRouter/MediaRouterSample/build.gradle
+++ b/prebuilts/gradle/SynchronizedNotifications/Application/build.gradle
@@ -8,17 +8,17 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
- // Add the support lib that is appropriate for SDK 4
- compile "com.android.support:support-v4:20.+"
+ compile 'com.google.android.gms:play-services:5.0.+@aar'
+ compile 'com.android.support:support-v13:20.0.+'
+ compile project(':Shared')
+ wearApp project(':Wearable')
- compile "com.android.support:appcompat-v7:+"
- compile "com.android.support:mediarouter-v7:+"
}
// The sample build uses multiple directories to
@@ -30,7 +30,7 @@
'template'] // boilerplate code that is generated by the sample template process
android {
- compileSdkVersion 19
+ compileSdkVersion 20
buildToolsVersion "20"
@@ -45,6 +45,7 @@
androidTest.java.srcDirs = ['tests/src']
}
+
}
diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..c46f772
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/AndroidManifest.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
+
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.example.android.synchronizednotifications"
+ android:versionCode="1"
+ android:versionName="1.0">
+
+ <uses-sdk android:minSdkVersion="19"
+ android:targetSdkVersion="19" />
+
+ <application android:allowBackup="true"
+ android:label="@string/app_name"
+ android:icon="@drawable/ic_launcher"
+ android:theme="@style/AppTheme">
+
+ <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
+
+ <activity android:name=".MainActivity"
+ android:label="@string/app_name"
+ android:uiOptions="splitActionBarWhenNarrow">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+ <service android:name=".DismissListener">
+ <intent-filter>
+ <action
+ android:name="com.google.android.gms.wearable.BIND_LISTENER" />
+ </intent-filter>
+ <intent-filter>
+ <action
+ android:name="com.example.android.wearable.synchronizednotifications.DISMISS" />
+ </intent-filter>
+ </service>
+ </application>
+
+
+</manifest>
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
copy from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
copy to prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
copy from prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/Log.java
copy to prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
copy from prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/LogFragment.java
copy to prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
copy from prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/LogNode.java
copy to prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
copy from prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/LogView.java
copy to prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
copy from prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/LogWrapper.java
copy to prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
copy from prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
copy to prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/synchronizednotifications/DismissListener.java b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/synchronizednotifications/DismissListener.java
new file mode 100644
index 0000000..8648148
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/synchronizednotifications/DismissListener.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.synchronizednotifications;
+
+import static com.google.android.gms.wearable.PutDataRequest.WEAR_URI_SCHEME;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v4.app.NotificationManagerCompat;
+import android.util.Log;
+
+import com.example.android.synchronizednotifications.common.Constants;
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.api.GoogleApiClient;
+import com.google.android.gms.common.api.ResultCallback;
+import com.google.android.gms.wearable.DataApi;
+import com.google.android.gms.wearable.DataEvent;
+import com.google.android.gms.wearable.DataEventBuffer;
+import com.google.android.gms.wearable.PutDataMapRequest;
+import com.google.android.gms.wearable.Wearable;
+import com.google.android.gms.wearable.WearableListenerService;
+
+/**
+ * A {@link com.google.android.gms.wearable.WearableListenerService} that is invoked when certain
+ * notifications are dismissed from either the phone or watch.
+ */
+public class DismissListener extends WearableListenerService
+ implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener,
+ ResultCallback<DataApi.DeleteDataItemsResult> {
+
+ private static final String TAG = "DismissListener";
+ private GoogleApiClient mGoogleApiClient;
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+ mGoogleApiClient = new GoogleApiClient.Builder(this)
+ .addApi(Wearable.API)
+ .addConnectionCallbacks(this)
+ .addOnConnectionFailedListener(this)
+ .build();
+ }
+
+ @Override
+ public void onDataChanged(DataEventBuffer dataEvents) {
+ for (DataEvent dataEvent : dataEvents) {
+ if (dataEvent.getType() == DataEvent.TYPE_DELETED) {
+ if (Constants.BOTH_PATH.equals(dataEvent.getDataItem().getUri().getPath())) {
+ // notification on the phone should be dismissed
+ NotificationManagerCompat.from(this).cancel(Constants.BOTH_ID);
+ }
+ }
+ }
+ }
+
+ @Override
+ public int onStartCommand(Intent intent, int flags, int startId) {
+ if (null != intent) {
+ String action = intent.getAction();
+ if (Constants.ACTION_DISMISS.equals(action)) {
+ // We need to dismiss the wearable notification. We delete the DataItem that
+ // created the notification to inform the wearable.
+ int notificationId = intent.getIntExtra(Constants.KEY_NOTIFICATION_ID, -1);
+ if (notificationId == Constants.BOTH_ID) {
+ dismissWearableNotification(notificationId);
+ }
+ }
+ }
+ return super.onStartCommand(intent, flags, startId);
+ }
+
+ /**
+ * Removes the DataItem that was used to create a notification on the watch. By deleting the
+ * data item, a {@link com.google.android.gms.wearable.WearableListenerService} on the watch
+ * will be notified and the notification on the watch will be removed. To
+ * access the Wearable DataApi, we first need to ensure the GoogleApiClient is ready,
+ * which will then run the onConnected callback were the data removal is
+ * defined.
+ *
+ * @param id The ID of the notification that should be removed
+ */
+ private void dismissWearableNotification(final int id) {
+ mGoogleApiClient.connect();
+ }
+
+ @Override // ConnectionCallbacks
+ public void onConnected(Bundle bundle) {
+ final Uri dataItemUri =
+ new Uri.Builder().scheme(WEAR_URI_SCHEME).path(Constants.BOTH_PATH).build();
+ if (Log.isLoggable(TAG, Log.DEBUG)) {
+ Log.d(TAG, "Deleting Uri: " + dataItemUri.toString());
+ }
+ Wearable.DataApi.deleteDataItems(
+ mGoogleApiClient, dataItemUri).setResultCallback(this);
+ }
+
+ @Override // ConnectionCallbacks
+ public void onConnectionSuspended(int i) {
+ }
+
+ @Override // OnConnectionFailedListener
+ public void onConnectionFailed(ConnectionResult connectionResult) {
+ Log.e(TAG, "Failed to connect to the Google API client");
+ }
+
+ @Override // ResultCallback<DataApi.DeleteDataItemsResult>
+ public void onResult(DataApi.DeleteDataItemsResult deleteDataItemsResult) {
+ if (!deleteDataItemsResult.getStatus().isSuccess()) {
+ Log.e(TAG, "dismissWearableNotification(): failed to delete DataItem");
+ }
+ mGoogleApiClient.disconnect();
+ }
+}
diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/basictransition/MainActivity.java b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/synchronizednotifications/MainActivity.java
similarity index 60%
copy from prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/basictransition/MainActivity.java
copy to prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/synchronizednotifications/MainActivity.java
index 32158b7..44b7ff7 100644
--- a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/basictransition/MainActivity.java
+++ b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/synchronizednotifications/MainActivity.java
@@ -14,13 +14,12 @@
* limitations under the License.
*/
-package com.example.android.basictransition;
+package com.example.android.synchronizednotifications;
+import android.graphics.Color;
import android.os.Bundle;
import android.support.v4.app.FragmentTransaction;
import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.ViewAnimator;
import com.example.android.common.activities.SampleActivityBase;
import com.example.android.common.logger.Log;
@@ -29,18 +28,14 @@
import com.example.android.common.logger.MessageOnlyLogFilter;
/**
- * A simple launcher activity containing a summary sample description, sample log and a custom
- * {@link android.support.v4.app.Fragment} which can display a view.
- * <p>
- * For devices with displays with a width of 720dp or greater, the sample log is always visible,
- * on other devices it's visibility is controlled by an item on the Action Bar.
+ * A simple launcher activity containing a summary sample description
+ * and a few action bar buttons.
*/
public class MainActivity extends SampleActivityBase {
public static final String TAG = "MainActivity";
- // Whether the Log Fragment is currently shown
- private boolean mLogShown;
+ public static final String FRAGTAG = "SynchronizedNotificationsFragment";
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -48,8 +43,8 @@
setContentView(R.layout.activity_main);
FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
- BasicTransitionFragment fragment = new BasicTransitionFragment();
- transaction.replace(R.id.sample_content_fragment, fragment);
+ SynchronizedNotificationsFragment fragment = new SynchronizedNotificationsFragment();
+ transaction.add(fragment, FRAGTAG);
transaction.commit();
}
@@ -59,32 +54,6 @@
return true;
}
- @Override
- public boolean onPrepareOptionsMenu(Menu menu) {
- MenuItem logToggle = menu.findItem(R.id.menu_toggle_log);
- logToggle.setVisible(findViewById(R.id.sample_output) instanceof ViewAnimator);
- logToggle.setTitle(mLogShown ? R.string.sample_hide_log : R.string.sample_show_log);
-
- return super.onPrepareOptionsMenu(menu);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch(item.getItemId()) {
- case R.id.menu_toggle_log:
- mLogShown = !mLogShown;
- ViewAnimator output = (ViewAnimator) findViewById(R.id.sample_output);
- if (mLogShown) {
- output.setDisplayedChild(1);
- } else {
- output.setDisplayedChild(0);
- }
- supportInvalidateOptionsMenu();
- return true;
- }
- return super.onOptionsItemSelected(item);
- }
-
/** Create a chain of targets that will receive log data */
@Override
public void initializeLogging() {
@@ -101,7 +70,9 @@
LogFragment logFragment = (LogFragment) getSupportFragmentManager()
.findFragmentById(R.id.log_fragment);
msgFilter.setNext(logFragment.getLogView());
+ logFragment.getLogView().setTextAppearance(this, R.style.Log);
+ logFragment.getLogView().setBackgroundColor(Color.WHITE);
Log.i(TAG, "Ready");
}
-}
+}
\ No newline at end of file
diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/synchronizednotifications/SynchronizedNotificationsFragment.java b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/synchronizednotifications/SynchronizedNotificationsFragment.java
new file mode 100644
index 0000000..d4b9f6a
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/synchronizednotifications/SynchronizedNotificationsFragment.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.synchronizednotifications;
+
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.support.v4.app.Fragment;
+import android.app.Activity;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v4.app.NotificationCompat;
+import android.support.v4.app.NotificationManagerCompat;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.example.android.synchronizednotifications.common.Constants;
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.api.GoogleApiClient;
+import com.google.android.gms.common.api.ResultCallback;
+import com.google.android.gms.wearable.DataApi;
+import com.google.android.gms.wearable.PutDataMapRequest;
+import com.google.android.gms.wearable.PutDataRequest;
+import com.google.android.gms.wearable.Wearable;
+
+import java.text.DateFormat;
+import java.util.Date;
+
+
+/**
+ * A simple fragment that presents three buttons that would trigger three different combinations of
+ * notifications on the handset and the watch:
+ * <ul>
+ * <li>The first button builds a simple local-only notification on the handset.</li>
+ * <li>The second one creates a wearable-only notification by putting a data item in the shared data
+ * store and having a {@link com.google.android.gms.wearable.WearableListenerService} listen for
+ * that on the wearable</li>
+ * <li>The third one creates a local notification and a wearable notification by combining the above
+ * two. It, however, demonstrates how one can set things up so that the dismissal of one
+ * notification results in the dismissal of the other one.</li>
+ * </ul>
+ */
+public class SynchronizedNotificationsFragment extends Fragment
+ implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener {
+
+ private static final String TAG = "SynchronizedNotificationsFragment";
+ private GoogleApiClient mGoogleApiClient;
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ mGoogleApiClient = new GoogleApiClient.Builder(this.getActivity())
+ .addApi(Wearable.API)
+ .addConnectionCallbacks(this)
+ .addOnConnectionFailedListener(this)
+ .build();
+ setHasOptionsMenu(true);
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case R.id.btn_phone_only:
+ buildLocalOnlyNotification(getString(R.string.phone_only), now(),
+ Constants.PHONE_ONLY_ID, false);
+ return true;
+ case R.id.btn_wear_only:
+ buildWearableOnlyNotification(getString(R.string.wear_only), now(),
+ Constants.WATCH_ONLY_PATH);
+ return true;
+ case R.id.btn_different:
+ buildMirroredNotifications(getString(R.string.phone_both), getString(R.string.watch_both), now());
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Builds a local-only notification for the handset. This is achieved by using
+ * <code>setLocalOnly(true)</code>. If <code>withDismissal</code> is set to <code>true</code>, a
+ * {@link android.app.PendingIntent} will be added to handle the dismissal of notification to
+ * be able to remove the mirrored notification on the wearable.
+ */
+ private void buildLocalOnlyNotification(String title, String content, int notificationId,
+ boolean withDismissal) {
+ NotificationCompat.Builder builder = new NotificationCompat.Builder(this.getActivity());
+ builder.setContentTitle(title)
+ .setContentText(content)
+ .setLocalOnly(true)
+ .setSmallIcon(R.drawable.ic_launcher);
+
+ if (withDismissal) {
+ Intent dismissIntent = new Intent(Constants.ACTION_DISMISS);
+ dismissIntent.putExtra(Constants.KEY_NOTIFICATION_ID, Constants.BOTH_ID);
+ PendingIntent pendingIntent = PendingIntent
+ .getService(this.getActivity(), 0, dismissIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+ builder.setDeleteIntent(pendingIntent);
+ }
+ NotificationManagerCompat.from(this.getActivity()).notify(notificationId, builder.build());
+ }
+
+ /**
+ * Builds a DataItem that on the wearable will be interpreted as a request to show a
+ * notification. The result will be a notification that only shows up on the wearable.
+ */
+ private void buildWearableOnlyNotification(String title, String content, String path) {
+ if (mGoogleApiClient.isConnected()) {
+ PutDataMapRequest putDataMapRequest = PutDataMapRequest.create(path);
+ putDataMapRequest.getDataMap().putString(Constants.KEY_CONTENT, content);
+ putDataMapRequest.getDataMap().putString(Constants.KEY_TITLE, title);
+ PutDataRequest request = putDataMapRequest.asPutDataRequest();
+ Wearable.DataApi.putDataItem(mGoogleApiClient, request)
+ .setResultCallback(new ResultCallback<DataApi.DataItemResult>() {
+ @Override
+ public void onResult(DataApi.DataItemResult dataItemResult) {
+ if (!dataItemResult.getStatus().isSuccess()) {
+ Log.e(TAG, "buildWatchOnlyNotification(): Failed to set the data, "
+ + "status: " + dataItemResult.getStatus().getStatusCode());
+ }
+ }
+ });
+ } else {
+ Log.e(TAG, "buildWearableOnlyNotification(): no Google API Client connection");
+ }
+ }
+
+ /**
+ * Builds a local notification and sets a DataItem that will be interpreted by the wearable as
+ * a request to build a notification on the wearable as as well. The two notifications show
+ * different messages.
+ * Dismissing either of the notifications will result in dismissal of the other; this is
+ * achieved by creating a {@link android.app.PendingIntent} that results in removal of
+ * the DataItem that created the watch notification. The deletion of the DataItem is observed on
+ * both sides, using WearableListenerService callbacks, and is interpreted on each side as a
+ * request to dismiss the corresponding notification.
+ */
+ private void buildMirroredNotifications(String phoneTitle, String watchTitle, String content) {
+ if (mGoogleApiClient.isConnected()) {
+ // Wearable notification
+ buildWearableOnlyNotification(watchTitle, content, Constants.BOTH_PATH);
+
+ // Local notification, with a pending intent for dismissal
+ buildLocalOnlyNotification(phoneTitle, content, Constants.BOTH_ID, true);
+ }
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ mGoogleApiClient.connect();
+ }
+
+ @Override
+ public void onStop() {
+ mGoogleApiClient.disconnect();
+ super.onStop();
+ }
+
+ @Override
+ public void onConnected(Bundle bundle) {
+ }
+
+ @Override
+ public void onConnectionSuspended(int i) {
+ }
+
+ @Override
+ public void onConnectionFailed(ConnectionResult connectionResult) {
+ Log.e(TAG, "Failed to connect to Google API Client");
+ }
+
+ /**
+ * Returns a string built from the current time
+ */
+ private String now() {
+ DateFormat dateFormat = android.text.format.DateFormat.getTimeFormat(this.getActivity());
+ return dateFormat.format(new Date());
+ }
+
+}
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
copy from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-hdpi/ic_launcher.png
copy to prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
copy from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-hdpi/tile.9.png
copy to prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
copy from prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-mdpi/ic_launcher.png
copy to prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
copy from prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-xhdpi/ic_launcher.png
copy to prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
copy from prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/drawable-xxhdpi/ic_launcher.png
copy to prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/layout-sw600dp-land/activity_main.xml b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/layout-sw600dp-land/activity_main.xml
old mode 100755
new mode 100644
similarity index 100%
copy from prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/layout-sw600dp-land/activity_main.xml
copy to prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/layout-sw600dp-land/activity_main.xml
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/layout-sw600dp/activity_main.xml b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/layout-sw600dp/activity_main.xml
similarity index 100%
copy from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/layout-sw600dp/activity_main.xml
copy to prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/layout-sw600dp/activity_main.xml
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/layout/activity_main.xml
old mode 100755
new mode 100644
similarity index 100%
copy from prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/layout/activity_main.xml
copy to prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/menu/main.xml b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/menu/main.xml
new file mode 100644
index 0000000..165c0a8
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/menu/main.xml
@@ -0,0 +1,30 @@
+<!--
+ 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.
+ -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:id="@+id/btn_phone_only"
+ android:showAsAction="always"
+ android:title="@string/phone_only" />
+
+ <item android:id="@+id/btn_wear_only"
+ android:showAsAction="always"
+ android:title="@string/wear_only" />
+
+ <item android:id="@+id/btn_different"
+ android:showAsAction="always"
+ android:title="@string/different_notifications" />
+
+</menu>
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
copy from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values-sw600dp/template-dimens.xml
copy to prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
copy from prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values-sw600dp/template-styles.xml
copy to prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
copy from prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values-v11/template-styles.xml
copy to prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values/base-strings.xml
new file mode 100644
index 0000000..8b6d8ff
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values/base-strings.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<resources>
+ <string name="app_name">SynchronizedNotifications</string>
+ <string name="intro_message">
+ <![CDATA[
+
+
+ This sample creates simple or synchronized notifications on a
+ device and an Android Wear watch.
+
+
+ ]]>
+ </string>
+</resources>
diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values/dimens.xml b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..a1e9cfe
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values/dimens.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<resources>
+ <!-- Default screen margins, per the Android Design guidelines. -->
+ <dimen name="activity_horizontal_margin">16dp</dimen>
+ <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values/sample-strings.xml b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values/sample-strings.xml
new file mode 100644
index 0000000..8ac6bf2
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values/sample-strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<resources>
+
+ <string name="wear_only">Watch Only</string>
+ <string name="phone_only">Phone Only</string>
+ <string name="different_notifications">Both</string>
+ <string name="phone_both">Phone Notification</string>
+ <string name="watch_both">Watch Notification</string>
+
+</resources>
diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values/template-dimens.xml
similarity index 100%
copy from prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values/template-dimens.xml
copy to prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values/template-styles.xml
similarity index 100%
copy from prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values/template-styles.xml
copy to prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/tests/AndroidManifest.xml b/prebuilts/gradle/SynchronizedNotifications/Application/tests/AndroidManifest.xml
new file mode 100644
index 0000000..559ee23
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/Application/tests/AndroidManifest.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 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.
+ -->
+<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.example.android.synchronizednotifications.tests"
+ android:versionCode="1"
+ android:versionName="1.0">
+
+ <uses-sdk
+ android:minSdkVersion="18"
+ android:targetSdkVersion="19" />
+
+ <!-- We add an application tag here just so that we can indicate that
+ this package needs to link against the android.test library,
+ which is needed when building test cases. -->
+ <application>
+ <uses-library android:name="android.test.runner" />
+ </application>
+
+ <!--
+ Specifies the instrumentation test runner used to run the tests.
+ -->
+ <instrumentation
+ android:name="android.test.InstrumentationTestRunner"
+ android:targetPackage="com.example.android.synchronizednotifications"
+ android:label="Tests for com.example.android.synchronizednotifications" />
+
+</manifest>
diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/tests/src/com/example/android/synchronizednotifications/tests/SampleTests.java b/prebuilts/gradle/SynchronizedNotifications/Application/tests/src/com/example/android/synchronizednotifications/tests/SampleTests.java
new file mode 100644
index 0000000..7f8df42
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/Application/tests/src/com/example/android/synchronizednotifications/tests/SampleTests.java
@@ -0,0 +1,57 @@
+/*
+* Copyright (C) 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.
+*/
+package com.example.android.synchronizednotifications.tests;
+
+import com.example.android.synchronizednotifications.*;
+
+import android.test.ActivityInstrumentationTestCase2;
+
+/**
+* Tests for SynchronizedNotifications sample.
+*/
+public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
+
+ private MainActivity mTestActivity;
+ private SynchronizedNotificationsFragment mTestFragment;
+
+ public SampleTests() {
+ super(MainActivity.class);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ // Starts the activity under test using the default Intent with:
+ // action = {@link Intent#ACTION_MAIN}
+ // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
+ // All other fields are null or empty.
+ mTestActivity = getActivity();
+ mTestFragment = (SynchronizedNotificationsFragment)
+ mTestActivity.getSupportFragmentManager().getFragments().get(1);
+ }
+
+ /**
+ * Test if the test fixture has been set up correctly.
+ */
+ public void testPreconditions() {
+ //Try to add a message to add context to your assertions. These messages will be shown if
+ //a tests fails and make it easy to understand why a test failed
+ assertNotNull("mTestActivity is null", mTestActivity);
+ assertNotNull("mTestFragment is null", mTestFragment);
+ }
+
+}
diff --git a/prebuilts/gradle/SynchronizedNotifications/CONTRIB.md b/prebuilts/gradle/SynchronizedNotifications/CONTRIB.md
new file mode 100644
index 0000000..14a4fcf
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/CONTRIB.md
@@ -0,0 +1,35 @@
+# How to become a contributor and submit your own code
+
+## Contributor License Agreements
+
+We'd love to accept your sample apps and patches! Before we can take them, we
+have to jump a couple of legal hurdles.
+
+Please fill out either the individual or corporate Contributor License Agreement (CLA).
+
+ * If you are an individual writing original source code and you're sure you
+ own the intellectual property, then you'll need to sign an [individual CLA]
+ (https://developers.google.com/open-source/cla/individual).
+ * If you work for a company that wants to allow you to contribute your work,
+ then you'll need to sign a [corporate CLA]
+ (https://developers.google.com/open-source/cla/corporate).
+
+Follow either of the two links above to access the appropriate CLA and
+instructions for how to sign and return it. Once we receive it, we'll be able to
+accept your pull requests.
+
+## Contributing A Patch
+
+1. Submit an issue describing your proposed change to the repo in question.
+1. The repo owner will respond to your issue promptly.
+1. If your proposed change is accepted, and you haven't already done so, sign a
+ Contributor License Agreement (see details above).
+1. Fork the desired repo, develop and test your code changes.
+1. Ensure that your code adheres to the existing style in the sample to which
+ you are contributing. Refer to the
+ [Android Code Style Guide]
+ (https://source.android.com/source/code-style.html) for the
+ recommended coding standards for this organization.
+1. Ensure that your code has an appropriate set of unit tests which all pass.
+1. Submit a pull request.
+
diff --git a/prebuilts/gradle/SynchronizedNotifications/LICENSE b/prebuilts/gradle/SynchronizedNotifications/LICENSE
new file mode 100644
index 0000000..1af981f
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright 2014 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.
diff --git a/prebuilts/gradle/SynchronizedNotifications/README-wear.txt b/prebuilts/gradle/SynchronizedNotifications/README-wear.txt
new file mode 100644
index 0000000..17523d7
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/README-wear.txt
@@ -0,0 +1,30 @@
+<#--
+ Copyright 2014 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 use Wear template on top of an existing sample:
+- In template-params.xml.ftl:
+ - Add the following template:
+ <template src="Wear"/>
+
+- Refresh your project (./gradlew refresh)
+- Add Wearable-specific code to Wearable directory
+- Add code to be shared among the main application and the wearable to Shared
+ directory
+
+Note that you still need the main application sample code. This is usually
+achieved by adding another template, like "base" for example.
+
+
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle b/prebuilts/gradle/SynchronizedNotifications/Shared/build.gradle
similarity index 72%
copy from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
copy to prebuilts/gradle/SynchronizedNotifications/Shared/build.gradle
index 299b515..8ae40aa 100644
--- a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
+++ b/prebuilts/gradle/SynchronizedNotifications/Shared/build.gradle
@@ -8,16 +8,7 @@
}
}
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 4
- compile "com.android.support:support-v4:20.+"
-
-
-}
+apply plugin: 'android-library'
// The sample build uses multiple directories to
// keep boilerplate and common code separate from
@@ -30,7 +21,7 @@
android {
compileSdkVersion 19
- buildToolsVersion "20"
+ buildToolsVersion '20'
sourceSets {
main {
@@ -39,23 +30,6 @@
res.srcDirs "src/${dir}/res"
}
}
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
}
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/SynchronizedNotifications/Shared/src/main/AndroidManifest.xml b/prebuilts/gradle/SynchronizedNotifications/Shared/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..7235ace
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/Shared/src/main/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.example.android.synchronizednotifications.common">
+
+ <application android:allowBackup="true"
+ android:label="@string/app_name">
+ </application>
+
+</manifest>
diff --git a/prebuilts/gradle/SynchronizedNotifications/Shared/src/main/java/com/example/android/synchronizednotifications/common/Constants.java b/prebuilts/gradle/SynchronizedNotifications/Shared/src/main/java/com/example/android/synchronizednotifications/common/Constants.java
new file mode 100644
index 0000000..5a45583
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/Shared/src/main/java/com/example/android/synchronizednotifications/common/Constants.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 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.
+ */
+package com.example.android.synchronizednotifications.common;
+
+/**
+ * Constants that are used in both the Application and the Wearable modules.
+ */
+public final class Constants {
+
+ private Constants() {};
+
+ public static final int WATCH_ONLY_ID = 2;
+ public static final int PHONE_ONLY_ID = 3;
+ public static final int BOTH_ID = 4;
+
+ public static final String BOTH_PATH = "/both";
+ public static final String WATCH_ONLY_PATH = "/watch-only";
+ public static final String KEY_NOTIFICATION_ID = "notification-id";
+ public static final String KEY_TITLE = "title";
+ public static final String KEY_CONTENT = "content";
+
+ public static final String ACTION_DISMISS
+ = "com.example.android.synchronizednotifications.DISMISS";
+}
diff --git a/prebuilts/gradle/SynchronizedNotifications/Shared/src/main/res/values/strings.xml b/prebuilts/gradle/SynchronizedNotifications/Shared/src/main/res/values/strings.xml
new file mode 100644
index 0000000..4a466aa
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/Shared/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+ <string name="app_name">Shared</string>
+</resources>
diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/build.gradle b/prebuilts/gradle/SynchronizedNotifications/Wearable/build.gradle
similarity index 65%
copy from prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/build.gradle
copy to prebuilts/gradle/SynchronizedNotifications/Wearable/build.gradle
index 14a29ec..1e392e1 100644
--- a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/build.gradle
+++ b/prebuilts/gradle/SynchronizedNotifications/Wearable/build.gradle
@@ -8,17 +8,15 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
+
dependencies {
-
- // Add the support lib that is appropriate for SDK 8
- compile "com.android.support:support-v4:20.+"
- compile "com.android.support:gridlayout-v7:20.+"
-
-
- compile files('renderscript-v8.jar')
+ compile 'com.google.android.gms:play-services:5.0.+@aar'
+ compile 'com.android.support:support-v13:20.0.+'
+ compile 'com.google.android.support:wearable:1.0.+'
+ compile project(':Shared')
}
// The sample build uses multiple directories to
@@ -30,10 +28,16 @@
'template'] // boilerplate code that is generated by the sample template process
android {
- compileSdkVersion 19
+ compileSdkVersion 'android-20'
- buildToolsVersion "20"
+ buildToolsVersion '20'
+ buildTypes {
+ release {
+ runProguard false
+ proguardFiles getDefaultProguardFile('proguard-android.txt')
+ }
+ }
sourceSets {
main {
dirs.each { dir ->
@@ -44,12 +48,6 @@
androidTest.setRoot('tests')
androidTest.java.srcDirs = ['tests/src']
- defaultConfig {
-
- renderscriptTargetApi 18
- renderscriptSupportMode true
-
- }
}
}
@@ -67,3 +65,4 @@
+
diff --git a/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/AndroidManifest.xml b/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..97702ce
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/AndroidManifest.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.example.android.synchronizednotifications">
+
+ <uses-sdk android:minSdkVersion="20"
+ android:targetSdkVersion="20" />
+
+ <uses-feature android:name="android.hardware.type.watch" />
+
+ <application
+ android:allowBackup="true"
+ android:icon="@drawable/ic_launcher"
+ android:label="@string/app_name"
+ android:theme="@android:style/Theme.DeviceDefault.Light" >
+ <meta-data android:name="com.google.android.gms.version"
+ android:value="@integer/google_play_services_version" />
+ <activity
+ android:name=".WearableActivity"
+ android:label="@string/app_name" >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+ <service android:name=".NotificationUpdateService">
+ <intent-filter>
+ <action
+ android:name="com.google.android.gms.wearable.BIND_LISTENER" />
+ </intent-filter>
+ <intent-filter>
+ <action
+ android:name="com.example.android.synchronizednotifications.DISMISS" />
+ </intent-filter>
+ </service>
+
+ </application>
+
+</manifest>
diff --git a/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/java/com/example/android/synchronizednotifications/NotificationUpdateService.java b/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/java/com/example/android/synchronizednotifications/NotificationUpdateService.java
new file mode 100644
index 0000000..cf8432c
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/java/com/example/android/synchronizednotifications/NotificationUpdateService.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.synchronizednotifications;
+
+import static com.google.android.gms.wearable.PutDataRequest.WEAR_URI_SCHEME;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.example.android.synchronizednotifications.common.Constants;
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.api.GoogleApiClient;
+import com.google.android.gms.common.api.ResultCallback;
+import com.google.android.gms.wearable.DataApi;
+import com.google.android.gms.wearable.DataEvent;
+import com.google.android.gms.wearable.DataEventBuffer;
+import com.google.android.gms.wearable.DataMap;
+import com.google.android.gms.wearable.DataMapItem;
+import com.google.android.gms.wearable.PutDataMapRequest;
+import com.google.android.gms.wearable.Wearable;
+import com.google.android.gms.wearable.WearableListenerService;
+
+/**
+ * A {@link com.google.android.gms.wearable.WearableListenerService} that will be invoked when a
+ * DataItem is added or deleted. The creation of a new DataItem will be interpreted as a request to
+ * create a new notification and the removal of that DataItem is interpreted as a request to
+ * dismiss that notification.
+ */
+public class NotificationUpdateService extends WearableListenerService
+ implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener,
+ ResultCallback<DataApi.DeleteDataItemsResult> {
+
+ private static final String TAG = "NotificationUpdate";
+ private GoogleApiClient mGoogleApiClient;
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+ mGoogleApiClient = new GoogleApiClient.Builder(this)
+ .addApi(Wearable.API)
+ .addConnectionCallbacks(this)
+ .addOnConnectionFailedListener(this)
+ .build();
+ }
+
+ @Override
+ public int onStartCommand(Intent intent, int flags, int startId) {
+ if (null != intent) {
+ String action = intent.getAction();
+ if (Constants.ACTION_DISMISS.equals(action)) {
+ // We need to dismiss the wearable notification. We delete the data item that
+ // created the notification and that is how we inform the phone
+ int notificationId = intent.getIntExtra(Constants.KEY_NOTIFICATION_ID, -1);
+ if (notificationId == Constants.BOTH_ID) {
+ dismissPhoneNotification(notificationId);
+ }
+ }
+ }
+ return super.onStartCommand(intent, flags, startId);
+ }
+
+ /**
+ * Dismisses the phone notification, via a {@link android.app.PendingIntent} that is triggered
+ * when the user dismisses the local notification. Deleting the corresponding data item notifies
+ * the {@link com.google.android.gms.wearable.WearableListenerService} on the phone that the
+ * matching notification on the phone side should be removed.
+ */
+ private void dismissPhoneNotification(int id) {
+ mGoogleApiClient.connect();
+ }
+
+ @Override
+ public void onDataChanged(DataEventBuffer dataEvents) {
+ for (DataEvent dataEvent : dataEvents) {
+ if (dataEvent.getType() == DataEvent.TYPE_CHANGED) {
+ DataMap dataMap = DataMapItem.fromDataItem(dataEvent.getDataItem()).getDataMap();
+ String content = dataMap.getString(Constants.KEY_CONTENT);
+ String title = dataMap.getString(Constants.KEY_TITLE);
+ if (Constants.WATCH_ONLY_PATH.equals(dataEvent.getDataItem().getUri().getPath())) {
+ buildWearableOnlyNotification(title, content, false);
+ } else if (Constants.BOTH_PATH.equals(dataEvent.getDataItem().getUri().getPath())) {
+ buildWearableOnlyNotification(title, content, true);
+ }
+ } else if (dataEvent.getType() == DataEvent.TYPE_DELETED) {
+ if (Log.isLoggable(TAG, Log.DEBUG)) {
+ Log.d(TAG, "DataItem deleted: " + dataEvent.getDataItem().getUri().getPath());
+ }
+ if (Constants.BOTH_PATH.equals(dataEvent.getDataItem().getUri().getPath())) {
+ // Dismiss the corresponding notification
+ ((NotificationManager) getSystemService(NOTIFICATION_SERVICE))
+ .cancel(Constants.BOTH_ID);
+ }
+ }
+ }
+ }
+
+ /**
+ * Builds a simple notification on the wearable.
+ */
+ private void buildWearableOnlyNotification(String title, String content,
+ boolean withDismissal) {
+ Notification.Builder builder = new Notification.Builder(this)
+ .setSmallIcon(R.drawable.ic_launcher)
+ .setContentTitle(title)
+ .setContentText(content);
+
+ if (withDismissal) {
+ Intent dismissIntent = new Intent(Constants.ACTION_DISMISS);
+ dismissIntent.putExtra(Constants.KEY_NOTIFICATION_ID, Constants.BOTH_ID);
+ PendingIntent pendingIntent = PendingIntent
+ .getService(this, 0, dismissIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+ builder.setDeleteIntent(pendingIntent);
+ }
+
+ ((NotificationManager) getSystemService(NOTIFICATION_SERVICE))
+ .notify(Constants.WATCH_ONLY_ID, builder.build());
+ }
+
+ @Override
+ public void onConnected(Bundle bundle) {
+ final Uri dataItemUri =
+ new Uri.Builder().scheme(WEAR_URI_SCHEME).path(Constants.BOTH_PATH).build();
+ if (Log.isLoggable(TAG, Log.DEBUG)) {
+ Log.d(TAG, "Deleting Uri: " + dataItemUri.toString());
+ }
+ Wearable.DataApi.deleteDataItems(
+ mGoogleApiClient, dataItemUri).setResultCallback(this);
+ }
+
+ @Override
+ public void onConnectionSuspended(int i) {
+ }
+
+ @Override
+ public void onConnectionFailed(ConnectionResult connectionResult) {
+ }
+
+ @Override
+ public void onResult(DataApi.DeleteDataItemsResult deleteDataItemsResult) {
+ if (!deleteDataItemsResult.getStatus().isSuccess()) {
+ Log.e(TAG, "dismissWearableNotification(): failed to delete DataItem");
+ }
+ mGoogleApiClient.disconnect();
+ }
+}
diff --git a/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/java/com/example/android/synchronizednotifications/WearableActivity.java b/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/java/com/example/android/synchronizednotifications/WearableActivity.java
new file mode 100644
index 0000000..28736ad
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/java/com/example/android/synchronizednotifications/WearableActivity.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 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.
+ */
+package com.example.android.synchronizednotifications;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class WearableActivity extends Activity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_wearable);
+ }
+}
diff --git a/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/res/layout/activity_wearable.xml b/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/res/layout/activity_wearable.xml
new file mode 100644
index 0000000..71451ff
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/res/layout/activity_wearable.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:context=".WearableActivity">
+
+</RelativeLayout>
diff --git a/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/res/values/strings.xml b/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/res/values/strings.xml
new file mode 100644
index 0000000..4240ff5
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/res/values/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<resources>
+ <string name="app_name">Sample Wearable app</string>
+</resources>
+
diff --git a/prebuilts/gradle/SynchronizedNotifications/Wearable/src/template/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/SynchronizedNotifications/Wearable/src/template/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..f7dd9a0
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/Wearable/src/template/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SynchronizedNotifications/Wearable/src/template/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/SynchronizedNotifications/Wearable/src/template/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000..fef2da7
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/Wearable/src/template/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SynchronizedNotifications/Wearable/src/template/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/SynchronizedNotifications/Wearable/src/template/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..f2fb03c
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/Wearable/src/template/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SynchronizedNotifications/build.gradle b/prebuilts/gradle/SynchronizedNotifications/build.gradle
new file mode 100644
index 0000000..5cf5d3d
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/build.gradle
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/prebuilts/gradle/SynchronizedNotifications/gradle/wrapper/gradle-wrapper.jar b/prebuilts/gradle/SynchronizedNotifications/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..8c0fb64
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/prebuilts/gradle/SynchronizedNotifications/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/SynchronizedNotifications/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..d7f03cf
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed Apr 10 15:27:10 PDT 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/prebuilts/gradle/SynchronizedNotifications/gradlew b/prebuilts/gradle/SynchronizedNotifications/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/prebuilts/gradle/SynchronizedNotifications/gradlew.bat b/prebuilts/gradle/SynchronizedNotifications/gradlew.bat
new file mode 100644
index 0000000..8a0b282
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/prebuilts/gradle/SynchronizedNotifications/settings.gradle b/prebuilts/gradle/SynchronizedNotifications/settings.gradle
new file mode 100644
index 0000000..8522c57
--- /dev/null
+++ b/prebuilts/gradle/SynchronizedNotifications/settings.gradle
@@ -0,0 +1 @@
+include ':Application', ':Wearable', ':Shared'
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle b/prebuilts/gradle/TextLinkify/Application/build.gradle
similarity index 95%
copy from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
copy to prebuilts/gradle/TextLinkify/Application/build.gradle
index 299b515..ef913c3 100644
--- a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
+++ b/prebuilts/gradle/TextLinkify/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/AndroidManifest.xml b/prebuilts/gradle/TextLinkify/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/TextLinkify/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/textlinkify/MainActivity.java b/prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/textlinkify/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/textlinkify/MainActivity.java
rename to prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/textlinkify/MainActivity.java
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/TextLinkify/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/TextLinkify/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/TextLinkify/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/TextLinkify/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/TextLinkify/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/TextLinkify/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/TextLinkify/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/TextLinkify/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/TextLinkify/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/TextLinkify/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/TextLinkify/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/TextLinkify/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/layout/sample_main.xml b/prebuilts/gradle/TextLinkify/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/TextLinkify/Application/src/main/res/layout/sample_main.xml
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/TextLinkify/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/TextLinkify/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/TextLinkify/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/TextLinkify/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values-sw720dp-land/dimens.xml b/prebuilts/gradle/TextLinkify/Application/src/main/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values-sw720dp-land/dimens.xml
rename to prebuilts/gradle/TextLinkify/Application/src/main/res/values-sw720dp-land/dimens.xml
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/TextLinkify/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/TextLinkify/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values/base-strings.xml b/prebuilts/gradle/TextLinkify/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/TextLinkify/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values/dimens.xml b/prebuilts/gradle/TextLinkify/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values/dimens.xml
rename to prebuilts/gradle/TextLinkify/Application/src/main/res/values/dimens.xml
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values/strings.xml b/prebuilts/gradle/TextLinkify/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values/strings.xml
rename to prebuilts/gradle/TextLinkify/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values/styles.xml b/prebuilts/gradle/TextLinkify/Application/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values/styles.xml
rename to prebuilts/gradle/TextLinkify/Application/src/main/res/values/styles.xml
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/TextLinkify/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/TextLinkify/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values/template-styles.xml b/prebuilts/gradle/TextLinkify/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/TextLinkify/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/tests/AndroidManifest.xml b/prebuilts/gradle/TextLinkify/Application/tests/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/tests/AndroidManifest.xml
rename to prebuilts/gradle/TextLinkify/Application/tests/AndroidManifest.xml
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/tests/src/com/example/android/textlinkify/tests/SampleTests.java b/prebuilts/gradle/TextLinkify/Application/tests/src/com/example/android/textlinkify/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/TextLinkify/TextLinkifySample/tests/src/com/example/android/textlinkify/tests/SampleTests.java
rename to prebuilts/gradle/TextLinkify/Application/tests/src/com/example/android/textlinkify/tests/SampleTests.java
diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/build.gradle b/prebuilts/gradle/TextLinkify/TextLinkifySample/build.gradle
deleted file mode 100644
index 299b515..0000000
--- a/prebuilts/gradle/TextLinkify/TextLinkifySample/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 4
- compile "com.android.support:support-v4:20.+"
-
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/TextLinkify/settings.gradle b/prebuilts/gradle/TextLinkify/settings.gradle
index 38e7ddd..9464a35 100644
--- a/prebuilts/gradle/TextLinkify/settings.gradle
+++ b/prebuilts/gradle/TextLinkify/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'TextLinkifySample'
+include 'Application'
diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle b/prebuilts/gradle/TextSwitcher/Application/build.gradle
similarity index 95%
copy from prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
copy to prebuilts/gradle/TextSwitcher/Application/build.gradle
index 299b515..ef913c3 100644
--- a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
+++ b/prebuilts/gradle/TextSwitcher/Application/build.gradle
@@ -8,7 +8,7 @@
}
}
-apply plugin: 'android'
+apply plugin: 'com.android.application'
dependencies {
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/AndroidManifest.xml b/prebuilts/gradle/TextSwitcher/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/AndroidManifest.xml
rename to prebuilts/gradle/TextSwitcher/Application/src/main/AndroidManifest.xml
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/textswitcher/MainActivity.java b/prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/textswitcher/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/textswitcher/MainActivity.java
rename to prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/textswitcher/MainActivity.java
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/TextSwitcher/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/TextSwitcher/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/TextSwitcher/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/TextSwitcher/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/TextSwitcher/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/TextSwitcher/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/TextSwitcher/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/TextSwitcher/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/TextSwitcher/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/TextSwitcher/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/layout/activity_main.xml b/prebuilts/gradle/TextSwitcher/Application/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/TextSwitcher/Application/src/main/res/layout/activity_main.xml
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/layout/sample_main.xml b/prebuilts/gradle/TextSwitcher/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/TextSwitcher/Application/src/main/res/layout/sample_main.xml
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-sw600dp/dimens.xml b/prebuilts/gradle/TextSwitcher/Application/src/main/res/values-sw600dp/dimens.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-sw600dp/dimens.xml
rename to prebuilts/gradle/TextSwitcher/Application/src/main/res/values-sw600dp/dimens.xml
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/TextSwitcher/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/TextSwitcher/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/TextSwitcher/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/TextSwitcher/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-sw720dp-land/dimens.xml b/prebuilts/gradle/TextSwitcher/Application/src/main/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-sw720dp-land/dimens.xml
rename to prebuilts/gradle/TextSwitcher/Application/src/main/res/values-sw720dp-land/dimens.xml
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-v11/styles.xml b/prebuilts/gradle/TextSwitcher/Application/src/main/res/values-v11/styles.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-v11/styles.xml
rename to prebuilts/gradle/TextSwitcher/Application/src/main/res/values-v11/styles.xml
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/TextSwitcher/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/TextSwitcher/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-v14/styles.xml b/prebuilts/gradle/TextSwitcher/Application/src/main/res/values-v14/styles.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-v14/styles.xml
rename to prebuilts/gradle/TextSwitcher/Application/src/main/res/values-v14/styles.xml
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/TextSwitcher/Application/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/TextSwitcher/Application/src/main/res/values/base-strings.xml
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values/dimens.xml b/prebuilts/gradle/TextSwitcher/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values/dimens.xml
rename to prebuilts/gradle/TextSwitcher/Application/src/main/res/values/dimens.xml
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values/strings.xml b/prebuilts/gradle/TextSwitcher/Application/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values/strings.xml
rename to prebuilts/gradle/TextSwitcher/Application/src/main/res/values/strings.xml
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values/template-dimens.xml b/prebuilts/gradle/TextSwitcher/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/TextSwitcher/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/TextSwitcher/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/TextSwitcher/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/build.gradle b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/build.gradle
deleted file mode 100644
index 299b515..0000000
--- a/prebuilts/gradle/TextSwitcher/TextSwitcherSample/build.gradle
+++ /dev/null
@@ -1,61 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.+'
- }
-}
-
-apply plugin: 'android'
-
-
-dependencies {
-
- // Add the support lib that is appropriate for SDK 4
- compile "com.android.support:support-v4:20.+"
-
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
-
-android {
- compileSdkVersion 19
-
- buildToolsVersion "20"
-
- sourceSets {
- main {
- dirs.each { dir ->
- java.srcDirs "src/${dir}/java"
- res.srcDirs "src/${dir}/res"
- }
- }
- androidTest.setRoot('tests')
- androidTest.java.srcDirs = ['tests/src']
-
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/TextSwitcher/settings.gradle b/prebuilts/gradle/TextSwitcher/settings.gradle
index 6740a95..9464a35 100644
--- a/prebuilts/gradle/TextSwitcher/settings.gradle
+++ b/prebuilts/gradle/TextSwitcher/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'TextSwitcherSample'
+include 'Application'
