Add Wear sample and rename other samples modules
- Renamed all sample modules from <sampleDir>/<SampleName>Sample
to <sampleDir>Application in order to support multi-module samples.
- Add a Wear SynchronizedNotification sample
Change-Id: I6141df5f3b161a81f389c532f2f9a67a8fe2d525
diff --git a/background/alarms/RepeatingAlarm/RepeatingAlarmSample/.gitignore b/background/alarms/RepeatingAlarm/Application/.gitignore
similarity index 100%
rename from background/alarms/RepeatingAlarm/RepeatingAlarmSample/.gitignore
rename to background/alarms/RepeatingAlarm/Application/.gitignore
diff --git a/background/alarms/RepeatingAlarm/RepeatingAlarmSample/README-singleview.txt b/background/alarms/RepeatingAlarm/Application/README-singleview.txt
similarity index 100%
rename from background/alarms/RepeatingAlarm/RepeatingAlarmSample/README-singleview.txt
rename to background/alarms/RepeatingAlarm/Application/README-singleview.txt
diff --git a/background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/AndroidManifest.xml b/background/alarms/RepeatingAlarm/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/AndroidManifest.xml
rename to background/alarms/RepeatingAlarm/Application/src/main/AndroidManifest.xml
diff --git a/background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/repeatingalarm/RepeatingAlarmFragment.java b/background/alarms/RepeatingAlarm/Application/src/main/java/com/example/android/repeatingalarm/RepeatingAlarmFragment.java
similarity index 100%
rename from background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/repeatingalarm/RepeatingAlarmFragment.java
rename to background/alarms/RepeatingAlarm/Application/src/main/java/com/example/android/repeatingalarm/RepeatingAlarmFragment.java
diff --git a/background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-hdpi/ic_launcher.png b/background/alarms/RepeatingAlarm/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to background/alarms/RepeatingAlarm/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-mdpi/ic_launcher.png b/background/alarms/RepeatingAlarm/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to background/alarms/RepeatingAlarm/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-xhdpi/ic_launcher.png b/background/alarms/RepeatingAlarm/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to background/alarms/RepeatingAlarm/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/background/alarms/RepeatingAlarm/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to background/alarms/RepeatingAlarm/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/background/alarms/RepeatingAlarm/settings.gradle b/background/alarms/RepeatingAlarm/settings.gradle
index 0f14173..9464a35 100644
--- a/background/alarms/RepeatingAlarm/settings.gradle
+++ b/background/alarms/RepeatingAlarm/settings.gradle
@@ -1 +1 @@
-include 'RepeatingAlarmSample'
+include 'Application'
diff --git a/build.gradle b/build.gradle
index 4e3b3c4..0b3f6fb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,6 +46,7 @@
"ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic",
"ui/views/SwipeRefreshLayout/SwipeRefreshListFragment",
"ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews",
+"wearable/wear/SynchronizedNotifications",
"media/MediaRouter"
]
diff --git a/connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/.gitignore b/connectivity/bluetooth/BluetoothLeGatt/Application/.gitignore
similarity index 100%
rename from connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/.gitignore
rename to connectivity/bluetooth/BluetoothLeGatt/Application/.gitignore
diff --git a/connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/proguard-project.txt b/connectivity/bluetooth/BluetoothLeGatt/Application/proguard-project.txt
similarity index 100%
rename from connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/proguard-project.txt
rename to connectivity/bluetooth/BluetoothLeGatt/Application/proguard-project.txt
diff --git a/connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/AndroidManifest.xml b/connectivity/bluetooth/BluetoothLeGatt/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/AndroidManifest.xml
rename to connectivity/bluetooth/BluetoothLeGatt/Application/src/main/AndroidManifest.xml
diff --git a/connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/java/com/example/android/bluetoothlegatt/BluetoothLeService.java b/connectivity/bluetooth/BluetoothLeGatt/Application/src/main/java/com/example/android/bluetoothlegatt/BluetoothLeService.java
similarity index 100%
rename from connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/java/com/example/android/bluetoothlegatt/BluetoothLeService.java
rename to connectivity/bluetooth/BluetoothLeGatt/Application/src/main/java/com/example/android/bluetoothlegatt/BluetoothLeService.java
diff --git a/connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/java/com/example/android/bluetoothlegatt/DeviceControlActivity.java b/connectivity/bluetooth/BluetoothLeGatt/Application/src/main/java/com/example/android/bluetoothlegatt/DeviceControlActivity.java
similarity index 100%
rename from connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/java/com/example/android/bluetoothlegatt/DeviceControlActivity.java
rename to connectivity/bluetooth/BluetoothLeGatt/Application/src/main/java/com/example/android/bluetoothlegatt/DeviceControlActivity.java
diff --git a/connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/java/com/example/android/bluetoothlegatt/DeviceScanActivity.java b/connectivity/bluetooth/BluetoothLeGatt/Application/src/main/java/com/example/android/bluetoothlegatt/DeviceScanActivity.java
similarity index 100%
rename from connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/java/com/example/android/bluetoothlegatt/DeviceScanActivity.java
rename to connectivity/bluetooth/BluetoothLeGatt/Application/src/main/java/com/example/android/bluetoothlegatt/DeviceScanActivity.java
diff --git a/connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/java/com/example/android/bluetoothlegatt/SampleGattAttributes.java b/connectivity/bluetooth/BluetoothLeGatt/Application/src/main/java/com/example/android/bluetoothlegatt/SampleGattAttributes.java
similarity index 100%
rename from connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/java/com/example/android/bluetoothlegatt/SampleGattAttributes.java
rename to connectivity/bluetooth/BluetoothLeGatt/Application/src/main/java/com/example/android/bluetoothlegatt/SampleGattAttributes.java
diff --git a/connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-hdpi/ic_launcher.png b/connectivity/bluetooth/BluetoothLeGatt/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to connectivity/bluetooth/BluetoothLeGatt/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-mdpi/ic_launcher.png b/connectivity/bluetooth/BluetoothLeGatt/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to connectivity/bluetooth/BluetoothLeGatt/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-xhdpi/ic_launcher.png b/connectivity/bluetooth/BluetoothLeGatt/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to connectivity/bluetooth/BluetoothLeGatt/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/connectivity/bluetooth/BluetoothLeGatt/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to connectivity/bluetooth/BluetoothLeGatt/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/layout/actionbar_indeterminate_progress.xml b/connectivity/bluetooth/BluetoothLeGatt/Application/src/main/res/layout/actionbar_indeterminate_progress.xml
similarity index 100%
rename from connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/layout/actionbar_indeterminate_progress.xml
rename to connectivity/bluetooth/BluetoothLeGatt/Application/src/main/res/layout/actionbar_indeterminate_progress.xml
diff --git a/connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/layout/gatt_services_characteristics.xml b/connectivity/bluetooth/BluetoothLeGatt/Application/src/main/res/layout/gatt_services_characteristics.xml
similarity index 100%
rename from connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/layout/gatt_services_characteristics.xml
rename to connectivity/bluetooth/BluetoothLeGatt/Application/src/main/res/layout/gatt_services_characteristics.xml
diff --git a/connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/layout/listitem_device.xml b/connectivity/bluetooth/BluetoothLeGatt/Application/src/main/res/layout/listitem_device.xml
similarity index 100%
rename from connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/layout/listitem_device.xml
rename to connectivity/bluetooth/BluetoothLeGatt/Application/src/main/res/layout/listitem_device.xml
diff --git a/connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/menu/gatt_services.xml b/connectivity/bluetooth/BluetoothLeGatt/Application/src/main/res/menu/gatt_services.xml
similarity index 100%
rename from connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/menu/gatt_services.xml
rename to connectivity/bluetooth/BluetoothLeGatt/Application/src/main/res/menu/gatt_services.xml
diff --git a/connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/menu/main.xml b/connectivity/bluetooth/BluetoothLeGatt/Application/src/main/res/menu/main.xml
similarity index 100%
rename from connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/menu/main.xml
rename to connectivity/bluetooth/BluetoothLeGatt/Application/src/main/res/menu/main.xml
diff --git a/connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values/strings.xml b/connectivity/bluetooth/BluetoothLeGatt/Application/src/main/res/values/strings.xml
similarity index 100%
rename from connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values/strings.xml
rename to connectivity/bluetooth/BluetoothLeGatt/Application/src/main/res/values/strings.xml
diff --git a/connectivity/bluetooth/BluetoothLeGatt/settings.gradle b/connectivity/bluetooth/BluetoothLeGatt/settings.gradle
index 05cae43..9464a35 100644
--- a/connectivity/bluetooth/BluetoothLeGatt/settings.gradle
+++ b/connectivity/bluetooth/BluetoothLeGatt/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BluetoothLeGattSample'
+include 'Application'
diff --git a/connectivity/network/BasicNetworking/BasicNetworkingSample/.gitignore b/connectivity/network/BasicNetworking/Application/.gitignore
similarity index 100%
rename from connectivity/network/BasicNetworking/BasicNetworkingSample/.gitignore
rename to connectivity/network/BasicNetworking/Application/.gitignore
diff --git a/connectivity/network/BasicNetworking/BasicNetworkingSample/proguard-project.txt b/connectivity/network/BasicNetworking/Application/proguard-project.txt
similarity index 100%
rename from connectivity/network/BasicNetworking/BasicNetworkingSample/proguard-project.txt
rename to connectivity/network/BasicNetworking/Application/proguard-project.txt
diff --git a/connectivity/network/BasicNetworking/BasicNetworkingSample/src/main/AndroidManifest.xml b/connectivity/network/BasicNetworking/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from connectivity/network/BasicNetworking/BasicNetworkingSample/src/main/AndroidManifest.xml
rename to connectivity/network/BasicNetworking/Application/src/main/AndroidManifest.xml
diff --git a/connectivity/network/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/basicnetworking/MainActivity.java b/connectivity/network/BasicNetworking/Application/src/main/java/com/example/android/basicnetworking/MainActivity.java
similarity index 100%
rename from connectivity/network/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/basicnetworking/MainActivity.java
rename to connectivity/network/BasicNetworking/Application/src/main/java/com/example/android/basicnetworking/MainActivity.java
diff --git a/connectivity/network/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/basicnetworking/SimpleTextFragment.java b/connectivity/network/BasicNetworking/Application/src/main/java/com/example/android/basicnetworking/SimpleTextFragment.java
similarity index 100%
rename from connectivity/network/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/basicnetworking/SimpleTextFragment.java
rename to connectivity/network/BasicNetworking/Application/src/main/java/com/example/android/basicnetworking/SimpleTextFragment.java
diff --git a/connectivity/network/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-hdpi/ic_launcher.png b/connectivity/network/BasicNetworking/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from connectivity/network/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to connectivity/network/BasicNetworking/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/network/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-mdpi/ic_launcher.png b/connectivity/network/BasicNetworking/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from connectivity/network/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to connectivity/network/BasicNetworking/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/network/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-xhdpi/ic_launcher.png b/connectivity/network/BasicNetworking/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from connectivity/network/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to connectivity/network/BasicNetworking/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/network/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/connectivity/network/BasicNetworking/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from connectivity/network/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to connectivity/network/BasicNetworking/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/network/BasicNetworking/BasicNetworkingSample/src/main/res/layout/sample_main.xml b/connectivity/network/BasicNetworking/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from connectivity/network/BasicNetworking/BasicNetworkingSample/src/main/res/layout/sample_main.xml
rename to connectivity/network/BasicNetworking/Application/src/main/res/layout/sample_main.xml
diff --git a/connectivity/network/BasicNetworking/BasicNetworkingSample/src/main/res/menu/main.xml b/connectivity/network/BasicNetworking/Application/src/main/res/menu/main.xml
similarity index 100%
rename from connectivity/network/BasicNetworking/BasicNetworkingSample/src/main/res/menu/main.xml
rename to connectivity/network/BasicNetworking/Application/src/main/res/menu/main.xml
diff --git a/connectivity/network/BasicNetworking/BasicNetworkingSample/src/main/res/values/strings.xml b/connectivity/network/BasicNetworking/Application/src/main/res/values/strings.xml
similarity index 100%
rename from connectivity/network/BasicNetworking/BasicNetworkingSample/src/main/res/values/strings.xml
rename to connectivity/network/BasicNetworking/Application/src/main/res/values/strings.xml
diff --git a/connectivity/network/BasicNetworking/BasicNetworkingSample/src/main/res/values/styles.xml b/connectivity/network/BasicNetworking/Application/src/main/res/values/styles.xml
similarity index 100%
rename from connectivity/network/BasicNetworking/BasicNetworkingSample/src/main/res/values/styles.xml
rename to connectivity/network/BasicNetworking/Application/src/main/res/values/styles.xml
diff --git a/connectivity/network/BasicNetworking/BasicNetworkingSample/tests/AndroidManifest.xml b/connectivity/network/BasicNetworking/Application/tests/AndroidManifest.xml
similarity index 100%
rename from connectivity/network/BasicNetworking/BasicNetworkingSample/tests/AndroidManifest.xml
rename to connectivity/network/BasicNetworking/Application/tests/AndroidManifest.xml
diff --git a/connectivity/network/BasicNetworking/BasicNetworkingSample/tests/src/com/example/android/basicnetworking/tests/SampleTests.java b/connectivity/network/BasicNetworking/Application/tests/src/com/example/android/basicnetworking/tests/SampleTests.java
similarity index 100%
rename from connectivity/network/BasicNetworking/BasicNetworkingSample/tests/src/com/example/android/basicnetworking/tests/SampleTests.java
rename to connectivity/network/BasicNetworking/Application/tests/src/com/example/android/basicnetworking/tests/SampleTests.java
diff --git a/connectivity/network/BasicNetworking/settings.gradle b/connectivity/network/BasicNetworking/settings.gradle
index 453e7cd..9464a35 100644
--- a/connectivity/network/BasicNetworking/settings.gradle
+++ b/connectivity/network/BasicNetworking/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicNetworkingSample'
+include 'Application'
diff --git a/connectivity/network/NetworkConnect/NetworkConnectSample/.gitignore b/connectivity/network/NetworkConnect/Application/.gitignore
similarity index 100%
rename from connectivity/network/NetworkConnect/NetworkConnectSample/.gitignore
rename to connectivity/network/NetworkConnect/Application/.gitignore
diff --git a/connectivity/network/NetworkConnect/NetworkConnectSample/proguard-project.txt b/connectivity/network/NetworkConnect/Application/proguard-project.txt
similarity index 100%
rename from connectivity/network/NetworkConnect/NetworkConnectSample/proguard-project.txt
rename to connectivity/network/NetworkConnect/Application/proguard-project.txt
diff --git a/connectivity/network/NetworkConnect/NetworkConnectSample/src/main/AndroidManifest.xml b/connectivity/network/NetworkConnect/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from connectivity/network/NetworkConnect/NetworkConnectSample/src/main/AndroidManifest.xml
rename to connectivity/network/NetworkConnect/Application/src/main/AndroidManifest.xml
diff --git a/connectivity/network/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/networkconnect/MainActivity.java b/connectivity/network/NetworkConnect/Application/src/main/java/com/example/android/networkconnect/MainActivity.java
similarity index 100%
rename from connectivity/network/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/networkconnect/MainActivity.java
rename to connectivity/network/NetworkConnect/Application/src/main/java/com/example/android/networkconnect/MainActivity.java
diff --git a/connectivity/network/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/networkconnect/SimpleTextFragment.java b/connectivity/network/NetworkConnect/Application/src/main/java/com/example/android/networkconnect/SimpleTextFragment.java
similarity index 100%
rename from connectivity/network/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/networkconnect/SimpleTextFragment.java
rename to connectivity/network/NetworkConnect/Application/src/main/java/com/example/android/networkconnect/SimpleTextFragment.java
diff --git a/connectivity/network/NetworkConnect/NetworkConnectSample/src/main/res/drawable-hdpi/ic_launcher.png b/connectivity/network/NetworkConnect/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from connectivity/network/NetworkConnect/NetworkConnectSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to connectivity/network/NetworkConnect/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/network/NetworkConnect/NetworkConnectSample/src/main/res/drawable-mdpi/ic_launcher.png b/connectivity/network/NetworkConnect/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from connectivity/network/NetworkConnect/NetworkConnectSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to connectivity/network/NetworkConnect/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/network/NetworkConnect/NetworkConnectSample/src/main/res/drawable-xhdpi/ic_launcher.png b/connectivity/network/NetworkConnect/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from connectivity/network/NetworkConnect/NetworkConnectSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to connectivity/network/NetworkConnect/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/network/NetworkConnect/NetworkConnectSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/connectivity/network/NetworkConnect/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from connectivity/network/NetworkConnect/NetworkConnectSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to connectivity/network/NetworkConnect/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/network/NetworkConnect/NetworkConnectSample/src/main/res/layout/sample_main.xml b/connectivity/network/NetworkConnect/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from connectivity/network/NetworkConnect/NetworkConnectSample/src/main/res/layout/sample_main.xml
rename to connectivity/network/NetworkConnect/Application/src/main/res/layout/sample_main.xml
diff --git a/connectivity/network/NetworkConnect/NetworkConnectSample/src/main/res/menu/main.xml b/connectivity/network/NetworkConnect/Application/src/main/res/menu/main.xml
similarity index 100%
rename from connectivity/network/NetworkConnect/NetworkConnectSample/src/main/res/menu/main.xml
rename to connectivity/network/NetworkConnect/Application/src/main/res/menu/main.xml
diff --git a/connectivity/network/NetworkConnect/NetworkConnectSample/src/main/res/values/strings.xml b/connectivity/network/NetworkConnect/Application/src/main/res/values/strings.xml
similarity index 100%
rename from connectivity/network/NetworkConnect/NetworkConnectSample/src/main/res/values/strings.xml
rename to connectivity/network/NetworkConnect/Application/src/main/res/values/strings.xml
diff --git a/connectivity/network/NetworkConnect/NetworkConnectSample/tests/AndroidManifest.xml b/connectivity/network/NetworkConnect/Application/tests/AndroidManifest.xml
similarity index 100%
rename from connectivity/network/NetworkConnect/NetworkConnectSample/tests/AndroidManifest.xml
rename to connectivity/network/NetworkConnect/Application/tests/AndroidManifest.xml
diff --git a/connectivity/network/NetworkConnect/NetworkConnectSample/tests/src/com/example/android/networkconnect/tests/SampleTests.java b/connectivity/network/NetworkConnect/Application/tests/src/com/example/android/networkconnect/tests/SampleTests.java
similarity index 100%
rename from connectivity/network/NetworkConnect/NetworkConnectSample/tests/src/com/example/android/networkconnect/tests/SampleTests.java
rename to connectivity/network/NetworkConnect/Application/tests/src/com/example/android/networkconnect/tests/SampleTests.java
diff --git a/connectivity/network/NetworkConnect/settings.gradle b/connectivity/network/NetworkConnect/settings.gradle
index ebae091..9464a35 100644
--- a/connectivity/network/NetworkConnect/settings.gradle
+++ b/connectivity/network/NetworkConnect/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'NetworkConnectSample'
+include 'Application'
diff --git a/connectivity/nfc/BeamLargeFiles/BeamLargeFilesSample/.gitignore b/connectivity/nfc/BeamLargeFiles/Application/.gitignore
similarity index 100%
rename from connectivity/nfc/BeamLargeFiles/BeamLargeFilesSample/.gitignore
rename to connectivity/nfc/BeamLargeFiles/Application/.gitignore
diff --git a/connectivity/nfc/BeamLargeFiles/BeamLargeFilesSample/proguard-project.txt b/connectivity/nfc/BeamLargeFiles/Application/proguard-project.txt
similarity index 100%
rename from connectivity/nfc/BeamLargeFiles/BeamLargeFilesSample/proguard-project.txt
rename to connectivity/nfc/BeamLargeFiles/Application/proguard-project.txt
diff --git a/connectivity/nfc/BeamLargeFiles/BeamLargeFilesSample/src/main/AndroidManifest.xml b/connectivity/nfc/BeamLargeFiles/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from connectivity/nfc/BeamLargeFiles/BeamLargeFilesSample/src/main/AndroidManifest.xml
rename to connectivity/nfc/BeamLargeFiles/Application/src/main/AndroidManifest.xml
diff --git a/connectivity/nfc/BeamLargeFiles/BeamLargeFilesSample/src/main/assets/stargazer_droid.jpg b/connectivity/nfc/BeamLargeFiles/Application/src/main/assets/stargazer_droid.jpg
similarity index 100%
rename from connectivity/nfc/BeamLargeFiles/BeamLargeFilesSample/src/main/assets/stargazer_droid.jpg
rename to connectivity/nfc/BeamLargeFiles/Application/src/main/assets/stargazer_droid.jpg
Binary files differ
diff --git a/connectivity/nfc/BeamLargeFiles/BeamLargeFilesSample/src/main/java/com/example/android/beamlargefiles/BeamLargeFilesFragment.java b/connectivity/nfc/BeamLargeFiles/Application/src/main/java/com/example/android/beamlargefiles/BeamLargeFilesFragment.java
similarity index 100%
rename from connectivity/nfc/BeamLargeFiles/BeamLargeFilesSample/src/main/java/com/example/android/beamlargefiles/BeamLargeFilesFragment.java
rename to connectivity/nfc/BeamLargeFiles/Application/src/main/java/com/example/android/beamlargefiles/BeamLargeFilesFragment.java
diff --git a/connectivity/nfc/BeamLargeFiles/BeamLargeFilesSample/src/main/res/drawable-hdpi/ic_launcher.png b/connectivity/nfc/BeamLargeFiles/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from connectivity/nfc/BeamLargeFiles/BeamLargeFilesSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to connectivity/nfc/BeamLargeFiles/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/nfc/BeamLargeFiles/BeamLargeFilesSample/src/main/res/drawable-mdpi/ic_launcher.png b/connectivity/nfc/BeamLargeFiles/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from connectivity/nfc/BeamLargeFiles/BeamLargeFilesSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to connectivity/nfc/BeamLargeFiles/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/nfc/BeamLargeFiles/BeamLargeFilesSample/src/main/res/drawable-xhdpi/ic_launcher.png b/connectivity/nfc/BeamLargeFiles/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from connectivity/nfc/BeamLargeFiles/BeamLargeFilesSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to connectivity/nfc/BeamLargeFiles/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/nfc/BeamLargeFiles/BeamLargeFilesSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/connectivity/nfc/BeamLargeFiles/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from connectivity/nfc/BeamLargeFiles/BeamLargeFilesSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to connectivity/nfc/BeamLargeFiles/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/nfc/BeamLargeFiles/BeamLargeFilesSample/tests/AndroidManifest.xml b/connectivity/nfc/BeamLargeFiles/Application/tests/AndroidManifest.xml
similarity index 100%
rename from connectivity/nfc/BeamLargeFiles/BeamLargeFilesSample/tests/AndroidManifest.xml
rename to connectivity/nfc/BeamLargeFiles/Application/tests/AndroidManifest.xml
diff --git a/connectivity/nfc/BeamLargeFiles/BeamLargeFilesSample/tests/src/com/example/android/beamlargefiles/tests/SampleTests.java b/connectivity/nfc/BeamLargeFiles/Application/tests/src/com/example/android/beamlargefiles/tests/SampleTests.java
similarity index 100%
rename from connectivity/nfc/BeamLargeFiles/BeamLargeFilesSample/tests/src/com/example/android/beamlargefiles/tests/SampleTests.java
rename to connectivity/nfc/BeamLargeFiles/Application/tests/src/com/example/android/beamlargefiles/tests/SampleTests.java
diff --git a/connectivity/nfc/BeamLargeFiles/settings.gradle b/connectivity/nfc/BeamLargeFiles/settings.gradle
index 32da346..9464a35 100644
--- a/connectivity/nfc/BeamLargeFiles/settings.gradle
+++ b/connectivity/nfc/BeamLargeFiles/settings.gradle
@@ -1 +1 @@
-include 'BeamLargeFilesSample'
+include 'Application'
diff --git a/connectivity/nfc/CardEmulation/CardEmulationSample/.gitignore b/connectivity/nfc/CardEmulation/Application/.gitignore
similarity index 100%
rename from connectivity/nfc/CardEmulation/CardEmulationSample/.gitignore
rename to connectivity/nfc/CardEmulation/Application/.gitignore
diff --git a/connectivity/nfc/CardEmulation/CardEmulationSample/README-fragmentview.txt b/connectivity/nfc/CardEmulation/Application/README-fragmentview.txt
similarity index 100%
rename from connectivity/nfc/CardEmulation/CardEmulationSample/README-fragmentview.txt
rename to connectivity/nfc/CardEmulation/Application/README-fragmentview.txt
diff --git a/connectivity/nfc/CardEmulation/CardEmulationSample/proguard-project.txt b/connectivity/nfc/CardEmulation/Application/proguard-project.txt
similarity index 100%
rename from connectivity/nfc/CardEmulation/CardEmulationSample/proguard-project.txt
rename to connectivity/nfc/CardEmulation/Application/proguard-project.txt
diff --git a/connectivity/nfc/CardEmulation/CardEmulationSample/src/main/AndroidManifest.xml b/connectivity/nfc/CardEmulation/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from connectivity/nfc/CardEmulation/CardEmulationSample/src/main/AndroidManifest.xml
rename to connectivity/nfc/CardEmulation/Application/src/main/AndroidManifest.xml
diff --git a/connectivity/nfc/CardEmulation/CardEmulationSample/src/main/java/com/example/android/cardemulation/AccountStorage.java b/connectivity/nfc/CardEmulation/Application/src/main/java/com/example/android/cardemulation/AccountStorage.java
similarity index 100%
rename from connectivity/nfc/CardEmulation/CardEmulationSample/src/main/java/com/example/android/cardemulation/AccountStorage.java
rename to connectivity/nfc/CardEmulation/Application/src/main/java/com/example/android/cardemulation/AccountStorage.java
diff --git a/connectivity/nfc/CardEmulation/CardEmulationSample/src/main/java/com/example/android/cardemulation/CardEmulationFragment.java b/connectivity/nfc/CardEmulation/Application/src/main/java/com/example/android/cardemulation/CardEmulationFragment.java
similarity index 100%
rename from connectivity/nfc/CardEmulation/CardEmulationSample/src/main/java/com/example/android/cardemulation/CardEmulationFragment.java
rename to connectivity/nfc/CardEmulation/Application/src/main/java/com/example/android/cardemulation/CardEmulationFragment.java
diff --git a/connectivity/nfc/CardEmulation/CardEmulationSample/src/main/java/com/example/android/cardemulation/CardService.java b/connectivity/nfc/CardEmulation/Application/src/main/java/com/example/android/cardemulation/CardService.java
similarity index 100%
rename from connectivity/nfc/CardEmulation/CardEmulationSample/src/main/java/com/example/android/cardemulation/CardService.java
rename to connectivity/nfc/CardEmulation/Application/src/main/java/com/example/android/cardemulation/CardService.java
diff --git a/connectivity/nfc/CardEmulation/CardEmulationSample/src/main/res/drawable-hdpi/ic_launcher.png b/connectivity/nfc/CardEmulation/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from connectivity/nfc/CardEmulation/CardEmulationSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to connectivity/nfc/CardEmulation/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/nfc/CardEmulation/CardEmulationSample/src/main/res/drawable-mdpi/ic_launcher.png b/connectivity/nfc/CardEmulation/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from connectivity/nfc/CardEmulation/CardEmulationSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to connectivity/nfc/CardEmulation/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/nfc/CardEmulation/CardEmulationSample/src/main/res/drawable-xhdpi/ic_launcher.png b/connectivity/nfc/CardEmulation/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from connectivity/nfc/CardEmulation/CardEmulationSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to connectivity/nfc/CardEmulation/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/nfc/CardEmulation/CardEmulationSample/src/main/res/drawable-xxhdpi/card_background.png b/connectivity/nfc/CardEmulation/Application/src/main/res/drawable-xxhdpi/card_background.png
similarity index 100%
rename from connectivity/nfc/CardEmulation/CardEmulationSample/src/main/res/drawable-xxhdpi/card_background.png
rename to connectivity/nfc/CardEmulation/Application/src/main/res/drawable-xxhdpi/card_background.png
Binary files differ
diff --git a/connectivity/nfc/CardEmulation/CardEmulationSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/connectivity/nfc/CardEmulation/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from connectivity/nfc/CardEmulation/CardEmulationSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to connectivity/nfc/CardEmulation/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/nfc/CardEmulation/CardEmulationSample/src/main/res/layout/main_fragment.xml b/connectivity/nfc/CardEmulation/Application/src/main/res/layout/main_fragment.xml
similarity index 100%
rename from connectivity/nfc/CardEmulation/CardEmulationSample/src/main/res/layout/main_fragment.xml
rename to connectivity/nfc/CardEmulation/Application/src/main/res/layout/main_fragment.xml
diff --git a/connectivity/nfc/CardEmulation/CardEmulationSample/src/main/res/values/strings.xml b/connectivity/nfc/CardEmulation/Application/src/main/res/values/strings.xml
similarity index 100%
rename from connectivity/nfc/CardEmulation/CardEmulationSample/src/main/res/values/strings.xml
rename to connectivity/nfc/CardEmulation/Application/src/main/res/values/strings.xml
diff --git a/connectivity/nfc/CardEmulation/CardEmulationSample/src/main/res/xml/aid_list.xml b/connectivity/nfc/CardEmulation/Application/src/main/res/xml/aid_list.xml
similarity index 100%
rename from connectivity/nfc/CardEmulation/CardEmulationSample/src/main/res/xml/aid_list.xml
rename to connectivity/nfc/CardEmulation/Application/src/main/res/xml/aid_list.xml
diff --git a/connectivity/nfc/CardEmulation/CardEmulationSample/tests/AndroidManifest.xml b/connectivity/nfc/CardEmulation/Application/tests/AndroidManifest.xml
similarity index 100%
rename from connectivity/nfc/CardEmulation/CardEmulationSample/tests/AndroidManifest.xml
rename to connectivity/nfc/CardEmulation/Application/tests/AndroidManifest.xml
diff --git a/connectivity/nfc/CardEmulation/CardEmulationSample/tests/src/com/example/android/cardemulation/tests/SampleTests.java b/connectivity/nfc/CardEmulation/Application/tests/src/com/example/android/cardemulation/tests/SampleTests.java
similarity index 100%
rename from connectivity/nfc/CardEmulation/CardEmulationSample/tests/src/com/example/android/cardemulation/tests/SampleTests.java
rename to connectivity/nfc/CardEmulation/Application/tests/src/com/example/android/cardemulation/tests/SampleTests.java
diff --git a/connectivity/nfc/CardEmulation/settings.gradle b/connectivity/nfc/CardEmulation/settings.gradle
index 32b4942..9464a35 100644
--- a/connectivity/nfc/CardEmulation/settings.gradle
+++ b/connectivity/nfc/CardEmulation/settings.gradle
@@ -1 +1 @@
-include 'CardEmulationSample'
+include 'Application'
diff --git a/connectivity/nfc/CardReader/CardReaderSample/.gitignore b/connectivity/nfc/CardReader/Application/.gitignore
similarity index 100%
rename from connectivity/nfc/CardReader/CardReaderSample/.gitignore
rename to connectivity/nfc/CardReader/Application/.gitignore
diff --git a/connectivity/nfc/CardReader/CardReaderSample/README-fragmentview.txt b/connectivity/nfc/CardReader/Application/README-fragmentview.txt
similarity index 100%
rename from connectivity/nfc/CardReader/CardReaderSample/README-fragmentview.txt
rename to connectivity/nfc/CardReader/Application/README-fragmentview.txt
diff --git a/connectivity/nfc/CardReader/CardReaderSample/proguard-project.txt b/connectivity/nfc/CardReader/Application/proguard-project.txt
similarity index 100%
rename from connectivity/nfc/CardReader/CardReaderSample/proguard-project.txt
rename to connectivity/nfc/CardReader/Application/proguard-project.txt
diff --git a/connectivity/nfc/CardReader/CardReaderSample/src/main/AndroidManifest.xml b/connectivity/nfc/CardReader/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from connectivity/nfc/CardReader/CardReaderSample/src/main/AndroidManifest.xml
rename to connectivity/nfc/CardReader/Application/src/main/AndroidManifest.xml
diff --git a/connectivity/nfc/CardReader/CardReaderSample/src/main/java/com/example/android/cardreader/CardReaderFragment.java b/connectivity/nfc/CardReader/Application/src/main/java/com/example/android/cardreader/CardReaderFragment.java
similarity index 100%
rename from connectivity/nfc/CardReader/CardReaderSample/src/main/java/com/example/android/cardreader/CardReaderFragment.java
rename to connectivity/nfc/CardReader/Application/src/main/java/com/example/android/cardreader/CardReaderFragment.java
diff --git a/connectivity/nfc/CardReader/CardReaderSample/src/main/java/com/example/android/cardreader/LoyaltyCardReader.java b/connectivity/nfc/CardReader/Application/src/main/java/com/example/android/cardreader/LoyaltyCardReader.java
similarity index 100%
rename from connectivity/nfc/CardReader/CardReaderSample/src/main/java/com/example/android/cardreader/LoyaltyCardReader.java
rename to connectivity/nfc/CardReader/Application/src/main/java/com/example/android/cardreader/LoyaltyCardReader.java
diff --git a/connectivity/nfc/CardReader/CardReaderSample/src/main/res/drawable-hdpi/ic_launcher.png b/connectivity/nfc/CardReader/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from connectivity/nfc/CardReader/CardReaderSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to connectivity/nfc/CardReader/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/nfc/CardReader/CardReaderSample/src/main/res/drawable-mdpi/ic_launcher.png b/connectivity/nfc/CardReader/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from connectivity/nfc/CardReader/CardReaderSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to connectivity/nfc/CardReader/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/nfc/CardReader/CardReaderSample/src/main/res/drawable-xhdpi/ic_launcher.png b/connectivity/nfc/CardReader/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from connectivity/nfc/CardReader/CardReaderSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to connectivity/nfc/CardReader/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/nfc/CardReader/CardReaderSample/src/main/res/drawable-xxhdpi/card_background.png b/connectivity/nfc/CardReader/Application/src/main/res/drawable-xxhdpi/card_background.png
similarity index 100%
rename from connectivity/nfc/CardReader/CardReaderSample/src/main/res/drawable-xxhdpi/card_background.png
rename to connectivity/nfc/CardReader/Application/src/main/res/drawable-xxhdpi/card_background.png
Binary files differ
diff --git a/connectivity/nfc/CardReader/CardReaderSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/connectivity/nfc/CardReader/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from connectivity/nfc/CardReader/CardReaderSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to connectivity/nfc/CardReader/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/nfc/CardReader/CardReaderSample/src/main/res/layout/main_fragment.xml b/connectivity/nfc/CardReader/Application/src/main/res/layout/main_fragment.xml
similarity index 100%
rename from connectivity/nfc/CardReader/CardReaderSample/src/main/res/layout/main_fragment.xml
rename to connectivity/nfc/CardReader/Application/src/main/res/layout/main_fragment.xml
diff --git a/connectivity/nfc/CardReader/CardReaderSample/src/main/res/values/strings.xml b/connectivity/nfc/CardReader/Application/src/main/res/values/strings.xml
similarity index 100%
rename from connectivity/nfc/CardReader/CardReaderSample/src/main/res/values/strings.xml
rename to connectivity/nfc/CardReader/Application/src/main/res/values/strings.xml
diff --git a/connectivity/nfc/CardReader/CardReaderSample/src/main/res/xml/nfc_tech_filter.xml b/connectivity/nfc/CardReader/Application/src/main/res/xml/nfc_tech_filter.xml
similarity index 100%
rename from connectivity/nfc/CardReader/CardReaderSample/src/main/res/xml/nfc_tech_filter.xml
rename to connectivity/nfc/CardReader/Application/src/main/res/xml/nfc_tech_filter.xml
diff --git a/connectivity/nfc/CardReader/CardReaderSample/tests/AndroidManifest.xml b/connectivity/nfc/CardReader/Application/tests/AndroidManifest.xml
similarity index 100%
rename from connectivity/nfc/CardReader/CardReaderSample/tests/AndroidManifest.xml
rename to connectivity/nfc/CardReader/Application/tests/AndroidManifest.xml
diff --git a/connectivity/nfc/CardReader/CardReaderSample/tests/src/com/example/android/cardreader/tests/SampleTests.java b/connectivity/nfc/CardReader/Application/tests/src/com/example/android/cardreader/tests/SampleTests.java
similarity index 100%
rename from connectivity/nfc/CardReader/CardReaderSample/tests/src/com/example/android/cardreader/tests/SampleTests.java
rename to connectivity/nfc/CardReader/Application/tests/src/com/example/android/cardreader/tests/SampleTests.java
diff --git a/connectivity/nfc/CardReader/settings.gradle b/connectivity/nfc/CardReader/settings.gradle
index d1d7333..9464a35 100644
--- a/connectivity/nfc/CardReader/settings.gradle
+++ b/connectivity/nfc/CardReader/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'CardReaderSample'
+include 'Application'
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/.gitignore b/connectivity/sync/BasicSyncAdapter/Application/.gitignore
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/.gitignore
rename to connectivity/sync/BasicSyncAdapter/Application/.gitignore
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/proguard-project.txt b/connectivity/sync/BasicSyncAdapter/Application/proguard-project.txt
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/proguard-project.txt
rename to connectivity/sync/BasicSyncAdapter/Application/proguard-project.txt
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/AndroidManifest.xml b/connectivity/sync/BasicSyncAdapter/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/AndroidManifest.xml
rename to connectivity/sync/BasicSyncAdapter/Application/src/main/AndroidManifest.xml
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/EntryListActivity.java b/connectivity/sync/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/EntryListActivity.java
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/EntryListActivity.java
rename to connectivity/sync/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/EntryListActivity.java
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/EntryListFragment.java b/connectivity/sync/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/EntryListFragment.java
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/EntryListFragment.java
rename to connectivity/sync/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/EntryListFragment.java
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/SyncAdapter.java b/connectivity/sync/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/SyncAdapter.java
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/SyncAdapter.java
rename to connectivity/sync/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/SyncAdapter.java
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/SyncService.java b/connectivity/sync/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/SyncService.java
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/SyncService.java
rename to connectivity/sync/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/SyncService.java
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/SyncUtils.java b/connectivity/sync/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/SyncUtils.java
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/SyncUtils.java
rename to connectivity/sync/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/SyncUtils.java
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/net/FeedParser.java b/connectivity/sync/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/net/FeedParser.java
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/net/FeedParser.java
rename to connectivity/sync/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/net/FeedParser.java
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/provider/FeedContract.java b/connectivity/sync/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/provider/FeedContract.java
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/provider/FeedContract.java
rename to connectivity/sync/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/provider/FeedContract.java
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/provider/FeedProvider.java b/connectivity/sync/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/provider/FeedProvider.java
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/provider/FeedProvider.java
rename to connectivity/sync/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/provider/FeedProvider.java
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-hdpi/ic_launcher.png b/connectivity/sync/BasicSyncAdapter/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to connectivity/sync/BasicSyncAdapter/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-mdpi/ic_launcher.png b/connectivity/sync/BasicSyncAdapter/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to connectivity/sync/BasicSyncAdapter/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-xhdpi/ic_action_refresh.png b/connectivity/sync/BasicSyncAdapter/Application/src/main/res/drawable-xhdpi/ic_action_refresh.png
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-xhdpi/ic_action_refresh.png
rename to connectivity/sync/BasicSyncAdapter/Application/src/main/res/drawable-xhdpi/ic_action_refresh.png
Binary files differ
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-xhdpi/ic_launcher.png b/connectivity/sync/BasicSyncAdapter/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to connectivity/sync/BasicSyncAdapter/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/connectivity/sync/BasicSyncAdapter/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to connectivity/sync/BasicSyncAdapter/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/layout/actionbar_indeterminate_progress.xml b/connectivity/sync/BasicSyncAdapter/Application/src/main/res/layout/actionbar_indeterminate_progress.xml
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/layout/actionbar_indeterminate_progress.xml
rename to connectivity/sync/BasicSyncAdapter/Application/src/main/res/layout/actionbar_indeterminate_progress.xml
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/layout/activity_entry_list.xml b/connectivity/sync/BasicSyncAdapter/Application/src/main/res/layout/activity_entry_list.xml
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/layout/activity_entry_list.xml
rename to connectivity/sync/BasicSyncAdapter/Application/src/main/res/layout/activity_entry_list.xml
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/menu/main.xml b/connectivity/sync/BasicSyncAdapter/Application/src/main/res/menu/main.xml
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/menu/main.xml
rename to connectivity/sync/BasicSyncAdapter/Application/src/main/res/menu/main.xml
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/attrs.xml b/connectivity/sync/BasicSyncAdapter/Application/src/main/res/values/attrs.xml
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/attrs.xml
rename to connectivity/sync/BasicSyncAdapter/Application/src/main/res/values/attrs.xml
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/dimen.xml b/connectivity/sync/BasicSyncAdapter/Application/src/main/res/values/dimen.xml
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/dimen.xml
rename to connectivity/sync/BasicSyncAdapter/Application/src/main/res/values/dimen.xml
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/strings.xml b/connectivity/sync/BasicSyncAdapter/Application/src/main/res/values/strings.xml
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/strings.xml
rename to connectivity/sync/BasicSyncAdapter/Application/src/main/res/values/strings.xml
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/xml/authenticator.xml b/connectivity/sync/BasicSyncAdapter/Application/src/main/res/xml/authenticator.xml
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/xml/authenticator.xml
rename to connectivity/sync/BasicSyncAdapter/Application/src/main/res/xml/authenticator.xml
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/xml/syncadapter.xml b/connectivity/sync/BasicSyncAdapter/Application/src/main/res/xml/syncadapter.xml
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/xml/syncadapter.xml
rename to connectivity/sync/BasicSyncAdapter/Application/src/main/res/xml/syncadapter.xml
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/tests/AndroidManifest.xml b/connectivity/sync/BasicSyncAdapter/Application/tests/AndroidManifest.xml
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/tests/AndroidManifest.xml
rename to connectivity/sync/BasicSyncAdapter/Application/tests/AndroidManifest.xml
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/tests/src/com/example/android/basicsyncadapter/tests/SampleTests.java b/connectivity/sync/BasicSyncAdapter/Application/tests/src/com/example/android/basicsyncadapter/tests/SampleTests.java
similarity index 100%
rename from connectivity/sync/BasicSyncAdapter/BasicSyncAdapterSample/tests/src/com/example/android/basicsyncadapter/tests/SampleTests.java
rename to connectivity/sync/BasicSyncAdapter/Application/tests/src/com/example/android/basicsyncadapter/tests/SampleTests.java
diff --git a/connectivity/sync/BasicSyncAdapter/settings.gradle b/connectivity/sync/BasicSyncAdapter/settings.gradle
index a691e9e..9464a35 100644
--- a/connectivity/sync/BasicSyncAdapter/settings.gradle
+++ b/connectivity/sync/BasicSyncAdapter/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicSyncAdapterSample'
+include 'Application'
diff --git a/content/contacts/BasicContactables/BasicContactablesSample/.gitignore b/content/contacts/BasicContactables/Application/.gitignore
similarity index 100%
rename from content/contacts/BasicContactables/BasicContactablesSample/.gitignore
rename to content/contacts/BasicContactables/Application/.gitignore
diff --git a/content/contacts/BasicContactables/BasicContactablesSample/proguard-project.txt b/content/contacts/BasicContactables/Application/proguard-project.txt
similarity index 100%
rename from content/contacts/BasicContactables/BasicContactablesSample/proguard-project.txt
rename to content/contacts/BasicContactables/Application/proguard-project.txt
diff --git a/content/contacts/BasicContactables/BasicContactablesSample/src/main/AndroidManifest.xml b/content/contacts/BasicContactables/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from content/contacts/BasicContactables/BasicContactablesSample/src/main/AndroidManifest.xml
rename to content/contacts/BasicContactables/Application/src/main/AndroidManifest.xml
diff --git a/content/contacts/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/basiccontactables/ContactablesLoaderCallbacks.java b/content/contacts/BasicContactables/Application/src/main/java/com/example/android/basiccontactables/ContactablesLoaderCallbacks.java
similarity index 100%
rename from content/contacts/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/basiccontactables/ContactablesLoaderCallbacks.java
rename to content/contacts/BasicContactables/Application/src/main/java/com/example/android/basiccontactables/ContactablesLoaderCallbacks.java
diff --git a/content/contacts/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/basiccontactables/MainActivity.java b/content/contacts/BasicContactables/Application/src/main/java/com/example/android/basiccontactables/MainActivity.java
similarity index 100%
rename from content/contacts/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/basiccontactables/MainActivity.java
rename to content/contacts/BasicContactables/Application/src/main/java/com/example/android/basiccontactables/MainActivity.java
diff --git a/content/contacts/BasicContactables/BasicContactablesSample/src/main/res/drawable-hdpi/ic_launcher.png b/content/contacts/BasicContactables/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from content/contacts/BasicContactables/BasicContactablesSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to content/contacts/BasicContactables/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/content/contacts/BasicContactables/BasicContactablesSample/src/main/res/drawable-hdpi/ic_search_api_holo_light.png b/content/contacts/BasicContactables/Application/src/main/res/drawable-hdpi/ic_search_api_holo_light.png
similarity index 100%
rename from content/contacts/BasicContactables/BasicContactablesSample/src/main/res/drawable-hdpi/ic_search_api_holo_light.png
rename to content/contacts/BasicContactables/Application/src/main/res/drawable-hdpi/ic_search_api_holo_light.png
Binary files differ
diff --git a/content/contacts/BasicContactables/BasicContactablesSample/src/main/res/drawable-mdpi/ic_launcher.png b/content/contacts/BasicContactables/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from content/contacts/BasicContactables/BasicContactablesSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to content/contacts/BasicContactables/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/content/contacts/BasicContactables/BasicContactablesSample/src/main/res/drawable-mdpi/ic_search_api_holo_light.png b/content/contacts/BasicContactables/Application/src/main/res/drawable-mdpi/ic_search_api_holo_light.png
similarity index 100%
rename from content/contacts/BasicContactables/BasicContactablesSample/src/main/res/drawable-mdpi/ic_search_api_holo_light.png
rename to content/contacts/BasicContactables/Application/src/main/res/drawable-mdpi/ic_search_api_holo_light.png
Binary files differ
diff --git a/content/contacts/BasicContactables/BasicContactablesSample/src/main/res/drawable-xhdpi/ic_launcher.png b/content/contacts/BasicContactables/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from content/contacts/BasicContactables/BasicContactablesSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to content/contacts/BasicContactables/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/content/contacts/BasicContactables/BasicContactablesSample/src/main/res/drawable-xhdpi/ic_search_api_holo_light.png b/content/contacts/BasicContactables/Application/src/main/res/drawable-xhdpi/ic_search_api_holo_light.png
similarity index 100%
rename from content/contacts/BasicContactables/BasicContactablesSample/src/main/res/drawable-xhdpi/ic_search_api_holo_light.png
rename to content/contacts/BasicContactables/Application/src/main/res/drawable-xhdpi/ic_search_api_holo_light.png
Binary files differ
diff --git a/content/contacts/BasicContactables/BasicContactablesSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/content/contacts/BasicContactables/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from content/contacts/BasicContactables/BasicContactablesSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to content/contacts/BasicContactables/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/content/contacts/BasicContactables/BasicContactablesSample/src/main/res/layout/sample_main.xml b/content/contacts/BasicContactables/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from content/contacts/BasicContactables/BasicContactablesSample/src/main/res/layout/sample_main.xml
rename to content/contacts/BasicContactables/Application/src/main/res/layout/sample_main.xml
diff --git a/content/contacts/BasicContactables/BasicContactablesSample/src/main/res/menu/main.xml b/content/contacts/BasicContactables/Application/src/main/res/menu/main.xml
similarity index 100%
rename from content/contacts/BasicContactables/BasicContactablesSample/src/main/res/menu/main.xml
rename to content/contacts/BasicContactables/Application/src/main/res/menu/main.xml
diff --git a/content/contacts/BasicContactables/BasicContactablesSample/src/main/res/values/strings.xml b/content/contacts/BasicContactables/Application/src/main/res/values/strings.xml
similarity index 100%
rename from content/contacts/BasicContactables/BasicContactablesSample/src/main/res/values/strings.xml
rename to content/contacts/BasicContactables/Application/src/main/res/values/strings.xml
diff --git a/content/contacts/BasicContactables/BasicContactablesSample/src/main/res/values/styles.xml b/content/contacts/BasicContactables/Application/src/main/res/values/styles.xml
similarity index 100%
rename from content/contacts/BasicContactables/BasicContactablesSample/src/main/res/values/styles.xml
rename to content/contacts/BasicContactables/Application/src/main/res/values/styles.xml
diff --git a/content/contacts/BasicContactables/BasicContactablesSample/src/main/res/xml/searchable.xml b/content/contacts/BasicContactables/Application/src/main/res/xml/searchable.xml
similarity index 100%
rename from content/contacts/BasicContactables/BasicContactablesSample/src/main/res/xml/searchable.xml
rename to content/contacts/BasicContactables/Application/src/main/res/xml/searchable.xml
diff --git a/content/contacts/BasicContactables/BasicContactablesSample/tests/AndroidManifest.xml b/content/contacts/BasicContactables/Application/tests/AndroidManifest.xml
similarity index 100%
rename from content/contacts/BasicContactables/BasicContactablesSample/tests/AndroidManifest.xml
rename to content/contacts/BasicContactables/Application/tests/AndroidManifest.xml
diff --git a/content/contacts/BasicContactables/BasicContactablesSample/tests/src/com/example/android/basiccontactables/tests/SampleTests.java b/content/contacts/BasicContactables/Application/tests/src/com/example/android/basiccontactables/tests/SampleTests.java
similarity index 100%
rename from content/contacts/BasicContactables/BasicContactablesSample/tests/src/com/example/android/basiccontactables/tests/SampleTests.java
rename to content/contacts/BasicContactables/Application/tests/src/com/example/android/basiccontactables/tests/SampleTests.java
diff --git a/content/contacts/BasicContactables/settings.gradle b/content/contacts/BasicContactables/settings.gradle
index 5fec49c..9464a35 100644
--- a/content/contacts/BasicContactables/settings.gradle
+++ b/content/contacts/BasicContactables/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicContactablesSample'
+include 'Application'
diff --git a/content/documentsUi/StorageClient/StorageClientSample/.gitignore b/content/documentsUi/StorageClient/Application/.gitignore
similarity index 100%
rename from content/documentsUi/StorageClient/StorageClientSample/.gitignore
rename to content/documentsUi/StorageClient/Application/.gitignore
diff --git a/content/documentsUi/StorageClient/StorageClientSample/README-singleview.txt b/content/documentsUi/StorageClient/Application/README-singleview.txt
similarity index 100%
rename from content/documentsUi/StorageClient/StorageClientSample/README-singleview.txt
rename to content/documentsUi/StorageClient/Application/README-singleview.txt
diff --git a/content/documentsUi/StorageClient/StorageClientSample/proguard-project.txt b/content/documentsUi/StorageClient/Application/proguard-project.txt
similarity index 100%
rename from content/documentsUi/StorageClient/StorageClientSample/proguard-project.txt
rename to content/documentsUi/StorageClient/Application/proguard-project.txt
diff --git a/content/documentsUi/StorageClient/StorageClientSample/src/main/AndroidManifest.xml b/content/documentsUi/StorageClient/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from content/documentsUi/StorageClient/StorageClientSample/src/main/AndroidManifest.xml
rename to content/documentsUi/StorageClient/Application/src/main/AndroidManifest.xml
diff --git a/content/documentsUi/StorageClient/StorageClientSample/src/main/java/com/example/android/storageclient/StorageClientFragment.java b/content/documentsUi/StorageClient/Application/src/main/java/com/example/android/storageclient/StorageClientFragment.java
similarity index 100%
rename from content/documentsUi/StorageClient/StorageClientSample/src/main/java/com/example/android/storageclient/StorageClientFragment.java
rename to content/documentsUi/StorageClient/Application/src/main/java/com/example/android/storageclient/StorageClientFragment.java
diff --git a/content/documentsUi/StorageClient/StorageClientSample/src/main/res/drawable-hdpi/ic_launcher.png b/content/documentsUi/StorageClient/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from content/documentsUi/StorageClient/StorageClientSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to content/documentsUi/StorageClient/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/content/documentsUi/StorageClient/StorageClientSample/src/main/res/drawable-mdpi/ic_launcher.png b/content/documentsUi/StorageClient/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from content/documentsUi/StorageClient/StorageClientSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to content/documentsUi/StorageClient/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/content/documentsUi/StorageClient/StorageClientSample/src/main/res/drawable-xhdpi/ic_launcher.png b/content/documentsUi/StorageClient/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from content/documentsUi/StorageClient/StorageClientSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to content/documentsUi/StorageClient/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/content/documentsUi/StorageClient/StorageClientSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/content/documentsUi/StorageClient/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from content/documentsUi/StorageClient/StorageClientSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to content/documentsUi/StorageClient/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/content/documentsUi/StorageClient/StorageClientSample/tests/AndroidManifest.xml b/content/documentsUi/StorageClient/Application/tests/AndroidManifest.xml
similarity index 100%
rename from content/documentsUi/StorageClient/StorageClientSample/tests/AndroidManifest.xml
rename to content/documentsUi/StorageClient/Application/tests/AndroidManifest.xml
diff --git a/content/documentsUi/StorageClient/StorageClientSample/tests/src/com/example/android/storageclient/tests/SampleTests.java b/content/documentsUi/StorageClient/Application/tests/src/com/example/android/storageclient/tests/SampleTests.java
similarity index 100%
rename from content/documentsUi/StorageClient/StorageClientSample/tests/src/com/example/android/storageclient/tests/SampleTests.java
rename to content/documentsUi/StorageClient/Application/tests/src/com/example/android/storageclient/tests/SampleTests.java
diff --git a/content/documentsUi/StorageClient/settings.gradle b/content/documentsUi/StorageClient/settings.gradle
index 73cfad8..9464a35 100644
--- a/content/documentsUi/StorageClient/settings.gradle
+++ b/content/documentsUi/StorageClient/settings.gradle
@@ -1 +1 @@
-include 'StorageClientSample'
+include 'Application'
diff --git a/content/documentsUi/StorageProvider/StorageProviderSample/.gitignore b/content/documentsUi/StorageProvider/Application/.gitignore
similarity index 100%
rename from content/documentsUi/StorageProvider/StorageProviderSample/.gitignore
rename to content/documentsUi/StorageProvider/Application/.gitignore
diff --git a/content/documentsUi/StorageProvider/StorageProviderSample/README-singleview.txt b/content/documentsUi/StorageProvider/Application/README-singleview.txt
similarity index 100%
rename from content/documentsUi/StorageProvider/StorageProviderSample/README-singleview.txt
rename to content/documentsUi/StorageProvider/Application/README-singleview.txt
diff --git a/content/documentsUi/StorageProvider/StorageProviderSample/proguard-project.txt b/content/documentsUi/StorageProvider/Application/proguard-project.txt
similarity index 100%
rename from content/documentsUi/StorageProvider/StorageProviderSample/proguard-project.txt
rename to content/documentsUi/StorageProvider/Application/proguard-project.txt
diff --git a/content/documentsUi/StorageProvider/StorageProviderSample/src/main/AndroidManifest.xml b/content/documentsUi/StorageProvider/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from content/documentsUi/StorageProvider/StorageProviderSample/src/main/AndroidManifest.xml
rename to content/documentsUi/StorageProvider/Application/src/main/AndroidManifest.xml
diff --git a/content/documentsUi/StorageProvider/StorageProviderSample/src/main/java/com/example/android/storageprovider/MyCloudFragment.java b/content/documentsUi/StorageProvider/Application/src/main/java/com/example/android/storageprovider/MyCloudFragment.java
similarity index 100%
rename from content/documentsUi/StorageProvider/StorageProviderSample/src/main/java/com/example/android/storageprovider/MyCloudFragment.java
rename to content/documentsUi/StorageProvider/Application/src/main/java/com/example/android/storageprovider/MyCloudFragment.java
diff --git a/content/documentsUi/StorageProvider/StorageProviderSample/src/main/java/com/example/android/storageprovider/MyCloudProvider.java b/content/documentsUi/StorageProvider/Application/src/main/java/com/example/android/storageprovider/MyCloudProvider.java
similarity index 100%
rename from content/documentsUi/StorageProvider/StorageProviderSample/src/main/java/com/example/android/storageprovider/MyCloudProvider.java
rename to content/documentsUi/StorageProvider/Application/src/main/java/com/example/android/storageprovider/MyCloudProvider.java
diff --git a/content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/drawable-hdpi/ic_launcher.png b/content/documentsUi/StorageProvider/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to content/documentsUi/StorageProvider/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/drawable-mdpi/ic_launcher.png b/content/documentsUi/StorageProvider/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to content/documentsUi/StorageProvider/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/drawable-xhdpi/ic_launcher.png b/content/documentsUi/StorageProvider/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to content/documentsUi/StorageProvider/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/content/documentsUi/StorageProvider/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to content/documentsUi/StorageProvider/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/ic_launcher.png b/content/documentsUi/StorageProvider/Application/src/main/res/ic_launcher.png
similarity index 100%
rename from content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/ic_launcher.png
rename to content/documentsUi/StorageProvider/Application/src/main/res/ic_launcher.png
Binary files differ
diff --git a/content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/raw/android_computer_android_studio.jpg b/content/documentsUi/StorageProvider/Application/src/main/res/raw/android_computer_android_studio.jpg
similarity index 100%
rename from content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/raw/android_computer_android_studio.jpg
rename to content/documentsUi/StorageProvider/Application/src/main/res/raw/android_computer_android_studio.jpg
Binary files differ
diff --git a/content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/raw/android_computer_back.jpg b/content/documentsUi/StorageProvider/Application/src/main/res/raw/android_computer_back.jpg
similarity index 100%
rename from content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/raw/android_computer_back.jpg
rename to content/documentsUi/StorageProvider/Application/src/main/res/raw/android_computer_back.jpg
Binary files differ
diff --git a/content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/raw/android_dinner.jpg b/content/documentsUi/StorageProvider/Application/src/main/res/raw/android_dinner.jpg
similarity index 100%
rename from content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/raw/android_dinner.jpg
rename to content/documentsUi/StorageProvider/Application/src/main/res/raw/android_dinner.jpg
Binary files differ
diff --git a/content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/raw/android_pumpkins_fall.jpg b/content/documentsUi/StorageProvider/Application/src/main/res/raw/android_pumpkins_fall.jpg
similarity index 100%
rename from content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/raw/android_pumpkins_fall.jpg
rename to content/documentsUi/StorageProvider/Application/src/main/res/raw/android_pumpkins_fall.jpg
Binary files differ
diff --git a/content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/raw/android_rose.jpg b/content/documentsUi/StorageProvider/Application/src/main/res/raw/android_rose.jpg
similarity index 100%
rename from content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/raw/android_rose.jpg
rename to content/documentsUi/StorageProvider/Application/src/main/res/raw/android_rose.jpg
Binary files differ
diff --git a/content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/raw/cat_names.txt b/content/documentsUi/StorageProvider/Application/src/main/res/raw/cat_names.txt
similarity index 100%
rename from content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/raw/cat_names.txt
rename to content/documentsUi/StorageProvider/Application/src/main/res/raw/cat_names.txt
diff --git a/content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/raw/dog_names.txt b/content/documentsUi/StorageProvider/Application/src/main/res/raw/dog_names.txt
similarity index 100%
rename from content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/raw/dog_names.txt
rename to content/documentsUi/StorageProvider/Application/src/main/res/raw/dog_names.txt
diff --git a/content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/raw/example.docx b/content/documentsUi/StorageProvider/Application/src/main/res/raw/example.docx
similarity index 100%
rename from content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/raw/example.docx
rename to content/documentsUi/StorageProvider/Application/src/main/res/raw/example.docx
Binary files differ
diff --git a/content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/values/app_strings.xml b/content/documentsUi/StorageProvider/Application/src/main/res/values/app_strings.xml
similarity index 100%
rename from content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/values/app_strings.xml
rename to content/documentsUi/StorageProvider/Application/src/main/res/values/app_strings.xml
diff --git a/content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/values/arrays.xml b/content/documentsUi/StorageProvider/Application/src/main/res/values/arrays.xml
similarity index 100%
rename from content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/values/arrays.xml
rename to content/documentsUi/StorageProvider/Application/src/main/res/values/arrays.xml
diff --git a/content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/values/styles.xml b/content/documentsUi/StorageProvider/Application/src/main/res/values/styles.xml
similarity index 100%
rename from content/documentsUi/StorageProvider/StorageProviderSample/src/main/res/values/styles.xml
rename to content/documentsUi/StorageProvider/Application/src/main/res/values/styles.xml
diff --git a/content/documentsUi/StorageProvider/settings.gradle b/content/documentsUi/StorageProvider/settings.gradle
index d4b818f..9464a35 100644
--- a/content/documentsUi/StorageProvider/settings.gradle
+++ b/content/documentsUi/StorageProvider/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'StorageProviderSample'
+include 'Application'
diff --git a/content/multiuser/AppRestrictions/AppRestrictionsSample/.gitignore b/content/multiuser/AppRestrictions/Application/.gitignore
similarity index 100%
rename from content/multiuser/AppRestrictions/AppRestrictionsSample/.gitignore
rename to content/multiuser/AppRestrictions/Application/.gitignore
diff --git a/content/multiuser/AppRestrictions/AppRestrictionsSample/proguard-project.txt b/content/multiuser/AppRestrictions/Application/proguard-project.txt
similarity index 100%
rename from content/multiuser/AppRestrictions/AppRestrictionsSample/proguard-project.txt
rename to content/multiuser/AppRestrictions/Application/proguard-project.txt
diff --git a/content/multiuser/AppRestrictions/AppRestrictionsSample/src/main/AndroidManifest.xml b/content/multiuser/AppRestrictions/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from content/multiuser/AppRestrictions/AppRestrictionsSample/src/main/AndroidManifest.xml
rename to content/multiuser/AppRestrictions/Application/src/main/AndroidManifest.xml
diff --git a/content/multiuser/AppRestrictions/AppRestrictionsSample/src/main/java/com/example/android/apprestrictions/CustomRestrictionsActivity.java b/content/multiuser/AppRestrictions/Application/src/main/java/com/example/android/apprestrictions/CustomRestrictionsActivity.java
similarity index 100%
rename from content/multiuser/AppRestrictions/AppRestrictionsSample/src/main/java/com/example/android/apprestrictions/CustomRestrictionsActivity.java
rename to content/multiuser/AppRestrictions/Application/src/main/java/com/example/android/apprestrictions/CustomRestrictionsActivity.java
diff --git a/content/multiuser/AppRestrictions/AppRestrictionsSample/src/main/java/com/example/android/apprestrictions/CustomRestrictionsFragment.java b/content/multiuser/AppRestrictions/Application/src/main/java/com/example/android/apprestrictions/CustomRestrictionsFragment.java
similarity index 100%
rename from content/multiuser/AppRestrictions/AppRestrictionsSample/src/main/java/com/example/android/apprestrictions/CustomRestrictionsFragment.java
rename to content/multiuser/AppRestrictions/Application/src/main/java/com/example/android/apprestrictions/CustomRestrictionsFragment.java
diff --git a/content/multiuser/AppRestrictions/AppRestrictionsSample/src/main/java/com/example/android/apprestrictions/GetRestrictionsReceiver.java b/content/multiuser/AppRestrictions/Application/src/main/java/com/example/android/apprestrictions/GetRestrictionsReceiver.java
similarity index 100%
rename from content/multiuser/AppRestrictions/AppRestrictionsSample/src/main/java/com/example/android/apprestrictions/GetRestrictionsReceiver.java
rename to content/multiuser/AppRestrictions/Application/src/main/java/com/example/android/apprestrictions/GetRestrictionsReceiver.java
diff --git a/content/multiuser/AppRestrictions/AppRestrictionsSample/src/main/java/com/example/android/apprestrictions/MainActivity.java b/content/multiuser/AppRestrictions/Application/src/main/java/com/example/android/apprestrictions/MainActivity.java
similarity index 100%
rename from content/multiuser/AppRestrictions/AppRestrictionsSample/src/main/java/com/example/android/apprestrictions/MainActivity.java
rename to content/multiuser/AppRestrictions/Application/src/main/java/com/example/android/apprestrictions/MainActivity.java
diff --git a/content/multiuser/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-hdpi/ic_launcher.png b/content/multiuser/AppRestrictions/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from content/multiuser/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to content/multiuser/AppRestrictions/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/content/multiuser/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-mdpi/ic_launcher.png b/content/multiuser/AppRestrictions/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from content/multiuser/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to content/multiuser/AppRestrictions/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/content/multiuser/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-xhdpi/ic_launcher.png b/content/multiuser/AppRestrictions/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from content/multiuser/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to content/multiuser/AppRestrictions/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/content/multiuser/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/content/multiuser/AppRestrictions/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from content/multiuser/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to content/multiuser/AppRestrictions/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/content/multiuser/AppRestrictions/AppRestrictionsSample/src/main/res/layout/main.xml b/content/multiuser/AppRestrictions/Application/src/main/res/layout/main.xml
similarity index 100%
rename from content/multiuser/AppRestrictions/AppRestrictionsSample/src/main/res/layout/main.xml
rename to content/multiuser/AppRestrictions/Application/src/main/res/layout/main.xml
diff --git a/content/multiuser/AppRestrictions/AppRestrictionsSample/src/main/res/values/strings.xml b/content/multiuser/AppRestrictions/Application/src/main/res/values/strings.xml
similarity index 100%
rename from content/multiuser/AppRestrictions/AppRestrictionsSample/src/main/res/values/strings.xml
rename to content/multiuser/AppRestrictions/Application/src/main/res/values/strings.xml
diff --git a/content/multiuser/AppRestrictions/AppRestrictionsSample/src/main/res/xml/custom_prefs.xml b/content/multiuser/AppRestrictions/Application/src/main/res/xml/custom_prefs.xml
similarity index 100%
rename from content/multiuser/AppRestrictions/AppRestrictionsSample/src/main/res/xml/custom_prefs.xml
rename to content/multiuser/AppRestrictions/Application/src/main/res/xml/custom_prefs.xml
diff --git a/content/multiuser/AppRestrictions/settings.gradle b/content/multiuser/AppRestrictions/settings.gradle
index 02aef49..9464a35 100644
--- a/content/multiuser/AppRestrictions/settings.gradle
+++ b/content/multiuser/AppRestrictions/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'AppRestrictionsSample'
+include 'Application'
diff --git a/input/gestures/BasicGestureDetect/BasicGestureDetectSample/.gitignore b/input/gestures/BasicGestureDetect/Application/.gitignore
similarity index 100%
rename from input/gestures/BasicGestureDetect/BasicGestureDetectSample/.gitignore
rename to input/gestures/BasicGestureDetect/Application/.gitignore
diff --git a/input/gestures/BasicGestureDetect/BasicGestureDetectSample/README-singleview.txt b/input/gestures/BasicGestureDetect/Application/README-singleview.txt
similarity index 100%
rename from input/gestures/BasicGestureDetect/BasicGestureDetectSample/README-singleview.txt
rename to input/gestures/BasicGestureDetect/Application/README-singleview.txt
diff --git a/input/gestures/BasicGestureDetect/BasicGestureDetectSample/proguard-project.txt b/input/gestures/BasicGestureDetect/Application/proguard-project.txt
similarity index 100%
rename from input/gestures/BasicGestureDetect/BasicGestureDetectSample/proguard-project.txt
rename to input/gestures/BasicGestureDetect/Application/proguard-project.txt
diff --git a/input/gestures/BasicGestureDetect/BasicGestureDetectSample/src/main/AndroidManifest.xml b/input/gestures/BasicGestureDetect/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from input/gestures/BasicGestureDetect/BasicGestureDetectSample/src/main/AndroidManifest.xml
rename to input/gestures/BasicGestureDetect/Application/src/main/AndroidManifest.xml
diff --git a/input/gestures/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/basicgesturedetect/BasicGestureDetectFragment.java b/input/gestures/BasicGestureDetect/Application/src/main/java/com/example/android/basicgesturedetect/BasicGestureDetectFragment.java
similarity index 100%
rename from input/gestures/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/basicgesturedetect/BasicGestureDetectFragment.java
rename to input/gestures/BasicGestureDetect/Application/src/main/java/com/example/android/basicgesturedetect/BasicGestureDetectFragment.java
diff --git a/input/gestures/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/basicgesturedetect/GestureListener.java b/input/gestures/BasicGestureDetect/Application/src/main/java/com/example/android/basicgesturedetect/GestureListener.java
similarity index 100%
rename from input/gestures/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/basicgesturedetect/GestureListener.java
rename to input/gestures/BasicGestureDetect/Application/src/main/java/com/example/android/basicgesturedetect/GestureListener.java
diff --git a/input/gestures/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-hdpi/ic_launcher.png b/input/gestures/BasicGestureDetect/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from input/gestures/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to input/gestures/BasicGestureDetect/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/input/gestures/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-mdpi/ic_launcher.png b/input/gestures/BasicGestureDetect/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from input/gestures/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to input/gestures/BasicGestureDetect/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/input/gestures/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-xhdpi/ic_launcher.png b/input/gestures/BasicGestureDetect/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from input/gestures/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to input/gestures/BasicGestureDetect/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/input/gestures/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/input/gestures/BasicGestureDetect/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from input/gestures/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to input/gestures/BasicGestureDetect/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/input/gestures/BasicGestureDetect/BasicGestureDetectSample/tests/AndroidManifest.xml b/input/gestures/BasicGestureDetect/Application/tests/AndroidManifest.xml
similarity index 100%
rename from input/gestures/BasicGestureDetect/BasicGestureDetectSample/tests/AndroidManifest.xml
rename to input/gestures/BasicGestureDetect/Application/tests/AndroidManifest.xml
diff --git a/input/gestures/BasicGestureDetect/BasicGestureDetectSample/tests/src/com/example/android/basicgesturedetect/tests/SampleTests.java b/input/gestures/BasicGestureDetect/Application/tests/src/com/example/android/basicgesturedetect/tests/SampleTests.java
similarity index 100%
rename from input/gestures/BasicGestureDetect/BasicGestureDetectSample/tests/src/com/example/android/basicgesturedetect/tests/SampleTests.java
rename to input/gestures/BasicGestureDetect/Application/tests/src/com/example/android/basicgesturedetect/tests/SampleTests.java
diff --git a/input/gestures/BasicGestureDetect/settings.gradle b/input/gestures/BasicGestureDetect/settings.gradle
index ba7e8c0..9464a35 100644
--- a/input/gestures/BasicGestureDetect/settings.gradle
+++ b/input/gestures/BasicGestureDetect/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicGestureDetectSample'
+include 'Application'
diff --git a/input/multitouch/BasicMultitouch/BasicMultitouchSample/.gitignore b/input/multitouch/BasicMultitouch/Application/.gitignore
similarity index 100%
rename from input/multitouch/BasicMultitouch/BasicMultitouchSample/.gitignore
rename to input/multitouch/BasicMultitouch/Application/.gitignore
diff --git a/input/multitouch/BasicMultitouch/BasicMultitouchSample/proguard-project.txt b/input/multitouch/BasicMultitouch/Application/proguard-project.txt
similarity index 100%
rename from input/multitouch/BasicMultitouch/BasicMultitouchSample/proguard-project.txt
rename to input/multitouch/BasicMultitouch/Application/proguard-project.txt
diff --git a/input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/AndroidManifest.xml b/input/multitouch/BasicMultitouch/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/AndroidManifest.xml
rename to input/multitouch/BasicMultitouch/Application/src/main/AndroidManifest.xml
diff --git a/input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/basicmultitouch/MainActivity.java b/input/multitouch/BasicMultitouch/Application/src/main/java/com/example/android/basicmultitouch/MainActivity.java
similarity index 100%
rename from input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/basicmultitouch/MainActivity.java
rename to input/multitouch/BasicMultitouch/Application/src/main/java/com/example/android/basicmultitouch/MainActivity.java
diff --git a/input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/basicmultitouch/Pools.java b/input/multitouch/BasicMultitouch/Application/src/main/java/com/example/android/basicmultitouch/Pools.java
similarity index 100%
rename from input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/basicmultitouch/Pools.java
rename to input/multitouch/BasicMultitouch/Application/src/main/java/com/example/android/basicmultitouch/Pools.java
diff --git a/input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/basicmultitouch/TouchDisplayView.java b/input/multitouch/BasicMultitouch/Application/src/main/java/com/example/android/basicmultitouch/TouchDisplayView.java
similarity index 100%
rename from input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/basicmultitouch/TouchDisplayView.java
rename to input/multitouch/BasicMultitouch/Application/src/main/java/com/example/android/basicmultitouch/TouchDisplayView.java
diff --git a/input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-hdpi/ic_launcher.png b/input/multitouch/BasicMultitouch/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to input/multitouch/BasicMultitouch/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-mdpi/ic_launcher.png b/input/multitouch/BasicMultitouch/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to input/multitouch/BasicMultitouch/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-xhdpi/ic_launcher.png b/input/multitouch/BasicMultitouch/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to input/multitouch/BasicMultitouch/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/input/multitouch/BasicMultitouch/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to input/multitouch/BasicMultitouch/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/res/layout/layout_mainactivity.xml b/input/multitouch/BasicMultitouch/Application/src/main/res/layout/layout_mainactivity.xml
similarity index 100%
rename from input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/res/layout/layout_mainactivity.xml
rename to input/multitouch/BasicMultitouch/Application/src/main/res/layout/layout_mainactivity.xml
diff --git a/input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/res/values-v11/styles.xml b/input/multitouch/BasicMultitouch/Application/src/main/res/values-v11/styles.xml
similarity index 100%
rename from input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/res/values-v11/styles.xml
rename to input/multitouch/BasicMultitouch/Application/src/main/res/values-v11/styles.xml
diff --git a/input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/res/values-v14/styles.xml b/input/multitouch/BasicMultitouch/Application/src/main/res/values-v14/styles.xml
similarity index 100%
rename from input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/res/values-v14/styles.xml
rename to input/multitouch/BasicMultitouch/Application/src/main/res/values-v14/styles.xml
diff --git a/input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/res/values/strings.xml b/input/multitouch/BasicMultitouch/Application/src/main/res/values/strings.xml
similarity index 100%
rename from input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/res/values/strings.xml
rename to input/multitouch/BasicMultitouch/Application/src/main/res/values/strings.xml
diff --git a/input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/res/values/styles.xml b/input/multitouch/BasicMultitouch/Application/src/main/res/values/styles.xml
similarity index 100%
rename from input/multitouch/BasicMultitouch/BasicMultitouchSample/src/main/res/values/styles.xml
rename to input/multitouch/BasicMultitouch/Application/src/main/res/values/styles.xml
diff --git a/input/multitouch/BasicMultitouch/settings.gradle b/input/multitouch/BasicMultitouch/settings.gradle
index 6e6c5ba..9464a35 100644
--- a/input/multitouch/BasicMultitouch/settings.gradle
+++ b/input/multitouch/BasicMultitouch/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicMultitouchSample'
+include 'Application'
diff --git a/media/BasicMediaDecoder/BasicMediaDecoderSample/.gitignore b/media/BasicMediaDecoder/Application/.gitignore
similarity index 100%
rename from media/BasicMediaDecoder/BasicMediaDecoderSample/.gitignore
rename to media/BasicMediaDecoder/Application/.gitignore
diff --git a/media/BasicMediaDecoder/BasicMediaDecoderSample/proguard-project.txt b/media/BasicMediaDecoder/Application/proguard-project.txt
similarity index 100%
rename from media/BasicMediaDecoder/BasicMediaDecoderSample/proguard-project.txt
rename to media/BasicMediaDecoder/Application/proguard-project.txt
diff --git a/media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/AndroidManifest.xml b/media/BasicMediaDecoder/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/AndroidManifest.xml
rename to media/BasicMediaDecoder/Application/src/main/AndroidManifest.xml
diff --git a/media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/java/com/example/android/basicmediadecoder/MainActivity.java b/media/BasicMediaDecoder/Application/src/main/java/com/example/android/basicmediadecoder/MainActivity.java
similarity index 100%
rename from media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/java/com/example/android/basicmediadecoder/MainActivity.java
rename to media/BasicMediaDecoder/Application/src/main/java/com/example/android/basicmediadecoder/MainActivity.java
diff --git a/media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-hdpi/ic_action_play.png b/media/BasicMediaDecoder/Application/src/main/res/drawable-hdpi/ic_action_play.png
similarity index 100%
rename from media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-hdpi/ic_action_play.png
rename to media/BasicMediaDecoder/Application/src/main/res/drawable-hdpi/ic_action_play.png
Binary files differ
diff --git a/media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-hdpi/ic_action_play_disabled.png b/media/BasicMediaDecoder/Application/src/main/res/drawable-hdpi/ic_action_play_disabled.png
similarity index 100%
rename from media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-hdpi/ic_action_play_disabled.png
rename to media/BasicMediaDecoder/Application/src/main/res/drawable-hdpi/ic_action_play_disabled.png
Binary files differ
diff --git a/media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-hdpi/ic_launcher.png b/media/BasicMediaDecoder/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to media/BasicMediaDecoder/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-mdpi/ic_action_play.png b/media/BasicMediaDecoder/Application/src/main/res/drawable-mdpi/ic_action_play.png
similarity index 100%
rename from media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-mdpi/ic_action_play.png
rename to media/BasicMediaDecoder/Application/src/main/res/drawable-mdpi/ic_action_play.png
Binary files differ
diff --git a/media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-mdpi/ic_action_play_disabled.png b/media/BasicMediaDecoder/Application/src/main/res/drawable-mdpi/ic_action_play_disabled.png
similarity index 100%
rename from media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-mdpi/ic_action_play_disabled.png
rename to media/BasicMediaDecoder/Application/src/main/res/drawable-mdpi/ic_action_play_disabled.png
Binary files differ
diff --git a/media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-mdpi/ic_launcher.png b/media/BasicMediaDecoder/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to media/BasicMediaDecoder/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-xhdpi/ic_action_play.png b/media/BasicMediaDecoder/Application/src/main/res/drawable-xhdpi/ic_action_play.png
similarity index 100%
rename from media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-xhdpi/ic_action_play.png
rename to media/BasicMediaDecoder/Application/src/main/res/drawable-xhdpi/ic_action_play.png
Binary files differ
diff --git a/media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-xhdpi/ic_action_play_disabled.png b/media/BasicMediaDecoder/Application/src/main/res/drawable-xhdpi/ic_action_play_disabled.png
similarity index 100%
rename from media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-xhdpi/ic_action_play_disabled.png
rename to media/BasicMediaDecoder/Application/src/main/res/drawable-xhdpi/ic_action_play_disabled.png
Binary files differ
diff --git a/media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-xhdpi/ic_launcher.png b/media/BasicMediaDecoder/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to media/BasicMediaDecoder/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/media/BasicMediaDecoder/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to media/BasicMediaDecoder/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable/selector_play.xml b/media/BasicMediaDecoder/Application/src/main/res/drawable/selector_play.xml
similarity index 100%
rename from media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable/selector_play.xml
rename to media/BasicMediaDecoder/Application/src/main/res/drawable/selector_play.xml
diff --git a/media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/layout/sample_main.xml b/media/BasicMediaDecoder/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/layout/sample_main.xml
rename to media/BasicMediaDecoder/Application/src/main/res/layout/sample_main.xml
diff --git a/media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/menu/action_menu.xml b/media/BasicMediaDecoder/Application/src/main/res/menu/action_menu.xml
similarity index 100%
rename from media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/menu/action_menu.xml
rename to media/BasicMediaDecoder/Application/src/main/res/menu/action_menu.xml
diff --git a/media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/raw/vid_bigbuckbunny.mp4 b/media/BasicMediaDecoder/Application/src/main/res/raw/vid_bigbuckbunny.mp4
similarity index 100%
rename from media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/raw/vid_bigbuckbunny.mp4
rename to media/BasicMediaDecoder/Application/src/main/res/raw/vid_bigbuckbunny.mp4
Binary files differ
diff --git a/media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values/strings.xml b/media/BasicMediaDecoder/Application/src/main/res/values/strings.xml
similarity index 100%
rename from media/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values/strings.xml
rename to media/BasicMediaDecoder/Application/src/main/res/values/strings.xml
diff --git a/media/BasicMediaDecoder/settings.gradle b/media/BasicMediaDecoder/settings.gradle
index 1e76e09..9464a35 100644
--- a/media/BasicMediaDecoder/settings.gradle
+++ b/media/BasicMediaDecoder/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicMediaDecoderSample'
+include 'Application'
diff --git a/media/BasicMediaRouter/BasicMediaRouterSample/.gitignore b/media/BasicMediaRouter/Application/.gitignore
similarity index 100%
rename from media/BasicMediaRouter/BasicMediaRouterSample/.gitignore
rename to media/BasicMediaRouter/Application/.gitignore
diff --git a/media/BasicMediaRouter/BasicMediaRouterSample/proguard-project.txt b/media/BasicMediaRouter/Application/proguard-project.txt
similarity index 100%
rename from media/BasicMediaRouter/BasicMediaRouterSample/proguard-project.txt
rename to media/BasicMediaRouter/Application/proguard-project.txt
diff --git a/media/BasicMediaRouter/BasicMediaRouterSample/src/main/AndroidManifest.xml b/media/BasicMediaRouter/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from media/BasicMediaRouter/BasicMediaRouterSample/src/main/AndroidManifest.xml
rename to media/BasicMediaRouter/Application/src/main/AndroidManifest.xml
diff --git a/media/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/basicmediarouter/MainActivity.java b/media/BasicMediaRouter/Application/src/main/java/com/example/android/basicmediarouter/MainActivity.java
similarity index 100%
rename from media/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/basicmediarouter/MainActivity.java
rename to media/BasicMediaRouter/Application/src/main/java/com/example/android/basicmediarouter/MainActivity.java
diff --git a/media/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/basicmediarouter/SamplePresentation.java b/media/BasicMediaRouter/Application/src/main/java/com/example/android/basicmediarouter/SamplePresentation.java
similarity index 100%
rename from media/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/basicmediarouter/SamplePresentation.java
rename to media/BasicMediaRouter/Application/src/main/java/com/example/android/basicmediarouter/SamplePresentation.java
diff --git a/media/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-hdpi/ic_launcher.png b/media/BasicMediaRouter/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from media/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to media/BasicMediaRouter/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/media/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-mdpi/ic_launcher.png b/media/BasicMediaRouter/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from media/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to media/BasicMediaRouter/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/media/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-xhdpi/ic_launcher.png b/media/BasicMediaRouter/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from media/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to media/BasicMediaRouter/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/media/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/media/BasicMediaRouter/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from media/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to media/BasicMediaRouter/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/media/BasicMediaRouter/BasicMediaRouterSample/src/main/res/layout/display.xml b/media/BasicMediaRouter/Application/src/main/res/layout/display.xml
similarity index 100%
rename from media/BasicMediaRouter/BasicMediaRouterSample/src/main/res/layout/display.xml
rename to media/BasicMediaRouter/Application/src/main/res/layout/display.xml
diff --git a/media/BasicMediaRouter/BasicMediaRouterSample/src/main/res/layout/sample_main.xml b/media/BasicMediaRouter/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from media/BasicMediaRouter/BasicMediaRouterSample/src/main/res/layout/sample_main.xml
rename to media/BasicMediaRouter/Application/src/main/res/layout/sample_main.xml
diff --git a/media/BasicMediaRouter/BasicMediaRouterSample/src/main/res/menu/main.xml b/media/BasicMediaRouter/Application/src/main/res/menu/main.xml
similarity index 100%
rename from media/BasicMediaRouter/BasicMediaRouterSample/src/main/res/menu/main.xml
rename to media/BasicMediaRouter/Application/src/main/res/menu/main.xml
diff --git a/media/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/colors.xml b/media/BasicMediaRouter/Application/src/main/res/values/colors.xml
similarity index 100%
rename from media/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/colors.xml
rename to media/BasicMediaRouter/Application/src/main/res/values/colors.xml
diff --git a/media/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/strings.xml b/media/BasicMediaRouter/Application/src/main/res/values/strings.xml
similarity index 100%
rename from media/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/strings.xml
rename to media/BasicMediaRouter/Application/src/main/res/values/strings.xml
diff --git a/media/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/styles.xml b/media/BasicMediaRouter/Application/src/main/res/values/styles.xml
similarity index 100%
rename from media/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/styles.xml
rename to media/BasicMediaRouter/Application/src/main/res/values/styles.xml
diff --git a/media/BasicMediaRouter/BasicMediaRouterSample/tests/AndroidManifest.xml b/media/BasicMediaRouter/Application/tests/AndroidManifest.xml
similarity index 100%
rename from media/BasicMediaRouter/BasicMediaRouterSample/tests/AndroidManifest.xml
rename to media/BasicMediaRouter/Application/tests/AndroidManifest.xml
diff --git a/media/BasicMediaRouter/BasicMediaRouterSample/tests/src/com/example/android/basicmediarouter/tests/SampleTests.java b/media/BasicMediaRouter/Application/tests/src/com/example/android/basicmediarouter/tests/SampleTests.java
similarity index 100%
rename from media/BasicMediaRouter/BasicMediaRouterSample/tests/src/com/example/android/basicmediarouter/tests/SampleTests.java
rename to media/BasicMediaRouter/Application/tests/src/com/example/android/basicmediarouter/tests/SampleTests.java
diff --git a/media/BasicMediaRouter/settings.gradle b/media/BasicMediaRouter/settings.gradle
index 9d5cbc2..9464a35 100644
--- a/media/BasicMediaRouter/settings.gradle
+++ b/media/BasicMediaRouter/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicMediaRouterSample'
+include 'Application'
diff --git a/media/MediaRecorder/MediaRecorderSample/.gitignore b/media/MediaRecorder/Application/.gitignore
similarity index 100%
rename from media/MediaRecorder/MediaRecorderSample/.gitignore
rename to media/MediaRecorder/Application/.gitignore
diff --git a/media/MediaRecorder/MediaRecorderSample/proguard-project.txt b/media/MediaRecorder/Application/proguard-project.txt
similarity index 100%
rename from media/MediaRecorder/MediaRecorderSample/proguard-project.txt
rename to media/MediaRecorder/Application/proguard-project.txt
diff --git a/media/MediaRecorder/MediaRecorderSample/src/main/AndroidManifest.xml b/media/MediaRecorder/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from media/MediaRecorder/MediaRecorderSample/src/main/AndroidManifest.xml
rename to media/MediaRecorder/Application/src/main/AndroidManifest.xml
diff --git a/media/MediaRecorder/MediaRecorderSample/src/main/java/com/example/android/mediarecorder/MainActivity.java b/media/MediaRecorder/Application/src/main/java/com/example/android/mediarecorder/MainActivity.java
similarity index 100%
rename from media/MediaRecorder/MediaRecorderSample/src/main/java/com/example/android/mediarecorder/MainActivity.java
rename to media/MediaRecorder/Application/src/main/java/com/example/android/mediarecorder/MainActivity.java
diff --git a/media/MediaRecorder/MediaRecorderSample/src/main/res/drawable-hdpi/ic_launcher.png b/media/MediaRecorder/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from media/MediaRecorder/MediaRecorderSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to media/MediaRecorder/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/media/MediaRecorder/MediaRecorderSample/src/main/res/drawable-mdpi/ic_launcher.png b/media/MediaRecorder/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from media/MediaRecorder/MediaRecorderSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to media/MediaRecorder/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/media/MediaRecorder/MediaRecorderSample/src/main/res/drawable-xhdpi/ic_launcher.png b/media/MediaRecorder/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from media/MediaRecorder/MediaRecorderSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to media/MediaRecorder/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/media/MediaRecorder/MediaRecorderSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/media/MediaRecorder/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from media/MediaRecorder/MediaRecorderSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to media/MediaRecorder/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/media/MediaRecorder/MediaRecorderSample/src/main/res/layout/sample_main.xml b/media/MediaRecorder/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from media/MediaRecorder/MediaRecorderSample/src/main/res/layout/sample_main.xml
rename to media/MediaRecorder/Application/src/main/res/layout/sample_main.xml
diff --git a/media/MediaRecorder/MediaRecorderSample/src/main/res/values-sw720dp-land/dimens.xml b/media/MediaRecorder/Application/src/main/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from media/MediaRecorder/MediaRecorderSample/src/main/res/values-sw720dp-land/dimens.xml
rename to media/MediaRecorder/Application/src/main/res/values-sw720dp-land/dimens.xml
diff --git a/media/MediaRecorder/MediaRecorderSample/src/main/res/values/dimens.xml b/media/MediaRecorder/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from media/MediaRecorder/MediaRecorderSample/src/main/res/values/dimens.xml
rename to media/MediaRecorder/Application/src/main/res/values/dimens.xml
diff --git a/media/MediaRecorder/MediaRecorderSample/src/main/res/values/strings.xml b/media/MediaRecorder/Application/src/main/res/values/strings.xml
similarity index 100%
rename from media/MediaRecorder/MediaRecorderSample/src/main/res/values/strings.xml
rename to media/MediaRecorder/Application/src/main/res/values/strings.xml
diff --git a/media/MediaRecorder/settings.gradle b/media/MediaRecorder/settings.gradle
index 61e4032..9464a35 100644
--- a/media/MediaRecorder/settings.gradle
+++ b/media/MediaRecorder/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'MediaRecorderSample'
+include 'Application'
diff --git a/media/MediaRouter/MediaRouterSample/.gitignore b/media/MediaRouter/Application/.gitignore
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/.gitignore
rename to media/MediaRouter/Application/.gitignore
diff --git a/media/MediaRouter/MediaRouterSample/proguard-project.txt b/media/MediaRouter/Application/proguard-project.txt
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/proguard-project.txt
rename to media/MediaRouter/Application/proguard-project.txt
diff --git a/media/MediaRouter/MediaRouterSample/src/main/AndroidManifest.xml b/media/MediaRouter/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/AndroidManifest.xml
rename to media/MediaRouter/Application/src/main/AndroidManifest.xml
diff --git a/media/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/LocalPlayer.java b/media/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/LocalPlayer.java
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/LocalPlayer.java
rename to media/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/LocalPlayer.java
diff --git a/media/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/MainActivity.java b/media/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/MainActivity.java
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/MainActivity.java
rename to media/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/MainActivity.java
diff --git a/media/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/OverlayDisplayWindow.java b/media/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/OverlayDisplayWindow.java
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/OverlayDisplayWindow.java
rename to media/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/OverlayDisplayWindow.java
diff --git a/media/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/Player.java b/media/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/Player.java
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/Player.java
rename to media/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/Player.java
diff --git a/media/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/PlaylistItem.java b/media/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/PlaylistItem.java
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/PlaylistItem.java
rename to media/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/PlaylistItem.java
diff --git a/media/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/RemotePlayer.java b/media/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/RemotePlayer.java
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/RemotePlayer.java
rename to media/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/RemotePlayer.java
diff --git a/media/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/SampleMediaButtonReceiver.java b/media/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/SampleMediaButtonReceiver.java
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/SampleMediaButtonReceiver.java
rename to media/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/SampleMediaButtonReceiver.java
diff --git a/media/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/SessionManager.java b/media/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/SessionManager.java
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/SessionManager.java
rename to media/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/SessionManager.java
diff --git a/media/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/provider/SampleMediaRouteProvider.java b/media/MediaRouter/Application/src/main/java/com/example/android/mediarouter/provider/SampleMediaRouteProvider.java
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/provider/SampleMediaRouteProvider.java
rename to media/MediaRouter/Application/src/main/java/com/example/android/mediarouter/provider/SampleMediaRouteProvider.java
diff --git a/media/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/provider/SampleMediaRouteProviderService.java b/media/MediaRouter/Application/src/main/java/com/example/android/mediarouter/provider/SampleMediaRouteProviderService.java
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/provider/SampleMediaRouteProviderService.java
rename to media/MediaRouter/Application/src/main/java/com/example/android/mediarouter/provider/SampleMediaRouteProviderService.java
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_action_pause.png b/media/MediaRouter/Application/src/main/res/drawable-hdpi/ic_action_pause.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_action_pause.png
rename to media/MediaRouter/Application/src/main/res/drawable-hdpi/ic_action_pause.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_action_play.png b/media/MediaRouter/Application/src/main/res/drawable-hdpi/ic_action_play.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_action_play.png
rename to media/MediaRouter/Application/src/main/res/drawable-hdpi/ic_action_play.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_action_stop.png b/media/MediaRouter/Application/src/main/res/drawable-hdpi/ic_action_stop.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_action_stop.png
rename to media/MediaRouter/Application/src/main/res/drawable-hdpi/ic_action_stop.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_launcher.png b/media/MediaRouter/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to media/MediaRouter/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_media_pause.png b/media/MediaRouter/Application/src/main/res/drawable-hdpi/ic_media_pause.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_media_pause.png
rename to media/MediaRouter/Application/src/main/res/drawable-hdpi/ic_media_pause.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_media_play.png b/media/MediaRouter/Application/src/main/res/drawable-hdpi/ic_media_play.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_media_play.png
rename to media/MediaRouter/Application/src/main/res/drawable-hdpi/ic_media_play.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_media_stop.png b/media/MediaRouter/Application/src/main/res/drawable-hdpi/ic_media_stop.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_media_stop.png
rename to media/MediaRouter/Application/src/main/res/drawable-hdpi/ic_media_stop.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_menu_add.png b/media/MediaRouter/Application/src/main/res/drawable-hdpi/ic_menu_add.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_menu_add.png
rename to media/MediaRouter/Application/src/main/res/drawable-hdpi/ic_menu_add.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_menu_delete.png b/media/MediaRouter/Application/src/main/res/drawable-hdpi/ic_menu_delete.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_menu_delete.png
rename to media/MediaRouter/Application/src/main/res/drawable-hdpi/ic_menu_delete.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_action_pause.png b/media/MediaRouter/Application/src/main/res/drawable-mdpi/ic_action_pause.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_action_pause.png
rename to media/MediaRouter/Application/src/main/res/drawable-mdpi/ic_action_pause.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_action_play.png b/media/MediaRouter/Application/src/main/res/drawable-mdpi/ic_action_play.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_action_play.png
rename to media/MediaRouter/Application/src/main/res/drawable-mdpi/ic_action_play.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_action_stop.png b/media/MediaRouter/Application/src/main/res/drawable-mdpi/ic_action_stop.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_action_stop.png
rename to media/MediaRouter/Application/src/main/res/drawable-mdpi/ic_action_stop.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_launcher.png b/media/MediaRouter/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to media/MediaRouter/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_media_pause.png b/media/MediaRouter/Application/src/main/res/drawable-mdpi/ic_media_pause.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_media_pause.png
rename to media/MediaRouter/Application/src/main/res/drawable-mdpi/ic_media_pause.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_media_play.png b/media/MediaRouter/Application/src/main/res/drawable-mdpi/ic_media_play.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_media_play.png
rename to media/MediaRouter/Application/src/main/res/drawable-mdpi/ic_media_play.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_media_stop.png b/media/MediaRouter/Application/src/main/res/drawable-mdpi/ic_media_stop.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_media_stop.png
rename to media/MediaRouter/Application/src/main/res/drawable-mdpi/ic_media_stop.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_menu_add.png b/media/MediaRouter/Application/src/main/res/drawable-mdpi/ic_menu_add.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_menu_add.png
rename to media/MediaRouter/Application/src/main/res/drawable-mdpi/ic_menu_add.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_menu_delete.png b/media/MediaRouter/Application/src/main/res/drawable-mdpi/ic_menu_delete.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_menu_delete.png
rename to media/MediaRouter/Application/src/main/res/drawable-mdpi/ic_menu_delete.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-xhdpi/ic_action_pause.png b/media/MediaRouter/Application/src/main/res/drawable-xhdpi/ic_action_pause.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-xhdpi/ic_action_pause.png
rename to media/MediaRouter/Application/src/main/res/drawable-xhdpi/ic_action_pause.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-xhdpi/ic_action_play.png b/media/MediaRouter/Application/src/main/res/drawable-xhdpi/ic_action_play.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-xhdpi/ic_action_play.png
rename to media/MediaRouter/Application/src/main/res/drawable-xhdpi/ic_action_play.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-xhdpi/ic_action_stop.png b/media/MediaRouter/Application/src/main/res/drawable-xhdpi/ic_action_stop.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-xhdpi/ic_action_stop.png
rename to media/MediaRouter/Application/src/main/res/drawable-xhdpi/ic_action_stop.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-xhdpi/ic_launcher.png b/media/MediaRouter/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to media/MediaRouter/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_action_pause.png b/media/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_action_pause.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_action_pause.png
rename to media/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_action_pause.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_action_play.png b/media/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_action_play.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_action_play.png
rename to media/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_action_play.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_action_stop.png b/media/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_action_stop.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_action_stop.png
rename to media/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_action_stop.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/media/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to media/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_suggestions_add.png b/media/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_suggestions_add.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_suggestions_add.png
rename to media/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_suggestions_add.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_suggestions_delete.png b/media/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_suggestions_delete.png
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_suggestions_delete.png
rename to media/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_suggestions_delete.png
Binary files differ
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/drawable/list_background.xml b/media/MediaRouter/Application/src/main/res/drawable/list_background.xml
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/drawable/list_background.xml
rename to media/MediaRouter/Application/src/main/res/drawable/list_background.xml
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/layout-land/grid_layout_2.xml b/media/MediaRouter/Application/src/main/res/layout-land/grid_layout_2.xml
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/layout-land/grid_layout_2.xml
rename to media/MediaRouter/Application/src/main/res/layout-land/grid_layout_2.xml
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/layout/media_item.xml b/media/MediaRouter/Application/src/main/res/layout/media_item.xml
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/layout/media_item.xml
rename to media/MediaRouter/Application/src/main/res/layout/media_item.xml
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/layout/overlay_display_window.xml b/media/MediaRouter/Application/src/main/res/layout/overlay_display_window.xml
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/layout/overlay_display_window.xml
rename to media/MediaRouter/Application/src/main/res/layout/overlay_display_window.xml
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/layout/sample_media_router.xml b/media/MediaRouter/Application/src/main/res/layout/sample_media_router.xml
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/layout/sample_media_router.xml
rename to media/MediaRouter/Application/src/main/res/layout/sample_media_router.xml
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/layout/sample_media_router_presentation.xml b/media/MediaRouter/Application/src/main/res/layout/sample_media_router_presentation.xml
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/layout/sample_media_router_presentation.xml
rename to media/MediaRouter/Application/src/main/res/layout/sample_media_router_presentation.xml
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/menu/sample_media_router_menu.xml b/media/MediaRouter/Application/src/main/res/menu/sample_media_router_menu.xml
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/menu/sample_media_router_menu.xml
rename to media/MediaRouter/Application/src/main/res/menu/sample_media_router_menu.xml
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/values/arrays.xml b/media/MediaRouter/Application/src/main/res/values/arrays.xml
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/values/arrays.xml
rename to media/MediaRouter/Application/src/main/res/values/arrays.xml
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/values/colors.xml b/media/MediaRouter/Application/src/main/res/values/colors.xml
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/values/colors.xml
rename to media/MediaRouter/Application/src/main/res/values/colors.xml
diff --git a/media/MediaRouter/MediaRouterSample/src/main/res/values/strings.xml b/media/MediaRouter/Application/src/main/res/values/strings.xml
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/src/main/res/values/strings.xml
rename to media/MediaRouter/Application/src/main/res/values/strings.xml
diff --git a/media/MediaRouter/MediaRouterSample/tests/AndroidManifest.xml b/media/MediaRouter/Application/tests/AndroidManifest.xml
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/tests/AndroidManifest.xml
rename to media/MediaRouter/Application/tests/AndroidManifest.xml
diff --git a/media/MediaRouter/MediaRouterSample/tests/src/com/example/android/mediarouter/tests/SampleTests.java b/media/MediaRouter/Application/tests/src/com/example/android/mediarouter/tests/SampleTests.java
similarity index 100%
rename from media/MediaRouter/MediaRouterSample/tests/src/com/example/android/mediarouter/tests/SampleTests.java
rename to media/MediaRouter/Application/tests/src/com/example/android/mediarouter/tests/SampleTests.java
diff --git a/media/MediaRouter/settings.gradle b/media/MediaRouter/settings.gradle
index fff93ae..9464a35 100644
--- a/media/MediaRouter/settings.gradle
+++ b/media/MediaRouter/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'MediaRouterSample'
+include 'Application'
diff --git a/renderScript/BasicRenderScript/BasicRenderScriptSample/.gitignore b/renderScript/BasicRenderScript/Application/.gitignore
similarity index 100%
rename from renderScript/BasicRenderScript/BasicRenderScriptSample/.gitignore
rename to renderScript/BasicRenderScript/Application/.gitignore
diff --git a/renderScript/BasicRenderScript/BasicRenderScriptSample/AndroidManifest.xml b/renderScript/BasicRenderScript/Application/AndroidManifest.xml
similarity index 100%
rename from renderScript/BasicRenderScript/BasicRenderScriptSample/AndroidManifest.xml
rename to renderScript/BasicRenderScript/Application/AndroidManifest.xml
diff --git a/renderScript/BasicRenderScript/BasicRenderScriptSample/project.properties b/renderScript/BasicRenderScript/Application/project.properties
similarity index 100%
rename from renderScript/BasicRenderScript/BasicRenderScriptSample/project.properties
rename to renderScript/BasicRenderScript/Application/project.properties
diff --git a/renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/AndroidManifest.xml b/renderScript/BasicRenderScript/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/AndroidManifest.xml
rename to renderScript/BasicRenderScript/Application/src/main/AndroidManifest.xml
diff --git a/renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/java/com/example/android/basicrenderscript/MainActivity.java b/renderScript/BasicRenderScript/Application/src/main/java/com/example/android/basicrenderscript/MainActivity.java
similarity index 100%
rename from renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/java/com/example/android/basicrenderscript/MainActivity.java
rename to renderScript/BasicRenderScript/Application/src/main/java/com/example/android/basicrenderscript/MainActivity.java
diff --git a/renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-hdpi/ic_launcher.png b/renderScript/BasicRenderScript/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to renderScript/BasicRenderScript/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-mdpi/ic_launcher.png b/renderScript/BasicRenderScript/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to renderScript/BasicRenderScript/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-nodpi/data.jpg b/renderScript/BasicRenderScript/Application/src/main/res/drawable-nodpi/data.jpg
similarity index 100%
rename from renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-nodpi/data.jpg
rename to renderScript/BasicRenderScript/Application/src/main/res/drawable-nodpi/data.jpg
Binary files differ
diff --git a/renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-xhdpi/ic_launcher.png b/renderScript/BasicRenderScript/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to renderScript/BasicRenderScript/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/renderScript/BasicRenderScript/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to renderScript/BasicRenderScript/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/res/layout/main_layout.xml b/renderScript/BasicRenderScript/Application/src/main/res/layout/main_layout.xml
similarity index 100%
rename from renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/res/layout/main_layout.xml
rename to renderScript/BasicRenderScript/Application/src/main/res/layout/main_layout.xml
diff --git a/renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/res/values-v11/styles.xml b/renderScript/BasicRenderScript/Application/src/main/res/values-v11/styles.xml
similarity index 100%
rename from renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/res/values-v11/styles.xml
rename to renderScript/BasicRenderScript/Application/src/main/res/values-v11/styles.xml
diff --git a/renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/res/values-v14/styles.xml b/renderScript/BasicRenderScript/Application/src/main/res/values-v14/styles.xml
similarity index 100%
rename from renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/res/values-v14/styles.xml
rename to renderScript/BasicRenderScript/Application/src/main/res/values-v14/styles.xml
diff --git a/renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/attrs.xml b/renderScript/BasicRenderScript/Application/src/main/res/values/attrs.xml
similarity index 100%
rename from renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/attrs.xml
rename to renderScript/BasicRenderScript/Application/src/main/res/values/attrs.xml
diff --git a/renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/colors.xml b/renderScript/BasicRenderScript/Application/src/main/res/values/colors.xml
similarity index 100%
rename from renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/colors.xml
rename to renderScript/BasicRenderScript/Application/src/main/res/values/colors.xml
diff --git a/renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/styles.xml b/renderScript/BasicRenderScript/Application/src/main/res/values/styles.xml
similarity index 100%
rename from renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/styles.xml
rename to renderScript/BasicRenderScript/Application/src/main/res/values/styles.xml
diff --git a/renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/rs/saturation.rs b/renderScript/BasicRenderScript/Application/src/main/rs/saturation.rs
similarity index 100%
rename from renderScript/BasicRenderScript/BasicRenderScriptSample/src/main/rs/saturation.rs
rename to renderScript/BasicRenderScript/Application/src/main/rs/saturation.rs
diff --git a/renderScript/BasicRenderScript/BasicRenderScriptSample/tests/AndroidManifest.xml b/renderScript/BasicRenderScript/Application/tests/AndroidManifest.xml
similarity index 100%
rename from renderScript/BasicRenderScript/BasicRenderScriptSample/tests/AndroidManifest.xml
rename to renderScript/BasicRenderScript/Application/tests/AndroidManifest.xml
diff --git a/renderScript/BasicRenderScript/BasicRenderScriptSample/tests/src/com/example/android/basicrenderscript/tests/SampleTests.java b/renderScript/BasicRenderScript/Application/tests/src/com/example/android/basicrenderscript/tests/SampleTests.java
similarity index 100%
rename from renderScript/BasicRenderScript/BasicRenderScriptSample/tests/src/com/example/android/basicrenderscript/tests/SampleTests.java
rename to renderScript/BasicRenderScript/Application/tests/src/com/example/android/basicrenderscript/tests/SampleTests.java
diff --git a/renderScript/BasicRenderScript/settings.gradle b/renderScript/BasicRenderScript/settings.gradle
index cb17006..9464a35 100644
--- a/renderScript/BasicRenderScript/settings.gradle
+++ b/renderScript/BasicRenderScript/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicRenderScriptSample'
+include 'Application'
diff --git a/renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/.gitignore b/renderScript/RenderScriptIntrinsic/Application/.gitignore
similarity index 100%
rename from renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/.gitignore
rename to renderScript/RenderScriptIntrinsic/Application/.gitignore
diff --git a/renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/AndroidManifest.xml b/renderScript/RenderScriptIntrinsic/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/AndroidManifest.xml
rename to renderScript/RenderScriptIntrinsic/Application/src/main/AndroidManifest.xml
diff --git a/renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/renderscriptintrinsic/MainActivity.java b/renderScript/RenderScriptIntrinsic/Application/src/main/java/com/example/android/renderscriptintrinsic/MainActivity.java
similarity index 100%
rename from renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/renderscriptintrinsic/MainActivity.java
rename to renderScript/RenderScriptIntrinsic/Application/src/main/java/com/example/android/renderscriptintrinsic/MainActivity.java
diff --git a/renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/renderscriptintrinsic/ThumbnailRadioButton.java b/renderScript/RenderScriptIntrinsic/Application/src/main/java/com/example/android/renderscriptintrinsic/ThumbnailRadioButton.java
similarity index 100%
rename from renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/renderscriptintrinsic/ThumbnailRadioButton.java
rename to renderScript/RenderScriptIntrinsic/Application/src/main/java/com/example/android/renderscriptintrinsic/ThumbnailRadioButton.java
diff --git a/renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-hdpi/ic_launcher.png b/renderScript/RenderScriptIntrinsic/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to renderScript/RenderScriptIntrinsic/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-mdpi/ic_launcher.png b/renderScript/RenderScriptIntrinsic/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to renderScript/RenderScriptIntrinsic/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-nodpi/data.jpg b/renderScript/RenderScriptIntrinsic/Application/src/main/res/drawable-nodpi/data.jpg
similarity index 100%
rename from renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-nodpi/data.jpg
rename to renderScript/RenderScriptIntrinsic/Application/src/main/res/drawable-nodpi/data.jpg
Binary files differ
diff --git a/renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-xhdpi/ic_launcher.png b/renderScript/RenderScriptIntrinsic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to renderScript/RenderScriptIntrinsic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/renderScript/RenderScriptIntrinsic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to renderScript/RenderScriptIntrinsic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/layout/main_layout.xml b/renderScript/RenderScriptIntrinsic/Application/src/main/res/layout/main_layout.xml
similarity index 100%
rename from renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/layout/main_layout.xml
rename to renderScript/RenderScriptIntrinsic/Application/src/main/res/layout/main_layout.xml
diff --git a/renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values-v11/styles.xml b/renderScript/RenderScriptIntrinsic/Application/src/main/res/values-v11/styles.xml
similarity index 100%
rename from renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values-v11/styles.xml
rename to renderScript/RenderScriptIntrinsic/Application/src/main/res/values-v11/styles.xml
diff --git a/renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values-v14/styles.xml b/renderScript/RenderScriptIntrinsic/Application/src/main/res/values-v14/styles.xml
similarity index 100%
rename from renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values-v14/styles.xml
rename to renderScript/RenderScriptIntrinsic/Application/src/main/res/values-v14/styles.xml
diff --git a/renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/attrs.xml b/renderScript/RenderScriptIntrinsic/Application/src/main/res/values/attrs.xml
similarity index 100%
rename from renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/attrs.xml
rename to renderScript/RenderScriptIntrinsic/Application/src/main/res/values/attrs.xml
diff --git a/renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/colors.xml b/renderScript/RenderScriptIntrinsic/Application/src/main/res/values/colors.xml
similarity index 100%
rename from renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/colors.xml
rename to renderScript/RenderScriptIntrinsic/Application/src/main/res/values/colors.xml
diff --git a/renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/styles.xml b/renderScript/RenderScriptIntrinsic/Application/src/main/res/values/styles.xml
similarity index 100%
rename from renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/styles.xml
rename to renderScript/RenderScriptIntrinsic/Application/src/main/res/values/styles.xml
diff --git a/renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/tests/AndroidManifest.xml b/renderScript/RenderScriptIntrinsic/Application/tests/AndroidManifest.xml
similarity index 100%
rename from renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/tests/AndroidManifest.xml
rename to renderScript/RenderScriptIntrinsic/Application/tests/AndroidManifest.xml
diff --git a/renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/tests/src/com/example/android/renderscriptintrinsic/tests/SampleTests.java b/renderScript/RenderScriptIntrinsic/Application/tests/src/com/example/android/renderscriptintrinsic/tests/SampleTests.java
similarity index 100%
rename from renderScript/RenderScriptIntrinsic/RenderScriptIntrinsicSample/tests/src/com/example/android/renderscriptintrinsic/tests/SampleTests.java
rename to renderScript/RenderScriptIntrinsic/Application/tests/src/com/example/android/renderscriptintrinsic/tests/SampleTests.java
diff --git a/renderScript/RenderScriptIntrinsic/settings.gradle b/renderScript/RenderScriptIntrinsic/settings.gradle
index 702ca57..9464a35 100644
--- a/renderScript/RenderScriptIntrinsic/settings.gradle
+++ b/renderScript/RenderScriptIntrinsic/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'RenderScriptIntrinsicSample'
+include 'Application'
diff --git a/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/.gitignore b/security/keystore/BasicAndroidKeyStore/Application/.gitignore
similarity index 100%
rename from security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/.gitignore
rename to security/keystore/BasicAndroidKeyStore/Application/.gitignore
diff --git a/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/README-simpleview.txt b/security/keystore/BasicAndroidKeyStore/Application/README-simpleview.txt
similarity index 100%
rename from security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/README-simpleview.txt
rename to security/keystore/BasicAndroidKeyStore/Application/README-simpleview.txt
diff --git a/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/proguard-project.txt b/security/keystore/BasicAndroidKeyStore/Application/proguard-project.txt
similarity index 100%
rename from security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/proguard-project.txt
rename to security/keystore/BasicAndroidKeyStore/Application/proguard-project.txt
diff --git a/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/AndroidManifest.xml b/security/keystore/BasicAndroidKeyStore/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/AndroidManifest.xml
rename to security/keystore/BasicAndroidKeyStore/Application/src/main/AndroidManifest.xml
diff --git a/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/basicandroidkeystore/BasicAndroidKeyStoreFragment.java b/security/keystore/BasicAndroidKeyStore/Application/src/main/java/com/example/android/basicandroidkeystore/BasicAndroidKeyStoreFragment.java
similarity index 100%
rename from security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/basicandroidkeystore/BasicAndroidKeyStoreFragment.java
rename to security/keystore/BasicAndroidKeyStore/Application/src/main/java/com/example/android/basicandroidkeystore/BasicAndroidKeyStoreFragment.java
diff --git a/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/basicandroidkeystore/SecurityConstants.java b/security/keystore/BasicAndroidKeyStore/Application/src/main/java/com/example/android/basicandroidkeystore/SecurityConstants.java
similarity index 100%
rename from security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/basicandroidkeystore/SecurityConstants.java
rename to security/keystore/BasicAndroidKeyStore/Application/src/main/java/com/example/android/basicandroidkeystore/SecurityConstants.java
diff --git a/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-hdpi/ic_launcher.png b/security/keystore/BasicAndroidKeyStore/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to security/keystore/BasicAndroidKeyStore/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-mdpi/ic_launcher.png b/security/keystore/BasicAndroidKeyStore/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to security/keystore/BasicAndroidKeyStore/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-xhdpi/ic_launcher.png b/security/keystore/BasicAndroidKeyStore/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to security/keystore/BasicAndroidKeyStore/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/security/keystore/BasicAndroidKeyStore/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to security/keystore/BasicAndroidKeyStore/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/menu/main.xml b/security/keystore/BasicAndroidKeyStore/Application/src/main/res/menu/main.xml
similarity index 100%
rename from security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/menu/main.xml
rename to security/keystore/BasicAndroidKeyStore/Application/src/main/res/menu/main.xml
diff --git a/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values/strings.xml b/security/keystore/BasicAndroidKeyStore/Application/src/main/res/values/strings.xml
similarity index 100%
rename from security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values/strings.xml
rename to security/keystore/BasicAndroidKeyStore/Application/src/main/res/values/strings.xml
diff --git a/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/tests/AndroidManifest.xml b/security/keystore/BasicAndroidKeyStore/Application/tests/AndroidManifest.xml
similarity index 100%
rename from security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/tests/AndroidManifest.xml
rename to security/keystore/BasicAndroidKeyStore/Application/tests/AndroidManifest.xml
diff --git a/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/tests/src/com/example/android/basicandroidkeystore/tests/SampleTests.java b/security/keystore/BasicAndroidKeyStore/Application/tests/src/com/example/android/basicandroidkeystore/tests/SampleTests.java
similarity index 100%
rename from security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/tests/src/com/example/android/basicandroidkeystore/tests/SampleTests.java
rename to security/keystore/BasicAndroidKeyStore/Application/tests/src/com/example/android/basicandroidkeystore/tests/SampleTests.java
diff --git a/security/keystore/BasicAndroidKeyStore/settings.gradle b/security/keystore/BasicAndroidKeyStore/settings.gradle
index e4b36fe..9464a35 100644
--- a/security/keystore/BasicAndroidKeyStore/settings.gradle
+++ b/security/keystore/BasicAndroidKeyStore/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicAndroidKeyStoreSample'
+include 'Application'
diff --git a/sensors/BatchStepSensor/BatchStepSensorSample/.gitignore b/sensors/BatchStepSensor/Application/.gitignore
similarity index 100%
rename from sensors/BatchStepSensor/BatchStepSensorSample/.gitignore
rename to sensors/BatchStepSensor/Application/.gitignore
diff --git a/sensors/BatchStepSensor/BatchStepSensorSample/README-CardStream.txt b/sensors/BatchStepSensor/Application/README-CardStream.txt
similarity index 100%
rename from sensors/BatchStepSensor/BatchStepSensorSample/README-CardStream.txt
rename to sensors/BatchStepSensor/Application/README-CardStream.txt
diff --git a/sensors/BatchStepSensor/BatchStepSensorSample/src/main/AndroidManifest.xml b/sensors/BatchStepSensor/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from sensors/BatchStepSensor/BatchStepSensorSample/src/main/AndroidManifest.xml
rename to sensors/BatchStepSensor/Application/src/main/AndroidManifest.xml
diff --git a/sensors/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/BatchStepSensorFragment.java b/sensors/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/BatchStepSensorFragment.java
similarity index 100%
rename from sensors/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/BatchStepSensorFragment.java
rename to sensors/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/BatchStepSensorFragment.java
diff --git a/sensors/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-hdpi/ic_launcher.png b/sensors/BatchStepSensor/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from sensors/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to sensors/BatchStepSensor/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/sensors/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-mdpi/ic_launcher.png b/sensors/BatchStepSensor/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from sensors/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to sensors/BatchStepSensor/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/sensors/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_launcher.png b/sensors/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from sensors/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to sensors/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/sensors/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/sensors/BatchStepSensor/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from sensors/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to sensors/BatchStepSensor/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/sensors/BatchStepSensor/BatchStepSensorSample/src/main/res/values/strings.xml b/sensors/BatchStepSensor/Application/src/main/res/values/strings.xml
similarity index 100%
rename from sensors/BatchStepSensor/BatchStepSensorSample/src/main/res/values/strings.xml
rename to sensors/BatchStepSensor/Application/src/main/res/values/strings.xml
diff --git a/sensors/BatchStepSensor/settings.gradle b/sensors/BatchStepSensor/settings.gradle
index 18ebefc..9464a35 100644
--- a/sensors/BatchStepSensor/settings.gradle
+++ b/sensors/BatchStepSensor/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BatchStepSensorSample'
+include 'Application'
diff --git a/testing/ActivityInstrumentation/ActivityInstrumentationSample/.gitignore b/testing/ActivityInstrumentation/Application/.gitignore
similarity index 100%
rename from testing/ActivityInstrumentation/ActivityInstrumentationSample/.gitignore
rename to testing/ActivityInstrumentation/Application/.gitignore
diff --git a/testing/ActivityInstrumentation/ActivityInstrumentationSample/proguard-project.txt b/testing/ActivityInstrumentation/Application/proguard-project.txt
similarity index 100%
rename from testing/ActivityInstrumentation/ActivityInstrumentationSample/proguard-project.txt
rename to testing/ActivityInstrumentation/Application/proguard-project.txt
diff --git a/testing/ActivityInstrumentation/ActivityInstrumentationSample/src/main/AndroidManifest.xml b/testing/ActivityInstrumentation/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from testing/ActivityInstrumentation/ActivityInstrumentationSample/src/main/AndroidManifest.xml
rename to testing/ActivityInstrumentation/Application/src/main/AndroidManifest.xml
diff --git a/testing/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/activityinstrumentation/MainActivity.java b/testing/ActivityInstrumentation/Application/src/main/java/com/example/android/activityinstrumentation/MainActivity.java
similarity index 100%
rename from testing/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/activityinstrumentation/MainActivity.java
rename to testing/ActivityInstrumentation/Application/src/main/java/com/example/android/activityinstrumentation/MainActivity.java
diff --git a/testing/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-hdpi/ic_launcher.png b/testing/ActivityInstrumentation/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from testing/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to testing/ActivityInstrumentation/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/testing/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-mdpi/ic_launcher.png b/testing/ActivityInstrumentation/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from testing/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to testing/ActivityInstrumentation/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/testing/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-xhdpi/ic_launcher.png b/testing/ActivityInstrumentation/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from testing/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to testing/ActivityInstrumentation/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/testing/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/testing/ActivityInstrumentation/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from testing/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to testing/ActivityInstrumentation/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/testing/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/layout/sample_main.xml b/testing/ActivityInstrumentation/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from testing/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/layout/sample_main.xml
rename to testing/ActivityInstrumentation/Application/src/main/res/layout/sample_main.xml
diff --git a/testing/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values-sw720dp-land/dimens.xml b/testing/ActivityInstrumentation/Application/src/main/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from testing/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values-sw720dp-land/dimens.xml
rename to testing/ActivityInstrumentation/Application/src/main/res/values-sw720dp-land/dimens.xml
diff --git a/testing/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values/dimens.xml b/testing/ActivityInstrumentation/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from testing/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values/dimens.xml
rename to testing/ActivityInstrumentation/Application/src/main/res/values/dimens.xml
diff --git a/testing/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values/strings.xml b/testing/ActivityInstrumentation/Application/src/main/res/values/strings.xml
similarity index 100%
rename from testing/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values/strings.xml
rename to testing/ActivityInstrumentation/Application/src/main/res/values/strings.xml
diff --git a/testing/ActivityInstrumentation/ActivityInstrumentationSample/tests/AndroidManifest.xml b/testing/ActivityInstrumentation/Application/tests/AndroidManifest.xml
similarity index 100%
rename from testing/ActivityInstrumentation/ActivityInstrumentationSample/tests/AndroidManifest.xml
rename to testing/ActivityInstrumentation/Application/tests/AndroidManifest.xml
diff --git a/testing/ActivityInstrumentation/ActivityInstrumentationSample/tests/src/com/example/android/activityinstrumentation/SampleTests.java b/testing/ActivityInstrumentation/Application/tests/src/com/example/android/activityinstrumentation/SampleTests.java
similarity index 100%
rename from testing/ActivityInstrumentation/ActivityInstrumentationSample/tests/src/com/example/android/activityinstrumentation/SampleTests.java
rename to testing/ActivityInstrumentation/Application/tests/src/com/example/android/activityinstrumentation/SampleTests.java
diff --git a/testing/ActivityInstrumentation/settings.gradle b/testing/ActivityInstrumentation/settings.gradle
index 0f010ba..9464a35 100644
--- a/testing/ActivityInstrumentation/settings.gradle
+++ b/testing/ActivityInstrumentation/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'ActivityInstrumentationSample'
+include 'Application'
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/.gitignore b/ui/accessibility/BasicAccessibility/Application/.gitignore
similarity index 100%
rename from ui/accessibility/BasicAccessibility/BasicAccessibilitySample/.gitignore
rename to ui/accessibility/BasicAccessibility/Application/.gitignore
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/proguard-project.txt b/ui/accessibility/BasicAccessibility/Application/proguard-project.txt
similarity index 100%
rename from ui/accessibility/BasicAccessibility/BasicAccessibilitySample/proguard-project.txt
rename to ui/accessibility/BasicAccessibility/Application/proguard-project.txt
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/AndroidManifest.xml b/ui/accessibility/BasicAccessibility/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/AndroidManifest.xml
rename to ui/accessibility/BasicAccessibility/Application/src/main/AndroidManifest.xml
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/basicaccessibility/DialView.java b/ui/accessibility/BasicAccessibility/Application/src/main/java/com/example/android/basicaccessibility/DialView.java
similarity index 100%
rename from ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/basicaccessibility/DialView.java
rename to ui/accessibility/BasicAccessibility/Application/src/main/java/com/example/android/basicaccessibility/DialView.java
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/basicaccessibility/MainActivity.java b/ui/accessibility/BasicAccessibility/Application/src/main/java/com/example/android/basicaccessibility/MainActivity.java
similarity index 100%
rename from ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/basicaccessibility/MainActivity.java
rename to ui/accessibility/BasicAccessibility/Application/src/main/java/com/example/android/basicaccessibility/MainActivity.java
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/ic_action_discard.png b/ui/accessibility/BasicAccessibility/Application/src/main/res/drawable-hdpi/ic_action_discard.png
similarity index 100%
rename from ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/ic_action_discard.png
rename to ui/accessibility/BasicAccessibility/Application/src/main/res/drawable-hdpi/ic_action_discard.png
Binary files differ
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/ic_action_info.png b/ui/accessibility/BasicAccessibility/Application/src/main/res/drawable-hdpi/ic_action_info.png
similarity index 100%
rename from ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/ic_action_info.png
rename to ui/accessibility/BasicAccessibility/Application/src/main/res/drawable-hdpi/ic_action_info.png
Binary files differ
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/accessibility/BasicAccessibility/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/accessibility/BasicAccessibility/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/partly_cloudy.png b/ui/accessibility/BasicAccessibility/Application/src/main/res/drawable-hdpi/partly_cloudy.png
similarity index 100%
rename from ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/partly_cloudy.png
rename to ui/accessibility/BasicAccessibility/Application/src/main/res/drawable-hdpi/partly_cloudy.png
Binary files differ
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-mdpi/ic_action_discard.png b/ui/accessibility/BasicAccessibility/Application/src/main/res/drawable-mdpi/ic_action_discard.png
similarity index 100%
rename from ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-mdpi/ic_action_discard.png
rename to ui/accessibility/BasicAccessibility/Application/src/main/res/drawable-mdpi/ic_action_discard.png
Binary files differ
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-mdpi/ic_action_info.png b/ui/accessibility/BasicAccessibility/Application/src/main/res/drawable-mdpi/ic_action_info.png
similarity index 100%
rename from ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-mdpi/ic_action_info.png
rename to ui/accessibility/BasicAccessibility/Application/src/main/res/drawable-mdpi/ic_action_info.png
Binary files differ
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/accessibility/BasicAccessibility/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/accessibility/BasicAccessibility/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-xhdpi/ic_action_discard.png b/ui/accessibility/BasicAccessibility/Application/src/main/res/drawable-xhdpi/ic_action_discard.png
similarity index 100%
rename from ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-xhdpi/ic_action_discard.png
rename to ui/accessibility/BasicAccessibility/Application/src/main/res/drawable-xhdpi/ic_action_discard.png
Binary files differ
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-xhdpi/ic_action_info.png b/ui/accessibility/BasicAccessibility/Application/src/main/res/drawable-xhdpi/ic_action_info.png
similarity index 100%
rename from ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-xhdpi/ic_action_info.png
rename to ui/accessibility/BasicAccessibility/Application/src/main/res/drawable-xhdpi/ic_action_info.png
Binary files differ
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/accessibility/BasicAccessibility/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/accessibility/BasicAccessibility/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/accessibility/BasicAccessibility/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/accessibility/BasicAccessibility/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/layout/sample_main.xml b/ui/accessibility/BasicAccessibility/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/layout/sample_main.xml
rename to ui/accessibility/BasicAccessibility/Application/src/main/res/layout/sample_main.xml
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/values-sw720dp-land/dimens.xml b/ui/accessibility/BasicAccessibility/Application/src/main/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/values-sw720dp-land/dimens.xml
rename to ui/accessibility/BasicAccessibility/Application/src/main/res/values-sw720dp-land/dimens.xml
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/values/dimens.xml b/ui/accessibility/BasicAccessibility/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/values/dimens.xml
rename to ui/accessibility/BasicAccessibility/Application/src/main/res/values/dimens.xml
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/values/strings.xml b/ui/accessibility/BasicAccessibility/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/accessibility/BasicAccessibility/BasicAccessibilitySample/src/main/res/values/strings.xml
rename to ui/accessibility/BasicAccessibility/Application/src/main/res/values/strings.xml
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/tests/AndroidManifest.xml b/ui/accessibility/BasicAccessibility/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/accessibility/BasicAccessibility/BasicAccessibilitySample/tests/AndroidManifest.xml
rename to ui/accessibility/BasicAccessibility/Application/tests/AndroidManifest.xml
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibilitySample/tests/src/com/example/android/basicaccessibility/tests/SampleTests.java b/ui/accessibility/BasicAccessibility/Application/tests/src/com/example/android/basicaccessibility/tests/SampleTests.java
similarity index 100%
rename from ui/accessibility/BasicAccessibility/BasicAccessibilitySample/tests/src/com/example/android/basicaccessibility/tests/SampleTests.java
rename to ui/accessibility/BasicAccessibility/Application/tests/src/com/example/android/basicaccessibility/tests/SampleTests.java
diff --git a/ui/accessibility/BasicAccessibility/settings.gradle b/ui/accessibility/BasicAccessibility/settings.gradle
index 7900b3d..9464a35 100644
--- a/ui/accessibility/BasicAccessibility/settings.gradle
+++ b/ui/accessibility/BasicAccessibility/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicAccessibilitySample'
+include 'Application'
diff --git a/ui/actionbar/DoneBar/DoneBarSample/.gitignore b/ui/actionbar/DoneBar/Application/.gitignore
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/.gitignore
rename to ui/actionbar/DoneBar/Application/.gitignore
diff --git a/ui/actionbar/DoneBar/DoneBarSample/proguard-project.txt b/ui/actionbar/DoneBar/Application/proguard-project.txt
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/proguard-project.txt
rename to ui/actionbar/DoneBar/Application/proguard-project.txt
diff --git a/ui/actionbar/DoneBar/DoneBarSample/src/main/AndroidManifest.xml b/ui/actionbar/DoneBar/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/src/main/AndroidManifest.xml
rename to ui/actionbar/DoneBar/Application/src/main/AndroidManifest.xml
diff --git a/ui/actionbar/DoneBar/DoneBarSample/src/main/java/com/example/android/donebar/DoneBarActivity.java b/ui/actionbar/DoneBar/Application/src/main/java/com/example/android/donebar/DoneBarActivity.java
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/src/main/java/com/example/android/donebar/DoneBarActivity.java
rename to ui/actionbar/DoneBar/Application/src/main/java/com/example/android/donebar/DoneBarActivity.java
diff --git a/ui/actionbar/DoneBar/DoneBarSample/src/main/java/com/example/android/donebar/DoneButtonActivity.java b/ui/actionbar/DoneBar/Application/src/main/java/com/example/android/donebar/DoneButtonActivity.java
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/src/main/java/com/example/android/donebar/DoneButtonActivity.java
rename to ui/actionbar/DoneBar/Application/src/main/java/com/example/android/donebar/DoneButtonActivity.java
diff --git a/ui/actionbar/DoneBar/DoneBarSample/src/main/res/drawable-hdpi/ic_action_cancel.png b/ui/actionbar/DoneBar/Application/src/main/res/drawable-hdpi/ic_action_cancel.png
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/src/main/res/drawable-hdpi/ic_action_cancel.png
rename to ui/actionbar/DoneBar/Application/src/main/res/drawable-hdpi/ic_action_cancel.png
Binary files differ
diff --git a/ui/actionbar/DoneBar/DoneBarSample/src/main/res/drawable-hdpi/ic_action_done.png b/ui/actionbar/DoneBar/Application/src/main/res/drawable-hdpi/ic_action_done.png
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/src/main/res/drawable-hdpi/ic_action_done.png
rename to ui/actionbar/DoneBar/Application/src/main/res/drawable-hdpi/ic_action_done.png
Binary files differ
diff --git a/ui/actionbar/DoneBar/DoneBarSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/actionbar/DoneBar/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/actionbar/DoneBar/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbar/DoneBar/DoneBarSample/src/main/res/drawable-mdpi/ic_action_cancel.png b/ui/actionbar/DoneBar/Application/src/main/res/drawable-mdpi/ic_action_cancel.png
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/src/main/res/drawable-mdpi/ic_action_cancel.png
rename to ui/actionbar/DoneBar/Application/src/main/res/drawable-mdpi/ic_action_cancel.png
Binary files differ
diff --git a/ui/actionbar/DoneBar/DoneBarSample/src/main/res/drawable-mdpi/ic_action_done.png b/ui/actionbar/DoneBar/Application/src/main/res/drawable-mdpi/ic_action_done.png
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/src/main/res/drawable-mdpi/ic_action_done.png
rename to ui/actionbar/DoneBar/Application/src/main/res/drawable-mdpi/ic_action_done.png
Binary files differ
diff --git a/ui/actionbar/DoneBar/DoneBarSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/actionbar/DoneBar/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/actionbar/DoneBar/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbar/DoneBar/DoneBarSample/src/main/res/drawable-xhdpi/ic_action_cancel.png b/ui/actionbar/DoneBar/Application/src/main/res/drawable-xhdpi/ic_action_cancel.png
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/src/main/res/drawable-xhdpi/ic_action_cancel.png
rename to ui/actionbar/DoneBar/Application/src/main/res/drawable-xhdpi/ic_action_cancel.png
Binary files differ
diff --git a/ui/actionbar/DoneBar/DoneBarSample/src/main/res/drawable-xhdpi/ic_action_done.png b/ui/actionbar/DoneBar/Application/src/main/res/drawable-xhdpi/ic_action_done.png
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/src/main/res/drawable-xhdpi/ic_action_done.png
rename to ui/actionbar/DoneBar/Application/src/main/res/drawable-xhdpi/ic_action_done.png
Binary files differ
diff --git a/ui/actionbar/DoneBar/DoneBarSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/actionbar/DoneBar/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/actionbar/DoneBar/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbar/DoneBar/DoneBarSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/actionbar/DoneBar/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/actionbar/DoneBar/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbar/DoneBar/DoneBarSample/src/main/res/layout/actionbar_custom_view_done.xml b/ui/actionbar/DoneBar/Application/src/main/res/layout/actionbar_custom_view_done.xml
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/src/main/res/layout/actionbar_custom_view_done.xml
rename to ui/actionbar/DoneBar/Application/src/main/res/layout/actionbar_custom_view_done.xml
diff --git a/ui/actionbar/DoneBar/DoneBarSample/src/main/res/layout/actionbar_custom_view_done_cancel.xml b/ui/actionbar/DoneBar/Application/src/main/res/layout/actionbar_custom_view_done_cancel.xml
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/src/main/res/layout/actionbar_custom_view_done_cancel.xml
rename to ui/actionbar/DoneBar/Application/src/main/res/layout/actionbar_custom_view_done_cancel.xml
diff --git a/ui/actionbar/DoneBar/DoneBarSample/src/main/res/layout/activity_done_bar.xml b/ui/actionbar/DoneBar/Application/src/main/res/layout/activity_done_bar.xml
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/src/main/res/layout/activity_done_bar.xml
rename to ui/actionbar/DoneBar/Application/src/main/res/layout/activity_done_bar.xml
diff --git a/ui/actionbar/DoneBar/DoneBarSample/src/main/res/layout/activity_done_button.xml b/ui/actionbar/DoneBar/Application/src/main/res/layout/activity_done_button.xml
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/src/main/res/layout/activity_done_button.xml
rename to ui/actionbar/DoneBar/Application/src/main/res/layout/activity_done_button.xml
diff --git a/ui/actionbar/DoneBar/DoneBarSample/src/main/res/layout/activity_sample_dashboard.xml b/ui/actionbar/DoneBar/Application/src/main/res/layout/activity_sample_dashboard.xml
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/src/main/res/layout/activity_sample_dashboard.xml
rename to ui/actionbar/DoneBar/Application/src/main/res/layout/activity_sample_dashboard.xml
diff --git a/ui/actionbar/DoneBar/DoneBarSample/src/main/res/layout/include_cancel_button.xml b/ui/actionbar/DoneBar/Application/src/main/res/layout/include_cancel_button.xml
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/src/main/res/layout/include_cancel_button.xml
rename to ui/actionbar/DoneBar/Application/src/main/res/layout/include_cancel_button.xml
diff --git a/ui/actionbar/DoneBar/DoneBarSample/src/main/res/layout/include_done_button.xml b/ui/actionbar/DoneBar/Application/src/main/res/layout/include_done_button.xml
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/src/main/res/layout/include_done_button.xml
rename to ui/actionbar/DoneBar/Application/src/main/res/layout/include_done_button.xml
diff --git a/ui/actionbar/DoneBar/DoneBarSample/src/main/res/menu/cancel.xml b/ui/actionbar/DoneBar/Application/src/main/res/menu/cancel.xml
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/src/main/res/menu/cancel.xml
rename to ui/actionbar/DoneBar/Application/src/main/res/menu/cancel.xml
diff --git a/ui/actionbar/DoneBar/DoneBarSample/src/main/res/values/strings.xml b/ui/actionbar/DoneBar/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/src/main/res/values/strings.xml
rename to ui/actionbar/DoneBar/Application/src/main/res/values/strings.xml
diff --git a/ui/actionbar/DoneBar/DoneBarSample/tests/AndroidManifest.xml b/ui/actionbar/DoneBar/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/tests/AndroidManifest.xml
rename to ui/actionbar/DoneBar/Application/tests/AndroidManifest.xml
diff --git a/ui/actionbar/DoneBar/DoneBarSample/tests/src/com/example/android/donebar/tests/SampleTests.java b/ui/actionbar/DoneBar/Application/tests/src/com/example/android/donebar/tests/SampleTests.java
similarity index 100%
rename from ui/actionbar/DoneBar/DoneBarSample/tests/src/com/example/android/donebar/tests/SampleTests.java
rename to ui/actionbar/DoneBar/Application/tests/src/com/example/android/donebar/tests/SampleTests.java
diff --git a/ui/actionbar/DoneBar/settings.gradle b/ui/actionbar/DoneBar/settings.gradle
index d060dc7..9464a35 100644
--- a/ui/actionbar/DoneBar/settings.gradle
+++ b/ui/actionbar/DoneBar/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'DoneBarSample'
+include 'Application'
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/.gitignore b/ui/actionbarcompat/ActionBarCompat-Basic/Application/.gitignore
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/.gitignore
rename to ui/actionbarcompat/ActionBarCompat-Basic/Application/.gitignore
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/proguard-project.txt b/ui/actionbarcompat/ActionBarCompat-Basic/Application/proguard-project.txt
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/proguard-project.txt
rename to ui/actionbarcompat/ActionBarCompat-Basic/Application/proguard-project.txt
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/AndroidManifest.xml b/ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/AndroidManifest.xml
rename to ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/AndroidManifest.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/java/com/example/android/actionbarcompat/basic/MainActivity.java b/ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/java/com/example/android/actionbarcompat/basic/MainActivity.java
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/java/com/example/android/actionbarcompat/basic/MainActivity.java
rename to ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/java/com/example/android/actionbarcompat/basic/MainActivity.java
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/ic_action_location.png b/ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/ic_action_location.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/ic_action_location.png
rename to ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/ic_action_location.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/ic_action_refresh.png b/ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/ic_action_refresh.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/ic_action_refresh.png
rename to ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/ic_action_refresh.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/ic_action_settings.png b/ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/ic_action_settings.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/ic_action_settings.png
rename to ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/ic_action_settings.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-mdpi/ic_action_location.png b/ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-mdpi/ic_action_location.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-mdpi/ic_action_location.png
rename to ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-mdpi/ic_action_location.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-mdpi/ic_action_refresh.png b/ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-mdpi/ic_action_refresh.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-mdpi/ic_action_refresh.png
rename to ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-mdpi/ic_action_refresh.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-mdpi/ic_action_settings.png b/ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-mdpi/ic_action_settings.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-mdpi/ic_action_settings.png
rename to ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-mdpi/ic_action_settings.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xhdpi/ic_action_location.png b/ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-xhdpi/ic_action_location.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xhdpi/ic_action_location.png
rename to ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-xhdpi/ic_action_location.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xhdpi/ic_action_refresh.png b/ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-xhdpi/ic_action_refresh.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xhdpi/ic_action_refresh.png
rename to ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-xhdpi/ic_action_refresh.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xhdpi/ic_action_settings.png b/ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-xhdpi/ic_action_settings.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xhdpi/ic_action_settings.png
rename to ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-xhdpi/ic_action_settings.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/layout/sample_main.xml b/ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/layout/sample_main.xml
rename to ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/layout/sample_main.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/menu/main.xml b/ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/menu/main.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/menu/main.xml
rename to ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/menu/main.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values/ids.xml b/ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/values/ids.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values/ids.xml
rename to ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/values/ids.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values/strings.xml b/ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values/strings.xml
rename to ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/res/values/strings.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/tests/AndroidManifest.xml b/ui/actionbarcompat/ActionBarCompat-Basic/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/tests/AndroidManifest.xml
rename to ui/actionbarcompat/ActionBarCompat-Basic/Application/tests/AndroidManifest.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java b/ui/actionbarcompat/ActionBarCompat-Basic/Application/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Basic/ActionBarCompat-BasicSample/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java
rename to ui/actionbarcompat/ActionBarCompat-Basic/Application/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/settings.gradle b/ui/actionbarcompat/ActionBarCompat-Basic/settings.gradle
index 21d2b41..9464a35 100644
--- a/ui/actionbarcompat/ActionBarCompat-Basic/settings.gradle
+++ b/ui/actionbarcompat/ActionBarCompat-Basic/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'ActionBarCompat-BasicSample'
+include 'Application'
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/.gitignore b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/.gitignore
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/.gitignore
rename to ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/.gitignore
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/proguard-project.txt b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/proguard-project.txt
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/proguard-project.txt
rename to ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/proguard-project.txt
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/AndroidManifest.xml b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/AndroidManifest.xml
rename to ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/AndroidManifest.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/java/com/example/android/actionbarcompat/listpopupmenu/Cheeses.java b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/Cheeses.java
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/java/com/example/android/actionbarcompat/listpopupmenu/Cheeses.java
rename to ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/Cheeses.java
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/java/com/example/android/actionbarcompat/listpopupmenu/MainActivity.java b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/MainActivity.java
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/java/com/example/android/actionbarcompat/listpopupmenu/MainActivity.java
rename to ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/MainActivity.java
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/java/com/example/android/actionbarcompat/listpopupmenu/PopupListFragment.java b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/PopupListFragment.java
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/java/com/example/android/actionbarcompat/listpopupmenu/PopupListFragment.java
rename to ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/PopupListFragment.java
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-hdpi/ic_overflow.png b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-hdpi/ic_overflow.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-hdpi/ic_overflow.png
rename to ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-hdpi/ic_overflow.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-mdpi/ic_overflow.png b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-mdpi/ic_overflow.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-mdpi/ic_overflow.png
rename to ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-mdpi/ic_overflow.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-xhdpi/ic_overflow.png b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-xhdpi/ic_overflow.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-xhdpi/ic_overflow.png
rename to ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-xhdpi/ic_overflow.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/layout/list_item.xml b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/res/layout/list_item.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/layout/list_item.xml
rename to ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/res/layout/list_item.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/layout/sample_main.xml b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/layout/sample_main.xml
rename to ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/res/layout/sample_main.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/menu/popup.xml b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/res/menu/popup.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/menu/popup.xml
rename to ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/res/menu/popup.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values/strings.xml b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values/strings.xml
rename to ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/res/values/strings.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/tests/AndroidManifest.xml b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/tests/AndroidManifest.xml
rename to ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/tests/AndroidManifest.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/tests/src/com/example/android/actionbarcompat/listpopupmenu/tests/SampleTests.java b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/tests/src/com/example/android/actionbarcompat/listpopupmenu/tests/SampleTests.java
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/tests/src/com/example/android/actionbarcompat/listpopupmenu/tests/SampleTests.java
rename to ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/tests/src/com/example/android/actionbarcompat/listpopupmenu/tests/SampleTests.java
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/settings.gradle b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/settings.gradle
index 2b794b6..9464a35 100644
--- a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/settings.gradle
+++ b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'ActionBarCompat-ListPopupMenuSample'
+include 'Application'
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/.gitignore b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/.gitignore
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/.gitignore
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/.gitignore
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/proguard-project.txt b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/proguard-project.txt
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/proguard-project.txt
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/proguard-project.txt
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/AndroidManifest.xml b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/AndroidManifest.xml
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/AndroidManifest.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/java/com/example/android/actionbarcompat/listviewmodalselect/CheeseListFragment.java b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/java/com/example/android/actionbarcompat/listviewmodalselect/CheeseListFragment.java
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/java/com/example/android/actionbarcompat/listviewmodalselect/CheeseListFragment.java
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/java/com/example/android/actionbarcompat/listviewmodalselect/CheeseListFragment.java
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/java/com/example/android/actionbarcompat/listviewmodalselect/MainActivity.java b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/java/com/example/android/actionbarcompat/listviewmodalselect/MainActivity.java
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/java/com/example/android/actionbarcompat/listviewmodalselect/MainActivity.java
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/java/com/example/android/actionbarcompat/listviewmodalselect/MainActivity.java
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/drawable/background_checked.xml b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/res/drawable/background_checked.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/drawable/background_checked.xml
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/res/drawable/background_checked.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/layout/sample_main.xml b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/layout/sample_main.xml
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/res/layout/sample_main.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/layout/simple_selectable_list_item.xml b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/res/layout/simple_selectable_list_item.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/layout/simple_selectable_list_item.xml
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/res/layout/simple_selectable_list_item.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/menu/context_cheeses.xml b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/res/menu/context_cheeses.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/menu/context_cheeses.xml
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/res/menu/context_cheeses.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/values/colors.xml b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/res/values/colors.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/values/colors.xml
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/res/values/colors.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/values/strings.xml b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/values/strings.xml
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/res/values/strings.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/tests/AndroidManifest.xml b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/tests/AndroidManifest.xml
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/tests/AndroidManifest.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/tests/src/com/example/android/actionbarcompat/listviewmodalselect/tests/SampleTests.java b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/tests/src/com/example/android/actionbarcompat/listviewmodalselect/tests/SampleTests.java
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/tests/src/com/example/android/actionbarcompat/listviewmodalselect/tests/SampleTests.java
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/tests/src/com/example/android/actionbarcompat/listviewmodalselect/tests/SampleTests.java
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/settings.gradle b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/settings.gradle
index cbe6e29..9464a35 100644
--- a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/settings.gradle
+++ b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'ActionBarCompat-ListViewModalSelectSample'
+include 'Application'
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/.gitignore b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/.gitignore
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/.gitignore
rename to ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/.gitignore
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/proguard-project.txt b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/proguard-project.txt
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/proguard-project.txt
rename to ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/proguard-project.txt
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/AndroidManifest.xml b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/AndroidManifest.xml
rename to ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/AndroidManifest.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/assets/photo_1.jpg b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/assets/photo_1.jpg
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/assets/photo_1.jpg
rename to ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/assets/photo_1.jpg
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/assets/photo_2.jpg b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/assets/photo_2.jpg
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/assets/photo_2.jpg
rename to ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/assets/photo_2.jpg
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/assets/photo_3.jpg b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/assets/photo_3.jpg
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/assets/photo_3.jpg
rename to ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/assets/photo_3.jpg
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/java/com/example/android/actionbarcompat/shareactionprovider/MainActivity.java b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/MainActivity.java
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/java/com/example/android/actionbarcompat/shareactionprovider/MainActivity.java
rename to ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/MainActivity.java
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/AssetProvider.java b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/AssetProvider.java
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/AssetProvider.java
rename to ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/AssetProvider.java
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/ContentItem.java b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/ContentItem.java
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/ContentItem.java
rename to ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/ContentItem.java
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/layout/item_image.xml b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/item_image.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/layout/item_image.xml
rename to ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/item_image.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/layout/item_text.xml b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/item_text.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/layout/item_text.xml
rename to ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/item_text.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/layout/sample_main.xml b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/layout/sample_main.xml
rename to ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/sample_main.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/menu/main_menu.xml b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/menu/main_menu.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/menu/main_menu.xml
rename to ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/menu/main_menu.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values/strings.xml b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values/strings.xml
rename to ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/src/main/res/values/strings.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/tests/AndroidManifest.xml b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/tests/AndroidManifest.xml
rename to ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/tests/AndroidManifest.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java
rename to ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/settings.gradle b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/settings.gradle
index 343656d..9464a35 100644
--- a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/settings.gradle
+++ b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'ActionBarCompat-ShareActionProviderSample'
+include 'Application'
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/.gitignore b/ui/actionbarcompat/ActionBarCompat-Styled/Application/.gitignore
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/.gitignore
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/.gitignore
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/proguard-project.txt b/ui/actionbarcompat/ActionBarCompat-Styled/Application/proguard-project.txt
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/proguard-project.txt
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/proguard-project.txt
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/AndroidManifest.xml b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/AndroidManifest.xml
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/AndroidManifest.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/java/com/example/android/actionbarcompat/styled/MainActivity.java b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/java/com/example/android/actionbarcompat/styled/MainActivity.java
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/java/com/example/android/actionbarcompat/styled/MainActivity.java
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/java/com/example/android/actionbarcompat/styled/MainActivity.java
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ab_bottom_solid_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ab_bottom_solid_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ab_bottom_solid_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ab_bottom_solid_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ab_solid_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ab_solid_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ab_solid_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ab_solid_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ab_stacked_solid_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ab_stacked_solid_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ab_stacked_solid_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ab_stacked_solid_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ic_action_location.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ic_action_location.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ic_action_location.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ic_action_location.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ic_action_refresh.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ic_action_refresh.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ic_action_refresh.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ic_action_refresh.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ic_action_settings.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ic_action_settings.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ic_action_settings.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ic_action_settings.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/list_focused_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/list_focused_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/list_focused_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/list_focused_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/menu_dropdown_panel_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/menu_dropdown_panel_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/menu_dropdown_panel_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/menu_dropdown_panel_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/progress_bg_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/progress_bg_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/progress_bg_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/progress_bg_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/progress_primary_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/progress_primary_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/progress_primary_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/progress_primary_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/progress_secondary_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/progress_secondary_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/progress_secondary_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/progress_secondary_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/spinner_ab_default_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/spinner_ab_default_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/spinner_ab_default_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/spinner_ab_default_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/spinner_ab_disabled_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/spinner_ab_disabled_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/spinner_ab_disabled_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/spinner_ab_disabled_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/spinner_ab_focused_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/spinner_ab_focused_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/spinner_ab_focused_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/spinner_ab_focused_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/spinner_ab_pressed_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/spinner_ab_pressed_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/spinner_ab_pressed_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/spinner_ab_pressed_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_selected_focused_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_selected_focused_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_selected_focused_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_selected_focused_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_selected_pressed_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_selected_pressed_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_selected_pressed_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_selected_pressed_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_selected_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_selected_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_selected_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_selected_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_unselected_focused_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_unselected_focused_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_unselected_focused_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_unselected_focused_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_unselected_pressed_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_unselected_pressed_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_unselected_pressed_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_unselected_pressed_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ab_bottom_solid_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ab_bottom_solid_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ab_bottom_solid_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ab_bottom_solid_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ab_solid_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ab_solid_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ab_solid_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ab_solid_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ab_stacked_solid_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ab_stacked_solid_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ab_stacked_solid_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ab_stacked_solid_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ic_action_location.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ic_action_location.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ic_action_location.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ic_action_location.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ic_action_refresh.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ic_action_refresh.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ic_action_refresh.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ic_action_refresh.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ic_action_settings.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ic_action_settings.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ic_action_settings.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ic_action_settings.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/list_focused_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/list_focused_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/list_focused_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/list_focused_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/menu_dropdown_panel_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/menu_dropdown_panel_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/menu_dropdown_panel_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/menu_dropdown_panel_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/progress_bg_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/progress_bg_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/progress_bg_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/progress_bg_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/progress_primary_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/progress_primary_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/progress_primary_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/progress_primary_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/progress_secondary_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/progress_secondary_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/progress_secondary_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/progress_secondary_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/spinner_ab_default_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/spinner_ab_default_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/spinner_ab_default_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/spinner_ab_default_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/spinner_ab_disabled_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/spinner_ab_disabled_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/spinner_ab_disabled_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/spinner_ab_disabled_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/spinner_ab_focused_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/spinner_ab_focused_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/spinner_ab_focused_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/spinner_ab_focused_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/spinner_ab_pressed_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/spinner_ab_pressed_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/spinner_ab_pressed_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/spinner_ab_pressed_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_selected_focused_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_selected_focused_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_selected_focused_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_selected_focused_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_selected_pressed_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_selected_pressed_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_selected_pressed_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_selected_pressed_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_selected_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_selected_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_selected_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_selected_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_unselected_focused_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_unselected_focused_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_unselected_focused_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_unselected_focused_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_unselected_pressed_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_unselected_pressed_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_unselected_pressed_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_unselected_pressed_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ab_bottom_solid_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ab_bottom_solid_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ab_bottom_solid_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ab_bottom_solid_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ab_solid_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ab_solid_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ab_solid_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ab_solid_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ab_stacked_solid_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ab_stacked_solid_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ab_stacked_solid_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ab_stacked_solid_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ic_action_location.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ic_action_location.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ic_action_location.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ic_action_location.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ic_action_refresh.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ic_action_refresh.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ic_action_refresh.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ic_action_refresh.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ic_action_settings.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ic_action_settings.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ic_action_settings.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ic_action_settings.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/list_focused_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/list_focused_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/list_focused_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/list_focused_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/menu_dropdown_panel_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/menu_dropdown_panel_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/menu_dropdown_panel_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/menu_dropdown_panel_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/progress_bg_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/progress_bg_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/progress_bg_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/progress_bg_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/progress_primary_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/progress_primary_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/progress_primary_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/progress_primary_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/progress_secondary_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/progress_secondary_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/progress_secondary_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/progress_secondary_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/spinner_ab_default_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/spinner_ab_default_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/spinner_ab_default_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/spinner_ab_default_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/spinner_ab_disabled_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/spinner_ab_disabled_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/spinner_ab_disabled_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/spinner_ab_disabled_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/spinner_ab_focused_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/spinner_ab_focused_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/spinner_ab_focused_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/spinner_ab_focused_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/spinner_ab_pressed_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/spinner_ab_pressed_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/spinner_ab_pressed_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/spinner_ab_pressed_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_selected_focused_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_selected_focused_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_selected_focused_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_selected_focused_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_selected_pressed_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_selected_pressed_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_selected_pressed_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_selected_pressed_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_selected_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_selected_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_selected_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_selected_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_unselected_focused_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_unselected_focused_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_unselected_focused_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_unselected_focused_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_unselected_pressed_styled.9.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_unselected_pressed_styled.9.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_unselected_pressed_styled.9.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_unselected_pressed_styled.9.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/pressed_background.xml b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable/pressed_background.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/pressed_background.xml
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable/pressed_background.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/progress_horizontal.xml b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable/progress_horizontal.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/progress_horizontal.xml
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable/progress_horizontal.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/selectable_background.xml b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable/selectable_background.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/selectable_background.xml
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable/selectable_background.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/spinner_background_ab.xml b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable/spinner_background_ab.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/spinner_background_ab.xml
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable/spinner_background_ab.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/tab_indicator_ab.xml b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable/tab_indicator_ab.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/tab_indicator_ab.xml
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/drawable/tab_indicator_ab.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/layout/sample_main.xml b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/layout/sample_main.xml
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/layout/sample_main.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/menu/main.xml b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/menu/main.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/menu/main.xml
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/menu/main.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values-v14/styles.xml b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/values-v14/styles.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values-v14/styles.xml
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/values-v14/styles.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/colors.xml b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/values/colors.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/colors.xml
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/values/colors.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/strings.xml b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/strings.xml
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/values/strings.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/styles.xml b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/values/styles.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/styles.xml
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/res/values/styles.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/tests/AndroidManifest.xml b/ui/actionbarcompat/ActionBarCompat-Styled/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/tests/AndroidManifest.xml
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/tests/AndroidManifest.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/tests/src/com/example/android/actionbarcompat/styled/tests/SampleTests.java b/ui/actionbarcompat/ActionBarCompat-Styled/Application/tests/src/com/example/android/actionbarcompat/styled/tests/SampleTests.java
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-Styled/ActionBarCompat-StyledSample/tests/src/com/example/android/actionbarcompat/styled/tests/SampleTests.java
rename to ui/actionbarcompat/ActionBarCompat-Styled/Application/tests/src/com/example/android/actionbarcompat/styled/tests/SampleTests.java
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/settings.gradle b/ui/actionbarcompat/ActionBarCompat-Styled/settings.gradle
index eb7d66b..9464a35 100644
--- a/ui/actionbarcompat/ActionBarCompat-Styled/settings.gradle
+++ b/ui/actionbarcompat/ActionBarCompat-Styled/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'ActionBarCompat-StyledSample'
+include 'Application'
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/.gitignore b/ui/graphics/DisplayingBitmaps/Application/.gitignore
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/.gitignore
rename to ui/graphics/DisplayingBitmaps/Application/.gitignore
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/proguard-project.txt b/ui/graphics/DisplayingBitmaps/Application/proguard-project.txt
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/proguard-project.txt
rename to ui/graphics/DisplayingBitmaps/Application/proguard-project.txt
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/AndroidManifest.xml b/ui/graphics/DisplayingBitmaps/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/AndroidManifest.xml
rename to ui/graphics/DisplayingBitmaps/Application/src/main/AndroidManifest.xml
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/provider/Images.java b/ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/provider/Images.java
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/provider/Images.java
rename to ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/provider/Images.java
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/ImageDetailActivity.java b/ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/ImageDetailActivity.java
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/ImageDetailActivity.java
rename to ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/ImageDetailActivity.java
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/ImageDetailFragment.java b/ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/ImageDetailFragment.java
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/ImageDetailFragment.java
rename to ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/ImageDetailFragment.java
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/ImageGridActivity.java b/ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/ImageGridActivity.java
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/ImageGridActivity.java
rename to ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/ImageGridActivity.java
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/ImageGridFragment.java b/ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/ImageGridFragment.java
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/ImageGridFragment.java
rename to ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/ImageGridFragment.java
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/RecyclingImageView.java b/ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/RecyclingImageView.java
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/RecyclingImageView.java
rename to ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/RecyclingImageView.java
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/AsyncTask.java b/ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/AsyncTask.java
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/AsyncTask.java
rename to ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/AsyncTask.java
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/DiskLruCache.java b/ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/DiskLruCache.java
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/DiskLruCache.java
rename to ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/DiskLruCache.java
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/ImageCache.java b/ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/ImageCache.java
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/ImageCache.java
rename to ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/ImageCache.java
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/ImageFetcher.java b/ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/ImageFetcher.java
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/ImageFetcher.java
rename to ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/ImageFetcher.java
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/ImageResizer.java b/ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/ImageResizer.java
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/ImageResizer.java
rename to ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/ImageResizer.java
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/ImageWorker.java b/ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/ImageWorker.java
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/ImageWorker.java
rename to ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/ImageWorker.java
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/RecyclingBitmapDrawable.java b/ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/RecyclingBitmapDrawable.java
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/RecyclingBitmapDrawable.java
rename to ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/RecyclingBitmapDrawable.java
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/Utils.java b/ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/Utils.java
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/Utils.java
rename to ui/graphics/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/Utils.java
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/graphics/DisplayingBitmaps/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/graphics/DisplayingBitmaps/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/graphics/DisplayingBitmaps/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/graphics/DisplayingBitmaps/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-nodpi/empty_photo.png b/ui/graphics/DisplayingBitmaps/Application/src/main/res/drawable-nodpi/empty_photo.png
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-nodpi/empty_photo.png
rename to ui/graphics/DisplayingBitmaps/Application/src/main/res/drawable-nodpi/empty_photo.png
Binary files differ
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/graphics/DisplayingBitmaps/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/graphics/DisplayingBitmaps/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/graphics/DisplayingBitmaps/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/graphics/DisplayingBitmaps/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable/photogrid_list_selector.xml b/ui/graphics/DisplayingBitmaps/Application/src/main/res/drawable/photogrid_list_selector.xml
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable/photogrid_list_selector.xml
rename to ui/graphics/DisplayingBitmaps/Application/src/main/res/drawable/photogrid_list_selector.xml
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/layout/image_detail_fragment.xml b/ui/graphics/DisplayingBitmaps/Application/src/main/res/layout/image_detail_fragment.xml
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/layout/image_detail_fragment.xml
rename to ui/graphics/DisplayingBitmaps/Application/src/main/res/layout/image_detail_fragment.xml
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/layout/image_detail_pager.xml b/ui/graphics/DisplayingBitmaps/Application/src/main/res/layout/image_detail_pager.xml
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/layout/image_detail_pager.xml
rename to ui/graphics/DisplayingBitmaps/Application/src/main/res/layout/image_detail_pager.xml
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/layout/image_grid_fragment.xml b/ui/graphics/DisplayingBitmaps/Application/src/main/res/layout/image_grid_fragment.xml
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/layout/image_grid_fragment.xml
rename to ui/graphics/DisplayingBitmaps/Application/src/main/res/layout/image_grid_fragment.xml
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/menu/main_menu.xml b/ui/graphics/DisplayingBitmaps/Application/src/main/res/menu/main_menu.xml
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/menu/main_menu.xml
rename to ui/graphics/DisplayingBitmaps/Application/src/main/res/menu/main_menu.xml
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-large/dimens.xml b/ui/graphics/DisplayingBitmaps/Application/src/main/res/values-large/dimens.xml
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-large/dimens.xml
rename to ui/graphics/DisplayingBitmaps/Application/src/main/res/values-large/dimens.xml
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-v11/styles.xml b/ui/graphics/DisplayingBitmaps/Application/src/main/res/values-v11/styles.xml
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-v11/styles.xml
rename to ui/graphics/DisplayingBitmaps/Application/src/main/res/values-v11/styles.xml
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-xlarge/dimens.xml b/ui/graphics/DisplayingBitmaps/Application/src/main/res/values-xlarge/dimens.xml
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-xlarge/dimens.xml
rename to ui/graphics/DisplayingBitmaps/Application/src/main/res/values-xlarge/dimens.xml
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/colors.xml b/ui/graphics/DisplayingBitmaps/Application/src/main/res/values/colors.xml
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/colors.xml
rename to ui/graphics/DisplayingBitmaps/Application/src/main/res/values/colors.xml
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/dimens.xml b/ui/graphics/DisplayingBitmaps/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/dimens.xml
rename to ui/graphics/DisplayingBitmaps/Application/src/main/res/values/dimens.xml
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/strings.xml b/ui/graphics/DisplayingBitmaps/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/strings.xml
rename to ui/graphics/DisplayingBitmaps/Application/src/main/res/values/strings.xml
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/styles.xml b/ui/graphics/DisplayingBitmaps/Application/src/main/res/values/styles.xml
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/styles.xml
rename to ui/graphics/DisplayingBitmaps/Application/src/main/res/values/styles.xml
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/tests/AndroidManifest.xml b/ui/graphics/DisplayingBitmaps/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/tests/AndroidManifest.xml
rename to ui/graphics/DisplayingBitmaps/Application/tests/AndroidManifest.xml
diff --git a/ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/tests/src/com/example/android/displayingbitmaps/tests/SampleTests.java b/ui/graphics/DisplayingBitmaps/Application/tests/src/com/example/android/displayingbitmaps/tests/SampleTests.java
similarity index 100%
rename from ui/graphics/DisplayingBitmaps/DisplayingBitmapsSample/tests/src/com/example/android/displayingbitmaps/tests/SampleTests.java
rename to ui/graphics/DisplayingBitmaps/Application/tests/src/com/example/android/displayingbitmaps/tests/SampleTests.java
diff --git a/ui/graphics/DisplayingBitmaps/settings.gradle b/ui/graphics/DisplayingBitmaps/settings.gradle
index a5c5699..9464a35 100644
--- a/ui/graphics/DisplayingBitmaps/settings.gradle
+++ b/ui/graphics/DisplayingBitmaps/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'DisplayingBitmapsSample'
+include 'Application'
diff --git a/ui/holo/BorderlessButtons/BorderlessButtonsSample/.gitignore b/ui/holo/BorderlessButtons/Application/.gitignore
similarity index 100%
rename from ui/holo/BorderlessButtons/BorderlessButtonsSample/.gitignore
rename to ui/holo/BorderlessButtons/Application/.gitignore
diff --git a/ui/holo/BorderlessButtons/BorderlessButtonsSample/proguard-project.txt b/ui/holo/BorderlessButtons/Application/proguard-project.txt
similarity index 100%
rename from ui/holo/BorderlessButtons/BorderlessButtonsSample/proguard-project.txt
rename to ui/holo/BorderlessButtons/Application/proguard-project.txt
diff --git a/ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/AndroidManifest.xml b/ui/holo/BorderlessButtons/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/AndroidManifest.xml
rename to ui/holo/BorderlessButtons/Application/src/main/AndroidManifest.xml
diff --git a/ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/borderlessbuttons/MainActivity.java b/ui/holo/BorderlessButtons/Application/src/main/java/com/example/android/borderlessbuttons/MainActivity.java
similarity index 100%
rename from ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/borderlessbuttons/MainActivity.java
rename to ui/holo/BorderlessButtons/Application/src/main/java/com/example/android/borderlessbuttons/MainActivity.java
diff --git a/ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-hdpi/ic_action_delete.png b/ui/holo/BorderlessButtons/Application/src/main/res/drawable-hdpi/ic_action_delete.png
similarity index 100%
rename from ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-hdpi/ic_action_delete.png
rename to ui/holo/BorderlessButtons/Application/src/main/res/drawable-hdpi/ic_action_delete.png
Binary files differ
diff --git a/ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/holo/BorderlessButtons/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/holo/BorderlessButtons/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-mdpi/ic_action_delete.png b/ui/holo/BorderlessButtons/Application/src/main/res/drawable-mdpi/ic_action_delete.png
similarity index 100%
rename from ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-mdpi/ic_action_delete.png
rename to ui/holo/BorderlessButtons/Application/src/main/res/drawable-mdpi/ic_action_delete.png
Binary files differ
diff --git a/ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/holo/BorderlessButtons/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/holo/BorderlessButtons/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-xhdpi/ic_action_delete.png b/ui/holo/BorderlessButtons/Application/src/main/res/drawable-xhdpi/ic_action_delete.png
similarity index 100%
rename from ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-xhdpi/ic_action_delete.png
rename to ui/holo/BorderlessButtons/Application/src/main/res/drawable-xhdpi/ic_action_delete.png
Binary files differ
diff --git a/ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/holo/BorderlessButtons/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/holo/BorderlessButtons/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/holo/BorderlessButtons/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/holo/BorderlessButtons/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/layout/list_item.xml b/ui/holo/BorderlessButtons/Application/src/main/res/layout/list_item.xml
similarity index 100%
rename from ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/layout/list_item.xml
rename to ui/holo/BorderlessButtons/Application/src/main/res/layout/list_item.xml
diff --git a/ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/layout/sample_main.xml b/ui/holo/BorderlessButtons/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/layout/sample_main.xml
rename to ui/holo/BorderlessButtons/Application/src/main/res/layout/sample_main.xml
diff --git a/ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/menu/main.xml b/ui/holo/BorderlessButtons/Application/src/main/res/menu/main.xml
similarity index 100%
rename from ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/menu/main.xml
rename to ui/holo/BorderlessButtons/Application/src/main/res/menu/main.xml
diff --git a/ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/dimens.xml b/ui/holo/BorderlessButtons/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/dimens.xml
rename to ui/holo/BorderlessButtons/Application/src/main/res/values/dimens.xml
diff --git a/ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/strings.xml b/ui/holo/BorderlessButtons/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/strings.xml
rename to ui/holo/BorderlessButtons/Application/src/main/res/values/strings.xml
diff --git a/ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/styles.xml b/ui/holo/BorderlessButtons/Application/src/main/res/values/styles.xml
similarity index 100%
rename from ui/holo/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/styles.xml
rename to ui/holo/BorderlessButtons/Application/src/main/res/values/styles.xml
diff --git a/ui/holo/BorderlessButtons/settings.gradle b/ui/holo/BorderlessButtons/settings.gradle
index f5220c4..9464a35 100644
--- a/ui/holo/BorderlessButtons/settings.gradle
+++ b/ui/holo/BorderlessButtons/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BorderlessButtonsSample'
+include 'Application'
diff --git a/ui/lists/CustomChoiceList/CustomChoiceListSample/.gitignore b/ui/lists/CustomChoiceList/Application/.gitignore
similarity index 100%
rename from ui/lists/CustomChoiceList/CustomChoiceListSample/.gitignore
rename to ui/lists/CustomChoiceList/Application/.gitignore
diff --git a/ui/lists/CustomChoiceList/CustomChoiceListSample/proguard-project.txt b/ui/lists/CustomChoiceList/Application/proguard-project.txt
similarity index 100%
rename from ui/lists/CustomChoiceList/CustomChoiceListSample/proguard-project.txt
rename to ui/lists/CustomChoiceList/Application/proguard-project.txt
diff --git a/ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/AndroidManifest.xml b/ui/lists/CustomChoiceList/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/AndroidManifest.xml
rename to ui/lists/CustomChoiceList/Application/src/main/AndroidManifest.xml
diff --git a/ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/customchoicelist/CheckableLinearLayout.java b/ui/lists/CustomChoiceList/Application/src/main/java/com/example/android/customchoicelist/CheckableLinearLayout.java
similarity index 100%
rename from ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/customchoicelist/CheckableLinearLayout.java
rename to ui/lists/CustomChoiceList/Application/src/main/java/com/example/android/customchoicelist/CheckableLinearLayout.java
diff --git a/ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/customchoicelist/Cheeses.java b/ui/lists/CustomChoiceList/Application/src/main/java/com/example/android/customchoicelist/Cheeses.java
similarity index 100%
rename from ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/customchoicelist/Cheeses.java
rename to ui/lists/CustomChoiceList/Application/src/main/java/com/example/android/customchoicelist/Cheeses.java
diff --git a/ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/customchoicelist/MainActivity.java b/ui/lists/CustomChoiceList/Application/src/main/java/com/example/android/customchoicelist/MainActivity.java
similarity index 100%
rename from ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/customchoicelist/MainActivity.java
rename to ui/lists/CustomChoiceList/Application/src/main/java/com/example/android/customchoicelist/MainActivity.java
diff --git a/ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/res/color/hideable_text_color.xml b/ui/lists/CustomChoiceList/Application/src/main/res/color/hideable_text_color.xml
similarity index 100%
rename from ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/res/color/hideable_text_color.xml
rename to ui/lists/CustomChoiceList/Application/src/main/res/color/hideable_text_color.xml
diff --git a/ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/lists/CustomChoiceList/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/lists/CustomChoiceList/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/lists/CustomChoiceList/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/lists/CustomChoiceList/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-xhdpi/ic_hideable_item_checked.png b/ui/lists/CustomChoiceList/Application/src/main/res/drawable-xhdpi/ic_hideable_item_checked.png
similarity index 100%
rename from ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-xhdpi/ic_hideable_item_checked.png
rename to ui/lists/CustomChoiceList/Application/src/main/res/drawable-xhdpi/ic_hideable_item_checked.png
Binary files differ
diff --git a/ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-xhdpi/ic_hideable_item_unchecked.png b/ui/lists/CustomChoiceList/Application/src/main/res/drawable-xhdpi/ic_hideable_item_unchecked.png
similarity index 100%
rename from ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-xhdpi/ic_hideable_item_unchecked.png
rename to ui/lists/CustomChoiceList/Application/src/main/res/drawable-xhdpi/ic_hideable_item_unchecked.png
Binary files differ
diff --git a/ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/lists/CustomChoiceList/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/lists/CustomChoiceList/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/lists/CustomChoiceList/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/lists/CustomChoiceList/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable/ic_hideable_item.xml b/ui/lists/CustomChoiceList/Application/src/main/res/drawable/ic_hideable_item.xml
similarity index 100%
rename from ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable/ic_hideable_item.xml
rename to ui/lists/CustomChoiceList/Application/src/main/res/drawable/ic_hideable_item.xml
diff --git a/ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/res/layout/list_item.xml b/ui/lists/CustomChoiceList/Application/src/main/res/layout/list_item.xml
similarity index 100%
rename from ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/res/layout/list_item.xml
rename to ui/lists/CustomChoiceList/Application/src/main/res/layout/list_item.xml
diff --git a/ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/res/layout/sample_main.xml b/ui/lists/CustomChoiceList/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/res/layout/sample_main.xml
rename to ui/lists/CustomChoiceList/Application/src/main/res/layout/sample_main.xml
diff --git a/ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/res/values/dimens.xml b/ui/lists/CustomChoiceList/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/res/values/dimens.xml
rename to ui/lists/CustomChoiceList/Application/src/main/res/values/dimens.xml
diff --git a/ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/res/values/styles.xml b/ui/lists/CustomChoiceList/Application/src/main/res/values/styles.xml
similarity index 100%
rename from ui/lists/CustomChoiceList/CustomChoiceListSample/src/main/res/values/styles.xml
rename to ui/lists/CustomChoiceList/Application/src/main/res/values/styles.xml
diff --git a/ui/lists/CustomChoiceList/settings.gradle b/ui/lists/CustomChoiceList/settings.gradle
index 6d876cf..9464a35 100644
--- a/ui/lists/CustomChoiceList/settings.gradle
+++ b/ui/lists/CustomChoiceList/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'CustomChoiceListSample'
+include 'Application'
diff --git a/ui/notifications/BasicNotifications/BasicNotificationsSample/.gitignore b/ui/notifications/BasicNotifications/Application/.gitignore
similarity index 100%
rename from ui/notifications/BasicNotifications/BasicNotificationsSample/.gitignore
rename to ui/notifications/BasicNotifications/Application/.gitignore
diff --git a/ui/notifications/BasicNotifications/BasicNotificationsSample/proguard-project.txt b/ui/notifications/BasicNotifications/Application/proguard-project.txt
similarity index 100%
rename from ui/notifications/BasicNotifications/BasicNotificationsSample/proguard-project.txt
rename to ui/notifications/BasicNotifications/Application/proguard-project.txt
diff --git a/ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/AndroidManifest.xml b/ui/notifications/BasicNotifications/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/AndroidManifest.xml
rename to ui/notifications/BasicNotifications/Application/src/main/AndroidManifest.xml
diff --git a/ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/java/com/example/android/basicnotifications/MainActivity.java b/ui/notifications/BasicNotifications/Application/src/main/java/com/example/android/basicnotifications/MainActivity.java
similarity index 100%
rename from ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/java/com/example/android/basicnotifications/MainActivity.java
rename to ui/notifications/BasicNotifications/Application/src/main/java/com/example/android/basicnotifications/MainActivity.java
diff --git a/ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi-v11/ic_stat_notification.png b/ui/notifications/BasicNotifications/Application/src/main/res/drawable-hdpi-v11/ic_stat_notification.png
similarity index 100%
rename from ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi-v11/ic_stat_notification.png
rename to ui/notifications/BasicNotifications/Application/src/main/res/drawable-hdpi-v11/ic_stat_notification.png
Binary files differ
diff --git a/ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi-v9/ic_stat_notification.png b/ui/notifications/BasicNotifications/Application/src/main/res/drawable-hdpi-v9/ic_stat_notification.png
similarity index 100%
rename from ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi-v9/ic_stat_notification.png
rename to ui/notifications/BasicNotifications/Application/src/main/res/drawable-hdpi-v9/ic_stat_notification.png
Binary files differ
diff --git a/ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/notifications/BasicNotifications/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/notifications/BasicNotifications/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi/ic_stat_notification.png b/ui/notifications/BasicNotifications/Application/src/main/res/drawable-hdpi/ic_stat_notification.png
similarity index 100%
rename from ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi/ic_stat_notification.png
rename to ui/notifications/BasicNotifications/Application/src/main/res/drawable-hdpi/ic_stat_notification.png
Binary files differ
diff --git a/ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-ldpi-v11/ic_stat_notification.png b/ui/notifications/BasicNotifications/Application/src/main/res/drawable-ldpi-v11/ic_stat_notification.png
similarity index 100%
rename from ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-ldpi-v11/ic_stat_notification.png
rename to ui/notifications/BasicNotifications/Application/src/main/res/drawable-ldpi-v11/ic_stat_notification.png
Binary files differ
diff --git a/ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-ldpi-v9/ic_stat_notification.png b/ui/notifications/BasicNotifications/Application/src/main/res/drawable-ldpi-v9/ic_stat_notification.png
similarity index 100%
rename from ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-ldpi-v9/ic_stat_notification.png
rename to ui/notifications/BasicNotifications/Application/src/main/res/drawable-ldpi-v9/ic_stat_notification.png
Binary files differ
diff --git a/ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-mdpi-v11/ic_stat_notification.png b/ui/notifications/BasicNotifications/Application/src/main/res/drawable-mdpi-v11/ic_stat_notification.png
similarity index 100%
rename from ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-mdpi-v11/ic_stat_notification.png
rename to ui/notifications/BasicNotifications/Application/src/main/res/drawable-mdpi-v11/ic_stat_notification.png
Binary files differ
diff --git a/ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-mdpi-v9/ic_stat_notification.png b/ui/notifications/BasicNotifications/Application/src/main/res/drawable-mdpi-v9/ic_stat_notification.png
similarity index 100%
rename from ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-mdpi-v9/ic_stat_notification.png
rename to ui/notifications/BasicNotifications/Application/src/main/res/drawable-mdpi-v9/ic_stat_notification.png
Binary files differ
diff --git a/ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/notifications/BasicNotifications/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/notifications/BasicNotifications/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-mdpi/ic_stat_notification.png b/ui/notifications/BasicNotifications/Application/src/main/res/drawable-mdpi/ic_stat_notification.png
similarity index 100%
rename from ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-mdpi/ic_stat_notification.png
rename to ui/notifications/BasicNotifications/Application/src/main/res/drawable-mdpi/ic_stat_notification.png
Binary files differ
diff --git a/ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xhdpi-v11/ic_stat_notification.png b/ui/notifications/BasicNotifications/Application/src/main/res/drawable-xhdpi-v11/ic_stat_notification.png
similarity index 100%
rename from ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xhdpi-v11/ic_stat_notification.png
rename to ui/notifications/BasicNotifications/Application/src/main/res/drawable-xhdpi-v11/ic_stat_notification.png
Binary files differ
diff --git a/ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xhdpi-v9/ic_stat_notification.png b/ui/notifications/BasicNotifications/Application/src/main/res/drawable-xhdpi-v9/ic_stat_notification.png
similarity index 100%
rename from ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xhdpi-v9/ic_stat_notification.png
rename to ui/notifications/BasicNotifications/Application/src/main/res/drawable-xhdpi-v9/ic_stat_notification.png
Binary files differ
diff --git a/ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/notifications/BasicNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/notifications/BasicNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xhdpi/ic_stat_notification.png b/ui/notifications/BasicNotifications/Application/src/main/res/drawable-xhdpi/ic_stat_notification.png
similarity index 100%
rename from ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xhdpi/ic_stat_notification.png
rename to ui/notifications/BasicNotifications/Application/src/main/res/drawable-xhdpi/ic_stat_notification.png
Binary files differ
diff --git a/ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/notifications/BasicNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/notifications/BasicNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/layout/sample_layout.xml b/ui/notifications/BasicNotifications/Application/src/main/res/layout/sample_layout.xml
similarity index 100%
rename from ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/layout/sample_layout.xml
rename to ui/notifications/BasicNotifications/Application/src/main/res/layout/sample_layout.xml
diff --git a/ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/values/strings.xml b/ui/notifications/BasicNotifications/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/notifications/BasicNotifications/BasicNotificationsSample/src/main/res/values/strings.xml
rename to ui/notifications/BasicNotifications/Application/src/main/res/values/strings.xml
diff --git a/ui/notifications/BasicNotifications/BasicNotificationsSample/tests/AndroidManifest.xml b/ui/notifications/BasicNotifications/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/notifications/BasicNotifications/BasicNotificationsSample/tests/AndroidManifest.xml
rename to ui/notifications/BasicNotifications/Application/tests/AndroidManifest.xml
diff --git a/ui/notifications/BasicNotifications/BasicNotificationsSample/tests/src/com/example/android/basicnotifications/tests/SampleTests.java b/ui/notifications/BasicNotifications/Application/tests/src/com/example/android/basicnotifications/tests/SampleTests.java
similarity index 100%
rename from ui/notifications/BasicNotifications/BasicNotificationsSample/tests/src/com/example/android/basicnotifications/tests/SampleTests.java
rename to ui/notifications/BasicNotifications/Application/tests/src/com/example/android/basicnotifications/tests/SampleTests.java
diff --git a/ui/notifications/BasicNotifications/settings.gradle b/ui/notifications/BasicNotifications/settings.gradle
index b33d67f..9464a35 100644
--- a/ui/notifications/BasicNotifications/settings.gradle
+++ b/ui/notifications/BasicNotifications/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicNotificationsSample'
+include 'Application'
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/.gitignore b/ui/notifications/CustomNotifications/Application/.gitignore
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/.gitignore
rename to ui/notifications/CustomNotifications/Application/.gitignore
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/proguard-project.txt b/ui/notifications/CustomNotifications/Application/proguard-project.txt
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/proguard-project.txt
rename to ui/notifications/CustomNotifications/Application/proguard-project.txt
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/AndroidManifest.xml b/ui/notifications/CustomNotifications/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/AndroidManifest.xml
rename to ui/notifications/CustomNotifications/Application/src/main/AndroidManifest.xml
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/java/com/example/android/customnotifications/MainActivity.java b/ui/notifications/CustomNotifications/Application/src/main/java/com/example/android/customnotifications/MainActivity.java
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/java/com/example/android/customnotifications/MainActivity.java
rename to ui/notifications/CustomNotifications/Application/src/main/java/com/example/android/customnotifications/MainActivity.java
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi-v11/ic_stat_custom.png b/ui/notifications/CustomNotifications/Application/src/main/res/drawable-hdpi-v11/ic_stat_custom.png
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi-v11/ic_stat_custom.png
rename to ui/notifications/CustomNotifications/Application/src/main/res/drawable-hdpi-v11/ic_stat_custom.png
Binary files differ
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi-v9/ic_stat_custom.png b/ui/notifications/CustomNotifications/Application/src/main/res/drawable-hdpi-v9/ic_stat_custom.png
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi-v9/ic_stat_custom.png
rename to ui/notifications/CustomNotifications/Application/src/main/res/drawable-hdpi-v9/ic_stat_custom.png
Binary files differ
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/notifications/CustomNotifications/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/notifications/CustomNotifications/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi/ic_stat_custom.png b/ui/notifications/CustomNotifications/Application/src/main/res/drawable-hdpi/ic_stat_custom.png
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi/ic_stat_custom.png
rename to ui/notifications/CustomNotifications/Application/src/main/res/drawable-hdpi/ic_stat_custom.png
Binary files differ
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-ldpi-v11/ic_stat_custom.png b/ui/notifications/CustomNotifications/Application/src/main/res/drawable-ldpi-v11/ic_stat_custom.png
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-ldpi-v11/ic_stat_custom.png
rename to ui/notifications/CustomNotifications/Application/src/main/res/drawable-ldpi-v11/ic_stat_custom.png
Binary files differ
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-ldpi-v9/ic_stat_custom.png b/ui/notifications/CustomNotifications/Application/src/main/res/drawable-ldpi-v9/ic_stat_custom.png
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-ldpi-v9/ic_stat_custom.png
rename to ui/notifications/CustomNotifications/Application/src/main/res/drawable-ldpi-v9/ic_stat_custom.png
Binary files differ
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-mdpi-v11/ic_stat_custom.png b/ui/notifications/CustomNotifications/Application/src/main/res/drawable-mdpi-v11/ic_stat_custom.png
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-mdpi-v11/ic_stat_custom.png
rename to ui/notifications/CustomNotifications/Application/src/main/res/drawable-mdpi-v11/ic_stat_custom.png
Binary files differ
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-mdpi-v9/ic_stat_custom.png b/ui/notifications/CustomNotifications/Application/src/main/res/drawable-mdpi-v9/ic_stat_custom.png
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-mdpi-v9/ic_stat_custom.png
rename to ui/notifications/CustomNotifications/Application/src/main/res/drawable-mdpi-v9/ic_stat_custom.png
Binary files differ
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/notifications/CustomNotifications/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/notifications/CustomNotifications/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-mdpi/ic_stat_custom.png b/ui/notifications/CustomNotifications/Application/src/main/res/drawable-mdpi/ic_stat_custom.png
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-mdpi/ic_stat_custom.png
rename to ui/notifications/CustomNotifications/Application/src/main/res/drawable-mdpi/ic_stat_custom.png
Binary files differ
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi-v11/ic_stat_custom.png b/ui/notifications/CustomNotifications/Application/src/main/res/drawable-xhdpi-v11/ic_stat_custom.png
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi-v11/ic_stat_custom.png
rename to ui/notifications/CustomNotifications/Application/src/main/res/drawable-xhdpi-v11/ic_stat_custom.png
Binary files differ
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi-v9/ic_stat_custom.png b/ui/notifications/CustomNotifications/Application/src/main/res/drawable-xhdpi-v9/ic_stat_custom.png
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi-v9/ic_stat_custom.png
rename to ui/notifications/CustomNotifications/Application/src/main/res/drawable-xhdpi-v9/ic_stat_custom.png
Binary files differ
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/notifications/CustomNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/notifications/CustomNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi/ic_stat_custom.png b/ui/notifications/CustomNotifications/Application/src/main/res/drawable-xhdpi/ic_stat_custom.png
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi/ic_stat_custom.png
rename to ui/notifications/CustomNotifications/Application/src/main/res/drawable-xhdpi/ic_stat_custom.png
Binary files differ
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi/robot.png b/ui/notifications/CustomNotifications/Application/src/main/res/drawable-xhdpi/robot.png
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi/robot.png
rename to ui/notifications/CustomNotifications/Application/src/main/res/drawable-xhdpi/robot.png
Binary files differ
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi/robot_expanded.png b/ui/notifications/CustomNotifications/Application/src/main/res/drawable-xhdpi/robot_expanded.png
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi/robot_expanded.png
rename to ui/notifications/CustomNotifications/Application/src/main/res/drawable-xhdpi/robot_expanded.png
Binary files differ
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/notifications/CustomNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/notifications/CustomNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/layout/notification.xml b/ui/notifications/CustomNotifications/Application/src/main/res/layout/notification.xml
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/layout/notification.xml
rename to ui/notifications/CustomNotifications/Application/src/main/res/layout/notification.xml
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/layout/notification_expanded.xml b/ui/notifications/CustomNotifications/Application/src/main/res/layout/notification_expanded.xml
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/layout/notification_expanded.xml
rename to ui/notifications/CustomNotifications/Application/src/main/res/layout/notification_expanded.xml
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/layout/sample_main.xml b/ui/notifications/CustomNotifications/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/layout/sample_main.xml
rename to ui/notifications/CustomNotifications/Application/src/main/res/layout/sample_main.xml
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/values-sw720dp-land/dimens.xml b/ui/notifications/CustomNotifications/Application/src/main/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/values-sw720dp-land/dimens.xml
rename to ui/notifications/CustomNotifications/Application/src/main/res/values-sw720dp-land/dimens.xml
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/values-v9/styles.xml b/ui/notifications/CustomNotifications/Application/src/main/res/values-v9/styles.xml
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/values-v9/styles.xml
rename to ui/notifications/CustomNotifications/Application/src/main/res/values-v9/styles.xml
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/values/dimens.xml b/ui/notifications/CustomNotifications/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/values/dimens.xml
rename to ui/notifications/CustomNotifications/Application/src/main/res/values/dimens.xml
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/values/strings.xml b/ui/notifications/CustomNotifications/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/values/strings.xml
rename to ui/notifications/CustomNotifications/Application/src/main/res/values/strings.xml
diff --git a/ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/values/styles.xml b/ui/notifications/CustomNotifications/Application/src/main/res/values/styles.xml
similarity index 100%
rename from ui/notifications/CustomNotifications/CustomNotificationsSample/src/main/res/values/styles.xml
rename to ui/notifications/CustomNotifications/Application/src/main/res/values/styles.xml
diff --git a/ui/notifications/CustomNotifications/settings.gradle b/ui/notifications/CustomNotifications/settings.gradle
index 71d4992..9464a35 100644
--- a/ui/notifications/CustomNotifications/settings.gradle
+++ b/ui/notifications/CustomNotifications/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'CustomNotificationsSample'
+include 'Application'
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/.gitignore b/ui/transition/AdapterTransition/Application/.gitignore
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/.gitignore
rename to ui/transition/AdapterTransition/Application/.gitignore
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/README-fragmentview.txt b/ui/transition/AdapterTransition/Application/README-fragmentview.txt
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/README-fragmentview.txt
rename to ui/transition/AdapterTransition/Application/README-fragmentview.txt
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/AndroidManifest.xml b/ui/transition/AdapterTransition/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/AndroidManifest.xml
rename to ui/transition/AdapterTransition/Application/src/main/AndroidManifest.xml
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/adaptertransition/AdapterTransitionFragment.java b/ui/transition/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/AdapterTransitionFragment.java
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/adaptertransition/AdapterTransitionFragment.java
rename to ui/transition/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/AdapterTransitionFragment.java
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/adaptertransition/Meat.java b/ui/transition/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/Meat.java
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/adaptertransition/Meat.java
rename to ui/transition/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/Meat.java
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/adaptertransition/MeatAdapter.java b/ui/transition/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/MeatAdapter.java
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/adaptertransition/MeatAdapter.java
rename to ui/transition/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/MeatAdapter.java
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-hdpi/ic_action_grid.png b/ui/transition/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_action_grid.png
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-hdpi/ic_action_grid.png
rename to ui/transition/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_action_grid.png
Binary files differ
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-hdpi/ic_action_list.png b/ui/transition/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_action_list.png
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-hdpi/ic_action_list.png
rename to ui/transition/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_action_list.png
Binary files differ
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/transition/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/transition/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-mdpi/ic_action_grid.png b/ui/transition/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_action_grid.png
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-mdpi/ic_action_grid.png
rename to ui/transition/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_action_grid.png
Binary files differ
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-mdpi/ic_action_list.png b/ui/transition/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_action_list.png
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-mdpi/ic_action_list.png
rename to ui/transition/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_action_list.png
Binary files differ
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/transition/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/transition/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p1.jpg b/ui/transition/AdapterTransition/Application/src/main/res/drawable-nodpi/p1.jpg
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p1.jpg
rename to ui/transition/AdapterTransition/Application/src/main/res/drawable-nodpi/p1.jpg
Binary files differ
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p10.jpg b/ui/transition/AdapterTransition/Application/src/main/res/drawable-nodpi/p10.jpg
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p10.jpg
rename to ui/transition/AdapterTransition/Application/src/main/res/drawable-nodpi/p10.jpg
Binary files differ
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p11.jpg b/ui/transition/AdapterTransition/Application/src/main/res/drawable-nodpi/p11.jpg
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p11.jpg
rename to ui/transition/AdapterTransition/Application/src/main/res/drawable-nodpi/p11.jpg
Binary files differ
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p2.jpg b/ui/transition/AdapterTransition/Application/src/main/res/drawable-nodpi/p2.jpg
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p2.jpg
rename to ui/transition/AdapterTransition/Application/src/main/res/drawable-nodpi/p2.jpg
Binary files differ
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p3.jpg b/ui/transition/AdapterTransition/Application/src/main/res/drawable-nodpi/p3.jpg
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p3.jpg
rename to ui/transition/AdapterTransition/Application/src/main/res/drawable-nodpi/p3.jpg
Binary files differ
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p4.jpg b/ui/transition/AdapterTransition/Application/src/main/res/drawable-nodpi/p4.jpg
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p4.jpg
rename to ui/transition/AdapterTransition/Application/src/main/res/drawable-nodpi/p4.jpg
Binary files differ
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p5.jpg b/ui/transition/AdapterTransition/Application/src/main/res/drawable-nodpi/p5.jpg
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p5.jpg
rename to ui/transition/AdapterTransition/Application/src/main/res/drawable-nodpi/p5.jpg
Binary files differ
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p6.jpg b/ui/transition/AdapterTransition/Application/src/main/res/drawable-nodpi/p6.jpg
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p6.jpg
rename to ui/transition/AdapterTransition/Application/src/main/res/drawable-nodpi/p6.jpg
Binary files differ
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p7.jpg b/ui/transition/AdapterTransition/Application/src/main/res/drawable-nodpi/p7.jpg
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p7.jpg
rename to ui/transition/AdapterTransition/Application/src/main/res/drawable-nodpi/p7.jpg
Binary files differ
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p8.jpg b/ui/transition/AdapterTransition/Application/src/main/res/drawable-nodpi/p8.jpg
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p8.jpg
rename to ui/transition/AdapterTransition/Application/src/main/res/drawable-nodpi/p8.jpg
Binary files differ
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p9.jpg b/ui/transition/AdapterTransition/Application/src/main/res/drawable-nodpi/p9.jpg
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p9.jpg
rename to ui/transition/AdapterTransition/Application/src/main/res/drawable-nodpi/p9.jpg
Binary files differ
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xhdpi/ic_action_grid.png b/ui/transition/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_action_grid.png
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xhdpi/ic_action_grid.png
rename to ui/transition/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_action_grid.png
Binary files differ
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xhdpi/ic_action_list.png b/ui/transition/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_action_list.png
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xhdpi/ic_action_list.png
rename to ui/transition/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_action_list.png
Binary files differ
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/transition/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/transition/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xxhdpi/ic_action_grid.png b/ui/transition/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_action_grid.png
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xxhdpi/ic_action_grid.png
rename to ui/transition/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_action_grid.png
Binary files differ
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xxhdpi/ic_action_list.png b/ui/transition/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_action_list.png
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xxhdpi/ic_action_list.png
rename to ui/transition/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_action_list.png
Binary files differ
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/transition/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/transition/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/layout/fragment_adapter_transition.xml b/ui/transition/AdapterTransition/Application/src/main/res/layout/fragment_adapter_transition.xml
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/layout/fragment_adapter_transition.xml
rename to ui/transition/AdapterTransition/Application/src/main/res/layout/fragment_adapter_transition.xml
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/layout/fragment_meat_grid.xml b/ui/transition/AdapterTransition/Application/src/main/res/layout/fragment_meat_grid.xml
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/layout/fragment_meat_grid.xml
rename to ui/transition/AdapterTransition/Application/src/main/res/layout/fragment_meat_grid.xml
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/layout/fragment_meat_list.xml b/ui/transition/AdapterTransition/Application/src/main/res/layout/fragment_meat_list.xml
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/layout/fragment_meat_list.xml
rename to ui/transition/AdapterTransition/Application/src/main/res/layout/fragment_meat_list.xml
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/layout/item_meat_grid.xml b/ui/transition/AdapterTransition/Application/src/main/res/layout/item_meat_grid.xml
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/layout/item_meat_grid.xml
rename to ui/transition/AdapterTransition/Application/src/main/res/layout/item_meat_grid.xml
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/layout/item_meat_list.xml b/ui/transition/AdapterTransition/Application/src/main/res/layout/item_meat_list.xml
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/layout/item_meat_list.xml
rename to ui/transition/AdapterTransition/Application/src/main/res/layout/item_meat_list.xml
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/menu/fragment_adapter_transition.xml b/ui/transition/AdapterTransition/Application/src/main/res/menu/fragment_adapter_transition.xml
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/menu/fragment_adapter_transition.xml
rename to ui/transition/AdapterTransition/Application/src/main/res/menu/fragment_adapter_transition.xml
diff --git a/ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/values/strings.xml b/ui/transition/AdapterTransition/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/transition/AdapterTransition/AdapterTransitionSample/src/main/res/values/strings.xml
rename to ui/transition/AdapterTransition/Application/src/main/res/values/strings.xml
diff --git a/ui/transition/AdapterTransition/settings.gradle b/ui/transition/AdapterTransition/settings.gradle
index 3284a23..9464a35 100644
--- a/ui/transition/AdapterTransition/settings.gradle
+++ b/ui/transition/AdapterTransition/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'AdapterTransitionSample'
+include 'Application'
diff --git a/ui/transition/BasicTransition/BasicTransitionSample/.gitignore b/ui/transition/BasicTransition/Application/.gitignore
similarity index 100%
rename from ui/transition/BasicTransition/BasicTransitionSample/.gitignore
rename to ui/transition/BasicTransition/Application/.gitignore
diff --git a/ui/transition/BasicTransition/BasicTransitionSample/README-fragmentview.txt b/ui/transition/BasicTransition/Application/README-fragmentview.txt
similarity index 100%
rename from ui/transition/BasicTransition/BasicTransitionSample/README-fragmentview.txt
rename to ui/transition/BasicTransition/Application/README-fragmentview.txt
diff --git a/ui/transition/BasicTransition/BasicTransitionSample/src/main/AndroidManifest.xml b/ui/transition/BasicTransition/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/transition/BasicTransition/BasicTransitionSample/src/main/AndroidManifest.xml
rename to ui/transition/BasicTransition/Application/src/main/AndroidManifest.xml
diff --git a/ui/transition/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/basictransition/BasicTransitionFragment.java b/ui/transition/BasicTransition/Application/src/main/java/com/example/android/basictransition/BasicTransitionFragment.java
similarity index 100%
rename from ui/transition/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/basictransition/BasicTransitionFragment.java
rename to ui/transition/BasicTransition/Application/src/main/java/com/example/android/basictransition/BasicTransitionFragment.java
diff --git a/ui/transition/BasicTransition/BasicTransitionSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/transition/BasicTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/transition/BasicTransition/BasicTransitionSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/transition/BasicTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/transition/BasicTransition/BasicTransitionSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/transition/BasicTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/transition/BasicTransition/BasicTransitionSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/transition/BasicTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/transition/BasicTransition/BasicTransitionSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/transition/BasicTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/transition/BasicTransition/BasicTransitionSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/transition/BasicTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/transition/BasicTransition/BasicTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/transition/BasicTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/transition/BasicTransition/BasicTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/transition/BasicTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/transition/BasicTransition/BasicTransitionSample/src/main/res/drawable/oval.xml b/ui/transition/BasicTransition/Application/src/main/res/drawable/oval.xml
similarity index 100%
rename from ui/transition/BasicTransition/BasicTransitionSample/src/main/res/drawable/oval.xml
rename to ui/transition/BasicTransition/Application/src/main/res/drawable/oval.xml
diff --git a/ui/transition/BasicTransition/BasicTransitionSample/src/main/res/layout/activity_basic_transition.xml b/ui/transition/BasicTransition/Application/src/main/res/layout/activity_basic_transition.xml
similarity index 100%
rename from ui/transition/BasicTransition/BasicTransitionSample/src/main/res/layout/activity_basic_transition.xml
rename to ui/transition/BasicTransition/Application/src/main/res/layout/activity_basic_transition.xml
diff --git a/ui/transition/BasicTransition/BasicTransitionSample/src/main/res/layout/fragment_basic_transition.xml b/ui/transition/BasicTransition/Application/src/main/res/layout/fragment_basic_transition.xml
similarity index 100%
rename from ui/transition/BasicTransition/BasicTransitionSample/src/main/res/layout/fragment_basic_transition.xml
rename to ui/transition/BasicTransition/Application/src/main/res/layout/fragment_basic_transition.xml
diff --git a/ui/transition/BasicTransition/BasicTransitionSample/src/main/res/layout/scene1.xml b/ui/transition/BasicTransition/Application/src/main/res/layout/scene1.xml
similarity index 100%
rename from ui/transition/BasicTransition/BasicTransitionSample/src/main/res/layout/scene1.xml
rename to ui/transition/BasicTransition/Application/src/main/res/layout/scene1.xml
diff --git a/ui/transition/BasicTransition/BasicTransitionSample/src/main/res/layout/scene2.xml b/ui/transition/BasicTransition/Application/src/main/res/layout/scene2.xml
similarity index 100%
rename from ui/transition/BasicTransition/BasicTransitionSample/src/main/res/layout/scene2.xml
rename to ui/transition/BasicTransition/Application/src/main/res/layout/scene2.xml
diff --git a/ui/transition/BasicTransition/BasicTransitionSample/src/main/res/layout/scene3.xml b/ui/transition/BasicTransition/Application/src/main/res/layout/scene3.xml
similarity index 100%
rename from ui/transition/BasicTransition/BasicTransitionSample/src/main/res/layout/scene3.xml
rename to ui/transition/BasicTransition/Application/src/main/res/layout/scene3.xml
diff --git a/ui/transition/BasicTransition/BasicTransitionSample/src/main/res/transition/changebounds_fadein_together.xml b/ui/transition/BasicTransition/Application/src/main/res/transition/changebounds_fadein_together.xml
similarity index 100%
rename from ui/transition/BasicTransition/BasicTransitionSample/src/main/res/transition/changebounds_fadein_together.xml
rename to ui/transition/BasicTransition/Application/src/main/res/transition/changebounds_fadein_together.xml
diff --git a/ui/transition/BasicTransition/BasicTransitionSample/src/main/res/transition/scene3_transition_manager.xml b/ui/transition/BasicTransition/Application/src/main/res/transition/scene3_transition_manager.xml
similarity index 100%
rename from ui/transition/BasicTransition/BasicTransitionSample/src/main/res/transition/scene3_transition_manager.xml
rename to ui/transition/BasicTransition/Application/src/main/res/transition/scene3_transition_manager.xml
diff --git a/ui/transition/BasicTransition/BasicTransitionSample/src/main/res/values-w820dp/dimens.xml b/ui/transition/BasicTransition/Application/src/main/res/values-w820dp/dimens.xml
similarity index 100%
rename from ui/transition/BasicTransition/BasicTransitionSample/src/main/res/values-w820dp/dimens.xml
rename to ui/transition/BasicTransition/Application/src/main/res/values-w820dp/dimens.xml
diff --git a/ui/transition/BasicTransition/BasicTransitionSample/src/main/res/values/dimens.xml b/ui/transition/BasicTransition/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from ui/transition/BasicTransition/BasicTransitionSample/src/main/res/values/dimens.xml
rename to ui/transition/BasicTransition/Application/src/main/res/values/dimens.xml
diff --git a/ui/transition/BasicTransition/BasicTransitionSample/src/main/res/values/strings.xml b/ui/transition/BasicTransition/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/transition/BasicTransition/BasicTransitionSample/src/main/res/values/strings.xml
rename to ui/transition/BasicTransition/Application/src/main/res/values/strings.xml
diff --git a/ui/transition/BasicTransition/settings.gradle b/ui/transition/BasicTransition/settings.gradle
index fae2688..9464a35 100644
--- a/ui/transition/BasicTransition/settings.gradle
+++ b/ui/transition/BasicTransition/settings.gradle
@@ -1 +1 @@
-include 'BasicTransitionSample'
+include 'Application'
diff --git a/ui/transition/CustomTransition/CustomTransitionSample/.gitignore b/ui/transition/CustomTransition/Application/.gitignore
similarity index 100%
rename from ui/transition/CustomTransition/CustomTransitionSample/.gitignore
rename to ui/transition/CustomTransition/Application/.gitignore
diff --git a/ui/transition/CustomTransition/CustomTransitionSample/README-fragmentview.txt b/ui/transition/CustomTransition/Application/README-fragmentview.txt
similarity index 100%
rename from ui/transition/CustomTransition/CustomTransitionSample/README-fragmentview.txt
rename to ui/transition/CustomTransition/Application/README-fragmentview.txt
diff --git a/ui/transition/CustomTransition/CustomTransitionSample/src/main/AndroidManifest.xml b/ui/transition/CustomTransition/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/transition/CustomTransition/CustomTransitionSample/src/main/AndroidManifest.xml
rename to ui/transition/CustomTransition/Application/src/main/AndroidManifest.xml
diff --git a/ui/transition/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/customtransition/ChangeColor.java b/ui/transition/CustomTransition/Application/src/main/java/com/example/android/customtransition/ChangeColor.java
similarity index 100%
rename from ui/transition/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/customtransition/ChangeColor.java
rename to ui/transition/CustomTransition/Application/src/main/java/com/example/android/customtransition/ChangeColor.java
diff --git a/ui/transition/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/customtransition/CustomTransitionFragment.java b/ui/transition/CustomTransition/Application/src/main/java/com/example/android/customtransition/CustomTransitionFragment.java
similarity index 100%
rename from ui/transition/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/customtransition/CustomTransitionFragment.java
rename to ui/transition/CustomTransition/Application/src/main/java/com/example/android/customtransition/CustomTransitionFragment.java
diff --git a/ui/transition/CustomTransition/CustomTransitionSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/transition/CustomTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/transition/CustomTransition/CustomTransitionSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/transition/CustomTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/transition/CustomTransition/CustomTransitionSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/transition/CustomTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/transition/CustomTransition/CustomTransitionSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/transition/CustomTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/transition/CustomTransition/CustomTransitionSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/transition/CustomTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/transition/CustomTransition/CustomTransitionSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/transition/CustomTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/transition/CustomTransition/CustomTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/transition/CustomTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/transition/CustomTransition/CustomTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/transition/CustomTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/transition/CustomTransition/CustomTransitionSample/src/main/res/layout/fragment_custom_transition.xml b/ui/transition/CustomTransition/Application/src/main/res/layout/fragment_custom_transition.xml
similarity index 100%
rename from ui/transition/CustomTransition/CustomTransitionSample/src/main/res/layout/fragment_custom_transition.xml
rename to ui/transition/CustomTransition/Application/src/main/res/layout/fragment_custom_transition.xml
diff --git a/ui/transition/CustomTransition/CustomTransitionSample/src/main/res/layout/scene1.xml b/ui/transition/CustomTransition/Application/src/main/res/layout/scene1.xml
similarity index 100%
rename from ui/transition/CustomTransition/CustomTransitionSample/src/main/res/layout/scene1.xml
rename to ui/transition/CustomTransition/Application/src/main/res/layout/scene1.xml
diff --git a/ui/transition/CustomTransition/CustomTransitionSample/src/main/res/layout/scene2.xml b/ui/transition/CustomTransition/Application/src/main/res/layout/scene2.xml
similarity index 100%
rename from ui/transition/CustomTransition/CustomTransitionSample/src/main/res/layout/scene2.xml
rename to ui/transition/CustomTransition/Application/src/main/res/layout/scene2.xml
diff --git a/ui/transition/CustomTransition/CustomTransitionSample/src/main/res/layout/scene3.xml b/ui/transition/CustomTransition/Application/src/main/res/layout/scene3.xml
similarity index 100%
rename from ui/transition/CustomTransition/CustomTransitionSample/src/main/res/layout/scene3.xml
rename to ui/transition/CustomTransition/Application/src/main/res/layout/scene3.xml
diff --git a/ui/transition/CustomTransition/settings.gradle b/ui/transition/CustomTransition/settings.gradle
index 3813ba8..9464a35 100644
--- a/ui/transition/CustomTransition/settings.gradle
+++ b/ui/transition/CustomTransition/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'CustomTransitionSample'
+include 'Application'
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/.gitignore b/ui/transition/FragmentTransition/Application/.gitignore
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/.gitignore
rename to ui/transition/FragmentTransition/Application/.gitignore
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/AndroidManifest.xml b/ui/transition/FragmentTransition/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/AndroidManifest.xml
rename to ui/transition/FragmentTransition/Application/src/main/AndroidManifest.xml
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/DetailFragment.java b/ui/transition/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/DetailFragment.java
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/DetailFragment.java
rename to ui/transition/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/DetailFragment.java
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/FragmentTransitionFragment.java b/ui/transition/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/FragmentTransitionFragment.java
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/FragmentTransitionFragment.java
rename to ui/transition/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/FragmentTransitionFragment.java
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/Meat.java b/ui/transition/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/Meat.java
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/Meat.java
rename to ui/transition/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/Meat.java
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/MeatAdapter.java b/ui/transition/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/MeatAdapter.java
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/MeatAdapter.java
rename to ui/transition/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/MeatAdapter.java
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/transition/FragmentTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/transition/FragmentTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/transition/FragmentTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/transition/FragmentTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p1.jpg b/ui/transition/FragmentTransition/Application/src/main/res/drawable-nodpi/p1.jpg
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p1.jpg
rename to ui/transition/FragmentTransition/Application/src/main/res/drawable-nodpi/p1.jpg
Binary files differ
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p10.jpg b/ui/transition/FragmentTransition/Application/src/main/res/drawable-nodpi/p10.jpg
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p10.jpg
rename to ui/transition/FragmentTransition/Application/src/main/res/drawable-nodpi/p10.jpg
Binary files differ
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p11.jpg b/ui/transition/FragmentTransition/Application/src/main/res/drawable-nodpi/p11.jpg
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p11.jpg
rename to ui/transition/FragmentTransition/Application/src/main/res/drawable-nodpi/p11.jpg
Binary files differ
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p2.jpg b/ui/transition/FragmentTransition/Application/src/main/res/drawable-nodpi/p2.jpg
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p2.jpg
rename to ui/transition/FragmentTransition/Application/src/main/res/drawable-nodpi/p2.jpg
Binary files differ
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p3.jpg b/ui/transition/FragmentTransition/Application/src/main/res/drawable-nodpi/p3.jpg
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p3.jpg
rename to ui/transition/FragmentTransition/Application/src/main/res/drawable-nodpi/p3.jpg
Binary files differ
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p4.jpg b/ui/transition/FragmentTransition/Application/src/main/res/drawable-nodpi/p4.jpg
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p4.jpg
rename to ui/transition/FragmentTransition/Application/src/main/res/drawable-nodpi/p4.jpg
Binary files differ
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p5.jpg b/ui/transition/FragmentTransition/Application/src/main/res/drawable-nodpi/p5.jpg
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p5.jpg
rename to ui/transition/FragmentTransition/Application/src/main/res/drawable-nodpi/p5.jpg
Binary files differ
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p6.jpg b/ui/transition/FragmentTransition/Application/src/main/res/drawable-nodpi/p6.jpg
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p6.jpg
rename to ui/transition/FragmentTransition/Application/src/main/res/drawable-nodpi/p6.jpg
Binary files differ
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p7.jpg b/ui/transition/FragmentTransition/Application/src/main/res/drawable-nodpi/p7.jpg
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p7.jpg
rename to ui/transition/FragmentTransition/Application/src/main/res/drawable-nodpi/p7.jpg
Binary files differ
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p8.jpg b/ui/transition/FragmentTransition/Application/src/main/res/drawable-nodpi/p8.jpg
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p8.jpg
rename to ui/transition/FragmentTransition/Application/src/main/res/drawable-nodpi/p8.jpg
Binary files differ
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p9.jpg b/ui/transition/FragmentTransition/Application/src/main/res/drawable-nodpi/p9.jpg
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p9.jpg
rename to ui/transition/FragmentTransition/Application/src/main/res/drawable-nodpi/p9.jpg
Binary files differ
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/transition/FragmentTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/transition/FragmentTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/transition/FragmentTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/transition/FragmentTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/layout/fragment_detail.xml b/ui/transition/FragmentTransition/Application/src/main/res/layout/fragment_detail.xml
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/layout/fragment_detail.xml
rename to ui/transition/FragmentTransition/Application/src/main/res/layout/fragment_detail.xml
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/layout/fragment_detail_content.xml b/ui/transition/FragmentTransition/Application/src/main/res/layout/fragment_detail_content.xml
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/layout/fragment_detail_content.xml
rename to ui/transition/FragmentTransition/Application/src/main/res/layout/fragment_detail_content.xml
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/layout/fragment_fragment_transition.xml b/ui/transition/FragmentTransition/Application/src/main/res/layout/fragment_fragment_transition.xml
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/layout/fragment_fragment_transition.xml
rename to ui/transition/FragmentTransition/Application/src/main/res/layout/fragment_fragment_transition.xml
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/layout/item_meat_grid.xml b/ui/transition/FragmentTransition/Application/src/main/res/layout/item_meat_grid.xml
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/layout/item_meat_grid.xml
rename to ui/transition/FragmentTransition/Application/src/main/res/layout/item_meat_grid.xml
diff --git a/ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/values/strings.xml b/ui/transition/FragmentTransition/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/transition/FragmentTransition/FragmentTransitionSample/src/main/res/values/strings.xml
rename to ui/transition/FragmentTransition/Application/src/main/res/values/strings.xml
diff --git a/ui/transition/FragmentTransition/settings.gradle b/ui/transition/FragmentTransition/settings.gradle
index 7e39b44..9464a35 100644
--- a/ui/transition/FragmentTransition/settings.gradle
+++ b/ui/transition/FragmentTransition/settings.gradle
@@ -1 +1 @@
-include 'FragmentTransitionSample'
+include 'Application'
diff --git a/ui/views/HorizontalPaging/HorizontalPagingSample/.gitignore b/ui/views/HorizontalPaging/Application/.gitignore
similarity index 100%
rename from ui/views/HorizontalPaging/HorizontalPagingSample/.gitignore
rename to ui/views/HorizontalPaging/Application/.gitignore
diff --git a/ui/views/HorizontalPaging/HorizontalPagingSample/proguard-project.txt b/ui/views/HorizontalPaging/Application/proguard-project.txt
similarity index 100%
rename from ui/views/HorizontalPaging/HorizontalPagingSample/proguard-project.txt
rename to ui/views/HorizontalPaging/Application/proguard-project.txt
diff --git a/ui/views/HorizontalPaging/HorizontalPagingSample/src/main/AndroidManifest.xml b/ui/views/HorizontalPaging/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/views/HorizontalPaging/HorizontalPagingSample/src/main/AndroidManifest.xml
rename to ui/views/HorizontalPaging/Application/src/main/AndroidManifest.xml
diff --git a/ui/views/HorizontalPaging/HorizontalPagingSample/src/main/java/com/example/android/horizontalpaging/MainActivity.java b/ui/views/HorizontalPaging/Application/src/main/java/com/example/android/horizontalpaging/MainActivity.java
similarity index 100%
rename from ui/views/HorizontalPaging/HorizontalPagingSample/src/main/java/com/example/android/horizontalpaging/MainActivity.java
rename to ui/views/HorizontalPaging/Application/src/main/java/com/example/android/horizontalpaging/MainActivity.java
diff --git a/ui/views/HorizontalPaging/HorizontalPagingSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/views/HorizontalPaging/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/views/HorizontalPaging/HorizontalPagingSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/views/HorizontalPaging/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/HorizontalPaging/HorizontalPagingSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/views/HorizontalPaging/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/views/HorizontalPaging/HorizontalPagingSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/views/HorizontalPaging/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/HorizontalPaging/HorizontalPagingSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/views/HorizontalPaging/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/HorizontalPaging/HorizontalPagingSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/views/HorizontalPaging/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/HorizontalPaging/HorizontalPagingSample/src/main/res/layout/fragment_main_dummy.xml b/ui/views/HorizontalPaging/Application/src/main/res/layout/fragment_main_dummy.xml
similarity index 100%
rename from ui/views/HorizontalPaging/HorizontalPagingSample/src/main/res/layout/fragment_main_dummy.xml
rename to ui/views/HorizontalPaging/Application/src/main/res/layout/fragment_main_dummy.xml
diff --git a/ui/views/HorizontalPaging/HorizontalPagingSample/src/main/res/layout/sample_main.xml b/ui/views/HorizontalPaging/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from ui/views/HorizontalPaging/HorizontalPagingSample/src/main/res/layout/sample_main.xml
rename to ui/views/HorizontalPaging/Application/src/main/res/layout/sample_main.xml
diff --git a/ui/views/HorizontalPaging/HorizontalPagingSample/src/main/res/values/dimens.xml b/ui/views/HorizontalPaging/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from ui/views/HorizontalPaging/HorizontalPagingSample/src/main/res/values/dimens.xml
rename to ui/views/HorizontalPaging/Application/src/main/res/values/dimens.xml
diff --git a/ui/views/HorizontalPaging/HorizontalPagingSample/src/main/res/values/strings.xml b/ui/views/HorizontalPaging/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/views/HorizontalPaging/HorizontalPagingSample/src/main/res/values/strings.xml
rename to ui/views/HorizontalPaging/Application/src/main/res/values/strings.xml
diff --git a/ui/views/HorizontalPaging/HorizontalPagingSample/src/main/res/values/values-sw720dp-land/dimens.xml b/ui/views/HorizontalPaging/Application/src/main/res/values/values-sw720dp-land/dimens.xml
similarity index 100%
rename from ui/views/HorizontalPaging/HorizontalPagingSample/src/main/res/values/values-sw720dp-land/dimens.xml
rename to ui/views/HorizontalPaging/Application/src/main/res/values/values-sw720dp-land/dimens.xml
diff --git a/ui/views/HorizontalPaging/HorizontalPagingSample/tests/AndroidManifest.xml b/ui/views/HorizontalPaging/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/views/HorizontalPaging/HorizontalPagingSample/tests/AndroidManifest.xml
rename to ui/views/HorizontalPaging/Application/tests/AndroidManifest.xml
diff --git a/ui/views/HorizontalPaging/HorizontalPagingSample/tests/src/com/example/android/horizontalpaging/tests/SampleTests.java b/ui/views/HorizontalPaging/Application/tests/src/com/example/android/horizontalpaging/tests/SampleTests.java
similarity index 100%
rename from ui/views/HorizontalPaging/HorizontalPagingSample/tests/src/com/example/android/horizontalpaging/tests/SampleTests.java
rename to ui/views/HorizontalPaging/Application/tests/src/com/example/android/horizontalpaging/tests/SampleTests.java
diff --git a/ui/views/HorizontalPaging/settings.gradle b/ui/views/HorizontalPaging/settings.gradle
index f70f0f1..9464a35 100644
--- a/ui/views/HorizontalPaging/settings.gradle
+++ b/ui/views/HorizontalPaging/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'HorizontalPagingSample'
+include 'Application'
diff --git a/ui/views/SlidingTabs/SlidingTabsBasic/SlidingTabsBasicSample/.gitignore b/ui/views/SlidingTabs/SlidingTabsBasic/Application/.gitignore
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsBasic/SlidingTabsBasicSample/.gitignore
rename to ui/views/SlidingTabs/SlidingTabsBasic/Application/.gitignore
diff --git a/ui/views/SlidingTabs/SlidingTabsBasic/SlidingTabsBasicSample/README-fragmentview.txt b/ui/views/SlidingTabs/SlidingTabsBasic/Application/README-fragmentview.txt
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsBasic/SlidingTabsBasicSample/README-fragmentview.txt
rename to ui/views/SlidingTabs/SlidingTabsBasic/Application/README-fragmentview.txt
diff --git a/ui/views/SlidingTabs/SlidingTabsBasic/SlidingTabsBasicSample/src/main/AndroidManifest.xml b/ui/views/SlidingTabs/SlidingTabsBasic/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsBasic/SlidingTabsBasicSample/src/main/AndroidManifest.xml
rename to ui/views/SlidingTabs/SlidingTabsBasic/Application/src/main/AndroidManifest.xml
diff --git a/ui/views/SlidingTabs/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/slidingtabsbasic/SlidingTabsBasicFragment.java b/ui/views/SlidingTabs/SlidingTabsBasic/Application/src/main/java/com/example/android/slidingtabsbasic/SlidingTabsBasicFragment.java
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/slidingtabsbasic/SlidingTabsBasicFragment.java
rename to ui/views/SlidingTabs/SlidingTabsBasic/Application/src/main/java/com/example/android/slidingtabsbasic/SlidingTabsBasicFragment.java
diff --git a/ui/views/SlidingTabs/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/views/SlidingTabs/SlidingTabsBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/views/SlidingTabs/SlidingTabsBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/SlidingTabs/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/views/SlidingTabs/SlidingTabsBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/views/SlidingTabs/SlidingTabsBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/SlidingTabs/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/views/SlidingTabs/SlidingTabsBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/views/SlidingTabs/SlidingTabsBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/SlidingTabs/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/views/SlidingTabs/SlidingTabsBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/views/SlidingTabs/SlidingTabsBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/SlidingTabs/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/layout/fragment_sample.xml b/ui/views/SlidingTabs/SlidingTabsBasic/Application/src/main/res/layout/fragment_sample.xml
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/layout/fragment_sample.xml
rename to ui/views/SlidingTabs/SlidingTabsBasic/Application/src/main/res/layout/fragment_sample.xml
diff --git a/ui/views/SlidingTabs/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/layout/pager_item.xml b/ui/views/SlidingTabs/SlidingTabsBasic/Application/src/main/res/layout/pager_item.xml
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/layout/pager_item.xml
rename to ui/views/SlidingTabs/SlidingTabsBasic/Application/src/main/res/layout/pager_item.xml
diff --git a/ui/views/SlidingTabs/SlidingTabsBasic/SlidingTabsBasicSample/tests/AndroidManifest.xml b/ui/views/SlidingTabs/SlidingTabsBasic/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsBasic/SlidingTabsBasicSample/tests/AndroidManifest.xml
rename to ui/views/SlidingTabs/SlidingTabsBasic/Application/tests/AndroidManifest.xml
diff --git a/ui/views/SlidingTabs/SlidingTabsBasic/SlidingTabsBasicSample/tests/src/com/example/android/slidingtabsbasic/tests/SampleTests.java b/ui/views/SlidingTabs/SlidingTabsBasic/Application/tests/src/com/example/android/slidingtabsbasic/tests/SampleTests.java
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsBasic/SlidingTabsBasicSample/tests/src/com/example/android/slidingtabsbasic/tests/SampleTests.java
rename to ui/views/SlidingTabs/SlidingTabsBasic/Application/tests/src/com/example/android/slidingtabsbasic/tests/SampleTests.java
diff --git a/ui/views/SlidingTabs/SlidingTabsBasic/settings.gradle b/ui/views/SlidingTabs/SlidingTabsBasic/settings.gradle
index 4accfbd..9464a35 100644
--- a/ui/views/SlidingTabs/SlidingTabsBasic/settings.gradle
+++ b/ui/views/SlidingTabs/SlidingTabsBasic/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'SlidingTabsBasicSample'
+include 'Application'
diff --git a/ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/.gitignore b/ui/views/SlidingTabs/SlidingTabsColors/Application/.gitignore
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/.gitignore
rename to ui/views/SlidingTabs/SlidingTabsColors/Application/.gitignore
diff --git a/ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/README-fragmentview.txt b/ui/views/SlidingTabs/SlidingTabsColors/Application/README-fragmentview.txt
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/README-fragmentview.txt
rename to ui/views/SlidingTabs/SlidingTabsColors/Application/README-fragmentview.txt
diff --git a/ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/proguard-project.txt b/ui/views/SlidingTabs/SlidingTabsColors/Application/proguard-project.txt
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/proguard-project.txt
rename to ui/views/SlidingTabs/SlidingTabsColors/Application/proguard-project.txt
diff --git a/ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/src/main/AndroidManifest.xml b/ui/views/SlidingTabs/SlidingTabsColors/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/src/main/AndroidManifest.xml
rename to ui/views/SlidingTabs/SlidingTabsColors/Application/src/main/AndroidManifest.xml
diff --git a/ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/slidingtabscolors/ContentFragment.java b/ui/views/SlidingTabs/SlidingTabsColors/Application/src/main/java/com/example/android/slidingtabscolors/ContentFragment.java
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/slidingtabscolors/ContentFragment.java
rename to ui/views/SlidingTabs/SlidingTabsColors/Application/src/main/java/com/example/android/slidingtabscolors/ContentFragment.java
diff --git a/ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/slidingtabscolors/SlidingTabsColorsFragment.java b/ui/views/SlidingTabs/SlidingTabsColors/Application/src/main/java/com/example/android/slidingtabscolors/SlidingTabsColorsFragment.java
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/slidingtabscolors/SlidingTabsColorsFragment.java
rename to ui/views/SlidingTabs/SlidingTabsColors/Application/src/main/java/com/example/android/slidingtabscolors/SlidingTabsColorsFragment.java
diff --git a/ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/views/SlidingTabs/SlidingTabsColors/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/views/SlidingTabs/SlidingTabsColors/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/views/SlidingTabs/SlidingTabsColors/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/views/SlidingTabs/SlidingTabsColors/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/views/SlidingTabs/SlidingTabsColors/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/views/SlidingTabs/SlidingTabsColors/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/views/SlidingTabs/SlidingTabsColors/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/views/SlidingTabs/SlidingTabsColors/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/layout/fragment_sample.xml b/ui/views/SlidingTabs/SlidingTabsColors/Application/src/main/res/layout/fragment_sample.xml
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/layout/fragment_sample.xml
rename to ui/views/SlidingTabs/SlidingTabsColors/Application/src/main/res/layout/fragment_sample.xml
diff --git a/ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/layout/pager_item.xml b/ui/views/SlidingTabs/SlidingTabsColors/Application/src/main/res/layout/pager_item.xml
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/layout/pager_item.xml
rename to ui/views/SlidingTabs/SlidingTabsColors/Application/src/main/res/layout/pager_item.xml
diff --git a/ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/strings.xml b/ui/views/SlidingTabs/SlidingTabsColors/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/strings.xml
rename to ui/views/SlidingTabs/SlidingTabsColors/Application/src/main/res/values/strings.xml
diff --git a/ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/tests/AndroidManifest.xml b/ui/views/SlidingTabs/SlidingTabsColors/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/tests/AndroidManifest.xml
rename to ui/views/SlidingTabs/SlidingTabsColors/Application/tests/AndroidManifest.xml
diff --git a/ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/tests/src/com/example/android/slidingtabscolors/tests/SampleTests.java b/ui/views/SlidingTabs/SlidingTabsColors/Application/tests/src/com/example/android/slidingtabscolors/tests/SampleTests.java
similarity index 100%
rename from ui/views/SlidingTabs/SlidingTabsColors/SlidingTabsColorsSample/tests/src/com/example/android/slidingtabscolors/tests/SampleTests.java
rename to ui/views/SlidingTabs/SlidingTabsColors/Application/tests/src/com/example/android/slidingtabscolors/tests/SampleTests.java
diff --git a/ui/views/SlidingTabs/SlidingTabsColors/settings.gradle b/ui/views/SlidingTabs/SlidingTabsColors/settings.gradle
index 3c5586a..9464a35 100644
--- a/ui/views/SlidingTabs/SlidingTabsColors/settings.gradle
+++ b/ui/views/SlidingTabs/SlidingTabsColors/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'SlidingTabsColorsSample'
+include 'Application'
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/.gitignore b/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/.gitignore
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/.gitignore
rename to ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/.gitignore
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/README-fragmentview.txt b/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/README-fragmentview.txt
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/README-fragmentview.txt
rename to ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/README-fragmentview.txt
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/proguard-project.txt b/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/proguard-project.txt
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/proguard-project.txt
rename to ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/proguard-project.txt
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/AndroidManifest.xml b/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/AndroidManifest.xml
rename to ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/src/main/AndroidManifest.xml
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/swiperefreshlayoutbasic/SwipeRefreshLayoutBasicFragment.java b/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/swiperefreshlayoutbasic/SwipeRefreshLayoutBasicFragment.java
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/swiperefreshlayoutbasic/SwipeRefreshLayoutBasicFragment.java
rename to ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/swiperefreshlayoutbasic/SwipeRefreshLayoutBasicFragment.java
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/layout/fragment_sample.xml b/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/src/main/res/layout/fragment_sample.xml
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/layout/fragment_sample.xml
rename to ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/src/main/res/layout/fragment_sample.xml
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/menu/main_menu.xml b/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/src/main/res/menu/main_menu.xml
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/menu/main_menu.xml
rename to ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/src/main/res/menu/main_menu.xml
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/colors.xml b/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/src/main/res/values/colors.xml
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/colors.xml
rename to ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/src/main/res/values/colors.xml
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/strings.xml b/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/strings.xml
rename to ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/src/main/res/values/strings.xml
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/tests/AndroidManifest.xml b/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/tests/AndroidManifest.xml
rename to ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/tests/AndroidManifest.xml
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/tests/src/com/example/android/swiperefreshlayoutbasic/tests/SampleTests.java b/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/tests/src/com/example/android/swiperefreshlayoutbasic/tests/SampleTests.java
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/tests/src/com/example/android/swiperefreshlayoutbasic/tests/SampleTests.java
rename to ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/tests/src/com/example/android/swiperefreshlayoutbasic/tests/SampleTests.java
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/settings.gradle b/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/settings.gradle
index 3a38e28..9464a35 100644
--- a/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/settings.gradle
+++ b/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'SwipeRefreshLayoutBasicSample'
+include 'Application'
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/.gitignore b/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/.gitignore
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/.gitignore
rename to ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/.gitignore
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/README-fragmentview.txt b/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/README-fragmentview.txt
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/README-fragmentview.txt
rename to ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/README-fragmentview.txt
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/libs/android-support-v4.jar b/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/libs/android-support-v4.jar
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/libs/android-support-v4.jar
rename to ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/libs/android-support-v4.jar
Binary files differ
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/proguard-project.txt b/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/proguard-project.txt
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/proguard-project.txt
rename to ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/proguard-project.txt
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/AndroidManifest.xml b/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/AndroidManifest.xml
rename to ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/src/main/AndroidManifest.xml
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragment.java b/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragment.java
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragment.java
rename to ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragment.java
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragmentFragment.java b/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragmentFragment.java
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragmentFragment.java
rename to ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragmentFragment.java
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/menu/main_menu.xml b/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/src/main/res/menu/main_menu.xml
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/menu/main_menu.xml
rename to ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/src/main/res/menu/main_menu.xml
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/colors.xml b/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/src/main/res/values/colors.xml
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/colors.xml
rename to ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/src/main/res/values/colors.xml
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/strings.xml b/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/strings.xml
rename to ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/src/main/res/values/strings.xml
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/tests/AndroidManifest.xml b/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/tests/AndroidManifest.xml
rename to ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/tests/AndroidManifest.xml
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/tests/src/com/example/android/swiperefreshlistfragment/tests/SampleTests.java b/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/tests/src/com/example/android/swiperefreshlistfragment/tests/SampleTests.java
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/tests/src/com/example/android/swiperefreshlistfragment/tests/SampleTests.java
rename to ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/tests/src/com/example/android/swiperefreshlistfragment/tests/SampleTests.java
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/settings.gradle b/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/settings.gradle
index 01af4e2..9464a35 100644
--- a/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/settings.gradle
+++ b/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'SwipeRefreshListFragmentSample'
+include 'Application'
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/.gitignore b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/.gitignore
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/.gitignore
rename to ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/.gitignore
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/README-fragmentview.txt b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/README-fragmentview.txt
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/README-fragmentview.txt
rename to ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/README-fragmentview.txt
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/proguard-project.txt b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/proguard-project.txt
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/proguard-project.txt
rename to ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/proguard-project.txt
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/AndroidManifest.xml b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/AndroidManifest.xml
rename to ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/AndroidManifest.xml
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/swiperefreshmultipleviews/MultiSwipeRefreshLayout.java b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/MultiSwipeRefreshLayout.java
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/swiperefreshmultipleviews/MultiSwipeRefreshLayout.java
rename to ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/MultiSwipeRefreshLayout.java
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/swiperefreshmultipleviews/SwipeRefreshMultipleViewsFragment.java b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/SwipeRefreshMultipleViewsFragment.java
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/swiperefreshmultipleviews/SwipeRefreshMultipleViewsFragment.java
rename to ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/SwipeRefreshMultipleViewsFragment.java
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/layout/fragment_sample.xml b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/res/layout/fragment_sample.xml
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/layout/fragment_sample.xml
rename to ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/res/layout/fragment_sample.xml
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/menu/main_menu.xml b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/res/menu/main_menu.xml
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/menu/main_menu.xml
rename to ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/res/menu/main_menu.xml
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/color.xml b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/res/values/color.xml
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/color.xml
rename to ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/res/values/color.xml
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/strings.xml b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/strings.xml
rename to ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/res/values/strings.xml
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/tests/AndroidManifest.xml b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/tests/AndroidManifest.xml
rename to ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/tests/AndroidManifest.xml
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/tests/src/com/example/android/swiperefreshmultipleviews/tests/SampleTests.java b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/tests/src/com/example/android/swiperefreshmultipleviews/tests/SampleTests.java
similarity index 100%
rename from ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/tests/src/com/example/android/swiperefreshmultipleviews/tests/SampleTests.java
rename to ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/tests/src/com/example/android/swiperefreshmultipleviews/tests/SampleTests.java
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/settings.gradle b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/settings.gradle
index 716f424..9464a35 100644
--- a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/settings.gradle
+++ b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'SwipeRefreshMultipleViewsSample'
+include 'Application'
diff --git a/ui/views/TextSwitcher/TextSwitcherSample/.gitignore b/ui/views/TextSwitcher/Application/.gitignore
similarity index 100%
rename from ui/views/TextSwitcher/TextSwitcherSample/.gitignore
rename to ui/views/TextSwitcher/Application/.gitignore
diff --git a/ui/views/TextSwitcher/TextSwitcherSample/proguard-project.txt b/ui/views/TextSwitcher/Application/proguard-project.txt
similarity index 100%
rename from ui/views/TextSwitcher/TextSwitcherSample/proguard-project.txt
rename to ui/views/TextSwitcher/Application/proguard-project.txt
diff --git a/ui/views/TextSwitcher/TextSwitcherSample/src/main/AndroidManifest.xml b/ui/views/TextSwitcher/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/views/TextSwitcher/TextSwitcherSample/src/main/AndroidManifest.xml
rename to ui/views/TextSwitcher/Application/src/main/AndroidManifest.xml
diff --git a/ui/views/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/textswitcher/MainActivity.java b/ui/views/TextSwitcher/Application/src/main/java/com/example/android/textswitcher/MainActivity.java
similarity index 100%
rename from ui/views/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/textswitcher/MainActivity.java
rename to ui/views/TextSwitcher/Application/src/main/java/com/example/android/textswitcher/MainActivity.java
diff --git a/ui/views/TextSwitcher/TextSwitcherSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/views/TextSwitcher/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/views/TextSwitcher/TextSwitcherSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/views/TextSwitcher/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/TextSwitcher/TextSwitcherSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/views/TextSwitcher/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/views/TextSwitcher/TextSwitcherSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/views/TextSwitcher/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/TextSwitcher/TextSwitcherSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/views/TextSwitcher/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/TextSwitcher/TextSwitcherSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/views/TextSwitcher/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/TextSwitcher/TextSwitcherSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/views/TextSwitcher/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/views/TextSwitcher/TextSwitcherSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/views/TextSwitcher/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/views/TextSwitcher/TextSwitcherSample/src/main/res/layout/sample_main.xml b/ui/views/TextSwitcher/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from ui/views/TextSwitcher/TextSwitcherSample/src/main/res/layout/sample_main.xml
rename to ui/views/TextSwitcher/Application/src/main/res/layout/sample_main.xml
diff --git a/ui/views/TextSwitcher/TextSwitcherSample/src/main/res/values-sw600dp/dimens.xml b/ui/views/TextSwitcher/Application/src/main/res/values-sw600dp/dimens.xml
similarity index 100%
rename from ui/views/TextSwitcher/TextSwitcherSample/src/main/res/values-sw600dp/dimens.xml
rename to ui/views/TextSwitcher/Application/src/main/res/values-sw600dp/dimens.xml
diff --git a/ui/views/TextSwitcher/TextSwitcherSample/src/main/res/values-sw720dp-land/dimens.xml b/ui/views/TextSwitcher/Application/src/main/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from ui/views/TextSwitcher/TextSwitcherSample/src/main/res/values-sw720dp-land/dimens.xml
rename to ui/views/TextSwitcher/Application/src/main/res/values-sw720dp-land/dimens.xml
diff --git a/ui/views/TextSwitcher/TextSwitcherSample/src/main/res/values-v11/styles.xml b/ui/views/TextSwitcher/Application/src/main/res/values-v11/styles.xml
similarity index 100%
rename from ui/views/TextSwitcher/TextSwitcherSample/src/main/res/values-v11/styles.xml
rename to ui/views/TextSwitcher/Application/src/main/res/values-v11/styles.xml
diff --git a/ui/views/TextSwitcher/TextSwitcherSample/src/main/res/values-v14/styles.xml b/ui/views/TextSwitcher/Application/src/main/res/values-v14/styles.xml
similarity index 100%
rename from ui/views/TextSwitcher/TextSwitcherSample/src/main/res/values-v14/styles.xml
rename to ui/views/TextSwitcher/Application/src/main/res/values-v14/styles.xml
diff --git a/ui/views/TextSwitcher/TextSwitcherSample/src/main/res/values/dimens.xml b/ui/views/TextSwitcher/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from ui/views/TextSwitcher/TextSwitcherSample/src/main/res/values/dimens.xml
rename to ui/views/TextSwitcher/Application/src/main/res/values/dimens.xml
diff --git a/ui/views/TextSwitcher/TextSwitcherSample/src/main/res/values/strings.xml b/ui/views/TextSwitcher/Application/src/main/res/values/strings.xml
similarity index 100%
rename from ui/views/TextSwitcher/TextSwitcherSample/src/main/res/values/strings.xml
rename to ui/views/TextSwitcher/Application/src/main/res/values/strings.xml
diff --git a/ui/views/TextSwitcher/settings.gradle b/ui/views/TextSwitcher/settings.gradle
index 6740a95..9464a35 100644
--- a/ui/views/TextSwitcher/settings.gradle
+++ b/ui/views/TextSwitcher/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'TextSwitcherSample'
+include 'Application'
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/.gitignore b/ui/window/AdvancedImmersiveMode/Application/.gitignore
similarity index 100%
rename from ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/.gitignore
rename to ui/window/AdvancedImmersiveMode/Application/.gitignore
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/README-fragmentview.txt b/ui/window/AdvancedImmersiveMode/Application/README-fragmentview.txt
similarity index 100%
rename from ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/README-fragmentview.txt
rename to ui/window/AdvancedImmersiveMode/Application/README-fragmentview.txt
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/proguard-project.txt b/ui/window/AdvancedImmersiveMode/Application/proguard-project.txt
similarity index 100%
rename from ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/proguard-project.txt
rename to ui/window/AdvancedImmersiveMode/Application/proguard-project.txt
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/AndroidManifest.xml b/ui/window/AdvancedImmersiveMode/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/AndroidManifest.xml
rename to ui/window/AdvancedImmersiveMode/Application/src/main/AndroidManifest.xml
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/advancedimmersivemode/AdvancedImmersiveModeFragment.java b/ui/window/AdvancedImmersiveMode/Application/src/main/java/com/example/android/advancedimmersivemode/AdvancedImmersiveModeFragment.java
similarity index 100%
rename from ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/advancedimmersivemode/AdvancedImmersiveModeFragment.java
rename to ui/window/AdvancedImmersiveMode/Application/src/main/java/com/example/android/advancedimmersivemode/AdvancedImmersiveModeFragment.java
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/window/AdvancedImmersiveMode/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/window/AdvancedImmersiveMode/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/window/AdvancedImmersiveMode/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/window/AdvancedImmersiveMode/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/window/AdvancedImmersiveMode/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/window/AdvancedImmersiveMode/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/window/AdvancedImmersiveMode/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/window/AdvancedImmersiveMode/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/layout/fragment_flags.xml b/ui/window/AdvancedImmersiveMode/Application/src/main/res/layout/fragment_flags.xml
similarity index 100%
rename from ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/layout/fragment_flags.xml
rename to ui/window/AdvancedImmersiveMode/Application/src/main/res/layout/fragment_flags.xml
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/tests/AndroidManifest.xml b/ui/window/AdvancedImmersiveMode/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/tests/AndroidManifest.xml
rename to ui/window/AdvancedImmersiveMode/Application/tests/AndroidManifest.xml
diff --git a/ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/tests/src/com/example/android/advancedimmersivemode/tests/SampleTests.java b/ui/window/AdvancedImmersiveMode/Application/tests/src/com/example/android/advancedimmersivemode/tests/SampleTests.java
similarity index 100%
rename from ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/tests/src/com/example/android/advancedimmersivemode/tests/SampleTests.java
rename to ui/window/AdvancedImmersiveMode/Application/tests/src/com/example/android/advancedimmersivemode/tests/SampleTests.java
diff --git a/ui/window/AdvancedImmersiveMode/settings.gradle b/ui/window/AdvancedImmersiveMode/settings.gradle
index 0f7ed4b..9464a35 100644
--- a/ui/window/AdvancedImmersiveMode/settings.gradle
+++ b/ui/window/AdvancedImmersiveMode/settings.gradle
@@ -1 +1 @@
-include 'AdvancedImmersiveModeSample'
+include 'Application'
diff --git a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/.gitignore b/ui/window/BasicImmersiveMode/Application/.gitignore
similarity index 100%
rename from ui/window/BasicImmersiveMode/BasicImmersiveModeSample/.gitignore
rename to ui/window/BasicImmersiveMode/Application/.gitignore
diff --git a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/README-singleview.txt b/ui/window/BasicImmersiveMode/Application/README-singleview.txt
similarity index 100%
rename from ui/window/BasicImmersiveMode/BasicImmersiveModeSample/README-singleview.txt
rename to ui/window/BasicImmersiveMode/Application/README-singleview.txt
diff --git a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/proguard-project.txt b/ui/window/BasicImmersiveMode/Application/proguard-project.txt
similarity index 100%
rename from ui/window/BasicImmersiveMode/BasicImmersiveModeSample/proguard-project.txt
rename to ui/window/BasicImmersiveMode/Application/proguard-project.txt
diff --git a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/src/main/AndroidManifest.xml b/ui/window/BasicImmersiveMode/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/window/BasicImmersiveMode/BasicImmersiveModeSample/src/main/AndroidManifest.xml
rename to ui/window/BasicImmersiveMode/Application/src/main/AndroidManifest.xml
diff --git a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/basicimmersivemode/BasicImmersiveModeFragment.java b/ui/window/BasicImmersiveMode/Application/src/main/java/com/example/android/basicimmersivemode/BasicImmersiveModeFragment.java
similarity index 100%
rename from ui/window/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/basicimmersivemode/BasicImmersiveModeFragment.java
rename to ui/window/BasicImmersiveMode/Application/src/main/java/com/example/android/basicimmersivemode/BasicImmersiveModeFragment.java
diff --git a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/window/BasicImmersiveMode/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/window/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/window/BasicImmersiveMode/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/window/BasicImmersiveMode/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/window/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/window/BasicImmersiveMode/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/window/BasicImmersiveMode/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/window/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/window/BasicImmersiveMode/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/window/BasicImmersiveMode/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/window/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/window/BasicImmersiveMode/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/tests/AndroidManifest.xml b/ui/window/BasicImmersiveMode/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/window/BasicImmersiveMode/BasicImmersiveModeSample/tests/AndroidManifest.xml
rename to ui/window/BasicImmersiveMode/Application/tests/AndroidManifest.xml
diff --git a/ui/window/BasicImmersiveMode/BasicImmersiveModeSample/tests/src/com/example/android/basicimmersivemode/tests/SampleTests.java b/ui/window/BasicImmersiveMode/Application/tests/src/com/example/android/basicimmersivemode/tests/SampleTests.java
similarity index 100%
rename from ui/window/BasicImmersiveMode/BasicImmersiveModeSample/tests/src/com/example/android/basicimmersivemode/tests/SampleTests.java
rename to ui/window/BasicImmersiveMode/Application/tests/src/com/example/android/basicimmersivemode/tests/SampleTests.java
diff --git a/ui/window/BasicImmersiveMode/settings.gradle b/ui/window/BasicImmersiveMode/settings.gradle
index 8dda383..9464a35 100644
--- a/ui/window/BasicImmersiveMode/settings.gradle
+++ b/ui/window/BasicImmersiveMode/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'BasicImmersiveModeSample'
+include 'Application'
diff --git a/ui/window/ImmersiveMode/ImmersiveModeSample/.gitignore b/ui/window/ImmersiveMode/Application/.gitignore
similarity index 100%
rename from ui/window/ImmersiveMode/ImmersiveModeSample/.gitignore
rename to ui/window/ImmersiveMode/Application/.gitignore
diff --git a/ui/window/ImmersiveMode/ImmersiveModeSample/README-singleview.txt b/ui/window/ImmersiveMode/Application/README-singleview.txt
similarity index 100%
rename from ui/window/ImmersiveMode/ImmersiveModeSample/README-singleview.txt
rename to ui/window/ImmersiveMode/Application/README-singleview.txt
diff --git a/ui/window/ImmersiveMode/ImmersiveModeSample/proguard-project.txt b/ui/window/ImmersiveMode/Application/proguard-project.txt
similarity index 100%
rename from ui/window/ImmersiveMode/ImmersiveModeSample/proguard-project.txt
rename to ui/window/ImmersiveMode/Application/proguard-project.txt
diff --git a/ui/window/ImmersiveMode/ImmersiveModeSample/src/main/AndroidManifest.xml b/ui/window/ImmersiveMode/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/window/ImmersiveMode/ImmersiveModeSample/src/main/AndroidManifest.xml
rename to ui/window/ImmersiveMode/Application/src/main/AndroidManifest.xml
diff --git a/ui/window/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/immersivemode/ImmersiveModeFragment.java b/ui/window/ImmersiveMode/Application/src/main/java/com/example/android/immersivemode/ImmersiveModeFragment.java
similarity index 100%
rename from ui/window/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/immersivemode/ImmersiveModeFragment.java
rename to ui/window/ImmersiveMode/Application/src/main/java/com/example/android/immersivemode/ImmersiveModeFragment.java
diff --git a/ui/window/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-hdpi/ic_launcher.png b/ui/window/ImmersiveMode/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/window/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/window/ImmersiveMode/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/window/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-mdpi/ic_launcher.png b/ui/window/ImmersiveMode/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/window/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/window/ImmersiveMode/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/window/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/window/ImmersiveMode/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/window/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/window/ImmersiveMode/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/window/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/window/ImmersiveMode/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/window/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/window/ImmersiveMode/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/window/ImmersiveMode/ImmersiveModeSample/tests/AndroidManifest.xml b/ui/window/ImmersiveMode/Application/tests/AndroidManifest.xml
similarity index 100%
rename from ui/window/ImmersiveMode/ImmersiveModeSample/tests/AndroidManifest.xml
rename to ui/window/ImmersiveMode/Application/tests/AndroidManifest.xml
diff --git a/ui/window/ImmersiveMode/ImmersiveModeSample/tests/src/com/example/android/immersivemode/tests/ImmersiveModeSampleTests.java b/ui/window/ImmersiveMode/Application/tests/src/com/example/android/immersivemode/tests/ImmersiveModeSampleTests.java
similarity index 100%
rename from ui/window/ImmersiveMode/ImmersiveModeSample/tests/src/com/example/android/immersivemode/tests/ImmersiveModeSampleTests.java
rename to ui/window/ImmersiveMode/Application/tests/src/com/example/android/immersivemode/tests/ImmersiveModeSampleTests.java
diff --git a/ui/window/ImmersiveMode/ImmersiveModeSample/tests/src/com/example/android/immersivemode/tests/SampleTests.java b/ui/window/ImmersiveMode/Application/tests/src/com/example/android/immersivemode/tests/SampleTests.java
similarity index 100%
rename from ui/window/ImmersiveMode/ImmersiveModeSample/tests/src/com/example/android/immersivemode/tests/SampleTests.java
rename to ui/window/ImmersiveMode/Application/tests/src/com/example/android/immersivemode/tests/SampleTests.java
diff --git a/ui/window/ImmersiveMode/settings.gradle b/ui/window/ImmersiveMode/settings.gradle
index d13a7a1..9464a35 100644
--- a/ui/window/ImmersiveMode/settings.gradle
+++ b/ui/window/ImmersiveMode/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'ImmersiveModeSample'
+include 'Application'
diff --git a/views/TextLinkify/TextLinkifySample/.gitignore b/views/TextLinkify/Application/.gitignore
similarity index 100%
rename from views/TextLinkify/TextLinkifySample/.gitignore
rename to views/TextLinkify/Application/.gitignore
diff --git a/views/TextLinkify/TextLinkifySample/proguard-project.txt b/views/TextLinkify/Application/proguard-project.txt
similarity index 100%
rename from views/TextLinkify/TextLinkifySample/proguard-project.txt
rename to views/TextLinkify/Application/proguard-project.txt
diff --git a/views/TextLinkify/TextLinkifySample/src/main/AndroidManifest.xml b/views/TextLinkify/Application/src/main/AndroidManifest.xml
similarity index 100%
rename from views/TextLinkify/TextLinkifySample/src/main/AndroidManifest.xml
rename to views/TextLinkify/Application/src/main/AndroidManifest.xml
diff --git a/views/TextLinkify/TextLinkifySample/src/main/java/com/example/android/textlinkify/MainActivity.java b/views/TextLinkify/Application/src/main/java/com/example/android/textlinkify/MainActivity.java
similarity index 100%
rename from views/TextLinkify/TextLinkifySample/src/main/java/com/example/android/textlinkify/MainActivity.java
rename to views/TextLinkify/Application/src/main/java/com/example/android/textlinkify/MainActivity.java
diff --git a/views/TextLinkify/TextLinkifySample/src/main/res/drawable-hdpi/ic_launcher.png b/views/TextLinkify/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from views/TextLinkify/TextLinkifySample/src/main/res/drawable-hdpi/ic_launcher.png
rename to views/TextLinkify/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/views/TextLinkify/TextLinkifySample/src/main/res/drawable-mdpi/ic_launcher.png b/views/TextLinkify/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from views/TextLinkify/TextLinkifySample/src/main/res/drawable-mdpi/ic_launcher.png
rename to views/TextLinkify/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/views/TextLinkify/TextLinkifySample/src/main/res/drawable-xhdpi/ic_launcher.png b/views/TextLinkify/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from views/TextLinkify/TextLinkifySample/src/main/res/drawable-xhdpi/ic_launcher.png
rename to views/TextLinkify/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/views/TextLinkify/TextLinkifySample/src/main/res/drawable-xxhdpi/ic_launcher.png b/views/TextLinkify/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from views/TextLinkify/TextLinkifySample/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to views/TextLinkify/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/views/TextLinkify/TextLinkifySample/src/main/res/layout/sample_main.xml b/views/TextLinkify/Application/src/main/res/layout/sample_main.xml
similarity index 100%
rename from views/TextLinkify/TextLinkifySample/src/main/res/layout/sample_main.xml
rename to views/TextLinkify/Application/src/main/res/layout/sample_main.xml
diff --git a/views/TextLinkify/TextLinkifySample/src/main/res/values-sw720dp-land/dimens.xml b/views/TextLinkify/Application/src/main/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from views/TextLinkify/TextLinkifySample/src/main/res/values-sw720dp-land/dimens.xml
rename to views/TextLinkify/Application/src/main/res/values-sw720dp-land/dimens.xml
diff --git a/views/TextLinkify/TextLinkifySample/src/main/res/values/dimens.xml b/views/TextLinkify/Application/src/main/res/values/dimens.xml
similarity index 100%
rename from views/TextLinkify/TextLinkifySample/src/main/res/values/dimens.xml
rename to views/TextLinkify/Application/src/main/res/values/dimens.xml
diff --git a/views/TextLinkify/TextLinkifySample/src/main/res/values/strings.xml b/views/TextLinkify/Application/src/main/res/values/strings.xml
similarity index 100%
rename from views/TextLinkify/TextLinkifySample/src/main/res/values/strings.xml
rename to views/TextLinkify/Application/src/main/res/values/strings.xml
diff --git a/views/TextLinkify/TextLinkifySample/src/main/res/values/styles.xml b/views/TextLinkify/Application/src/main/res/values/styles.xml
similarity index 100%
rename from views/TextLinkify/TextLinkifySample/src/main/res/values/styles.xml
rename to views/TextLinkify/Application/src/main/res/values/styles.xml
diff --git a/views/TextLinkify/TextLinkifySample/tests/AndroidManifest.xml b/views/TextLinkify/Application/tests/AndroidManifest.xml
similarity index 100%
rename from views/TextLinkify/TextLinkifySample/tests/AndroidManifest.xml
rename to views/TextLinkify/Application/tests/AndroidManifest.xml
diff --git a/views/TextLinkify/TextLinkifySample/tests/src/com/example/android/textlinkify/tests/SampleTests.java b/views/TextLinkify/Application/tests/src/com/example/android/textlinkify/tests/SampleTests.java
similarity index 100%
rename from views/TextLinkify/TextLinkifySample/tests/src/com/example/android/textlinkify/tests/SampleTests.java
rename to views/TextLinkify/Application/tests/src/com/example/android/textlinkify/tests/SampleTests.java
diff --git a/views/TextLinkify/settings.gradle b/views/TextLinkify/settings.gradle
index 38e7ddd..9464a35 100644
--- a/views/TextLinkify/settings.gradle
+++ b/views/TextLinkify/settings.gradle
@@ -1,4 +1 @@
-
-
-
-include 'TextLinkifySample'
+include 'Application'
diff --git a/connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/.gitignore b/wearable/wear/SynchronizedNotifications/Application/.gitignore
similarity index 100%
copy from connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/.gitignore
copy to wearable/wear/SynchronizedNotifications/Application/.gitignore
diff --git a/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/README-simpleview.txt b/wearable/wear/SynchronizedNotifications/Application/README-simpleview.txt
similarity index 100%
copy from security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/README-simpleview.txt
copy to wearable/wear/SynchronizedNotifications/Application/README-simpleview.txt
diff --git a/connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/proguard-project.txt b/wearable/wear/SynchronizedNotifications/Application/proguard-project.txt
similarity index 100%
copy from connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGattSample/proguard-project.txt
copy to wearable/wear/SynchronizedNotifications/Application/proguard-project.txt
diff --git a/wearable/wear/SynchronizedNotifications/Application/src/main/AndroidManifest.xml b/wearable/wear/SynchronizedNotifications/Application/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..c46f772
--- /dev/null
+++ b/wearable/wear/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/wearable/wear/SynchronizedNotifications/Application/src/main/java/com/example/android/synchronizednotifications/DismissListener.java b/wearable/wear/SynchronizedNotifications/Application/src/main/java/com/example/android/synchronizednotifications/DismissListener.java
new file mode 100644
index 0000000..8648148
--- /dev/null
+++ b/wearable/wear/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/wearable/wear/SynchronizedNotifications/Application/src/main/java/com/example/android/synchronizednotifications/SynchronizedNotificationsFragment.java b/wearable/wear/SynchronizedNotifications/Application/src/main/java/com/example/android/synchronizednotifications/SynchronizedNotificationsFragment.java
new file mode 100644
index 0000000..d4b9f6a
--- /dev/null
+++ b/wearable/wear/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/background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-hdpi/ic_launcher.png b/wearable/wear/SynchronizedNotifications/Application/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
copy from background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-hdpi/ic_launcher.png
copy to wearable/wear/SynchronizedNotifications/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-mdpi/ic_launcher.png b/wearable/wear/SynchronizedNotifications/Application/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
copy from background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-mdpi/ic_launcher.png
copy to wearable/wear/SynchronizedNotifications/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/media/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-xhdpi/ic_launcher.png b/wearable/wear/SynchronizedNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
copy from media/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-xhdpi/ic_launcher.png
copy to wearable/wear/SynchronizedNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/wearable/wear/SynchronizedNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
copy from background/alarms/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-xxhdpi/ic_launcher.png
copy to wearable/wear/SynchronizedNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/wearable/wear/SynchronizedNotifications/Application/src/main/res/menu/main.xml b/wearable/wear/SynchronizedNotifications/Application/src/main/res/menu/main.xml
new file mode 100644
index 0000000..165c0a8
--- /dev/null
+++ b/wearable/wear/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/wearable/wear/SynchronizedNotifications/Application/src/main/res/values/dimens.xml b/wearable/wear/SynchronizedNotifications/Application/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..a1e9cfe
--- /dev/null
+++ b/wearable/wear/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/wearable/wear/SynchronizedNotifications/Application/src/main/res/values/sample-strings.xml b/wearable/wear/SynchronizedNotifications/Application/src/main/res/values/sample-strings.xml
new file mode 100644
index 0000000..8ac6bf2
--- /dev/null
+++ b/wearable/wear/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/wearable/wear/SynchronizedNotifications/Application/tests/AndroidManifest.xml b/wearable/wear/SynchronizedNotifications/Application/tests/AndroidManifest.xml
new file mode 100644
index 0000000..559ee23
--- /dev/null
+++ b/wearable/wear/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/wearable/wear/SynchronizedNotifications/Application/tests/src/com/example/android/synchronizednotifications/tests/SampleTests.java b/wearable/wear/SynchronizedNotifications/Application/tests/src/com/example/android/synchronizednotifications/tests/SampleTests.java
new file mode 100644
index 0000000..7f8df42
--- /dev/null
+++ b/wearable/wear/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/wearable/wear/SynchronizedNotifications/README-wear.txt b/wearable/wear/SynchronizedNotifications/README-wear.txt
new file mode 100644
index 0000000..033cde3
--- /dev/null
+++ b/wearable/wear/SynchronizedNotifications/README-wear.txt
@@ -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.
+-->
+
+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/wearable/wear/SynchronizedNotifications/Shared/build.gradle b/wearable/wear/SynchronizedNotifications/Shared/build.gradle
new file mode 100644
index 0000000..ebdb54b
--- /dev/null
+++ b/wearable/wear/SynchronizedNotifications/Shared/build.gradle
@@ -0,0 +1,40 @@
+
+
+
+buildscript {
+ repositories {
+ mavenCentral()
+ }
+
+ dependencies {
+ classpath 'com.android.tools.build:gradle:0.12.+'
+ }
+}
+
+apply plugin: 'android-library'
+
+// 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"
+ }
+ }
+
+ }
+ productFlavors {
+ }
+}
diff --git a/wearable/wear/SynchronizedNotifications/Shared/src/main/AndroidManifest.xml b/wearable/wear/SynchronizedNotifications/Shared/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..7235ace
--- /dev/null
+++ b/wearable/wear/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/wearable/wear/SynchronizedNotifications/Shared/src/main/java/com/example/android/synchronizednotifications/common/Constants.java b/wearable/wear/SynchronizedNotifications/Shared/src/main/java/com/example/android/synchronizednotifications/common/Constants.java
new file mode 100644
index 0000000..5a45583
--- /dev/null
+++ b/wearable/wear/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/wearable/wear/SynchronizedNotifications/Shared/src/main/res/values/strings.xml b/wearable/wear/SynchronizedNotifications/Shared/src/main/res/values/strings.xml
new file mode 100644
index 0000000..4a466aa
--- /dev/null
+++ b/wearable/wear/SynchronizedNotifications/Shared/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+ <string name="app_name">Shared</string>
+</resources>
diff --git a/wearable/wear/SynchronizedNotifications/Wearable/build.gradle b/wearable/wear/SynchronizedNotifications/Wearable/build.gradle
new file mode 100644
index 0000000..476fa4a
--- /dev/null
+++ b/wearable/wear/SynchronizedNotifications/Wearable/build.gradle
@@ -0,0 +1,73 @@
+
+
+
+buildscript {
+ repositories {
+ mavenCentral()
+ }
+
+ dependencies {
+ classpath 'com.android.tools.build:gradle:0.12.+'
+ }
+}
+
+apply plugin: 'com.android.application'
+
+
+dependencies {
+ 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
+// 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 'android-L'
+
+ buildToolsVersion '20'
+
+ buildTypes {
+ release {
+ runProguard false
+ proguardFiles getDefaultProguardFile('proguard-android.txt')
+ }
+ }
+ lintOptions {
+ abortOnError false
+ }
+ sourceSets {
+ main {
+ dirs.each { dir ->
+ java.srcDirs "src/${dir}/java"
+ res.srcDirs "src/${dir}/res"
+ }
+ }
+ androidTest.setRoot('tests')
+ androidTest.java.srcDirs = ['tests/src']
+
+ }
+}
+
+// BEGIN_EXCLUDE
+// Tasks below this line will be hidden from release output
+
+task preflight (dependsOn: parent.preflight) {
+ project.afterEvaluate {
+ // Inject a preflight task into each variant so we have a place to hook tasks
+ // that need to run before any of the android build tasks.
+ //
+ android.applicationVariants.each { variant ->
+ tasks.getByPath("prepare${variant.name.capitalize()}Dependencies").dependsOn preflight
+ }
+ }
+}
+
+// END_EXCLUDE
diff --git a/wearable/wear/SynchronizedNotifications/Wearable/src/main/AndroidManifest.xml b/wearable/wear/SynchronizedNotifications/Wearable/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..97702ce
--- /dev/null
+++ b/wearable/wear/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/wearable/wear/SynchronizedNotifications/Wearable/src/main/java/com/example/android/synchronizednotifications/NotificationUpdateService.java b/wearable/wear/SynchronizedNotifications/Wearable/src/main/java/com/example/android/synchronizednotifications/NotificationUpdateService.java
new file mode 100644
index 0000000..cf8432c
--- /dev/null
+++ b/wearable/wear/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/wearable/wear/SynchronizedNotifications/Wearable/src/main/java/com/example/android/synchronizednotifications/WearableActivity.java b/wearable/wear/SynchronizedNotifications/Wearable/src/main/java/com/example/android/synchronizednotifications/WearableActivity.java
new file mode 100644
index 0000000..28736ad
--- /dev/null
+++ b/wearable/wear/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/wearable/wear/SynchronizedNotifications/Wearable/src/main/res/layout/activity_wearable.xml b/wearable/wear/SynchronizedNotifications/Wearable/src/main/res/layout/activity_wearable.xml
new file mode 100644
index 0000000..71451ff
--- /dev/null
+++ b/wearable/wear/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/wearable/wear/SynchronizedNotifications/Wearable/src/main/res/values/strings.xml b/wearable/wear/SynchronizedNotifications/Wearable/src/main/res/values/strings.xml
new file mode 100644
index 0000000..4240ff5
--- /dev/null
+++ b/wearable/wear/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/wearable/wear/SynchronizedNotifications/Wearable/src/template/res/drawable-hdpi/ic_launcher.png b/wearable/wear/SynchronizedNotifications/Wearable/src/template/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..f7dd9a0
--- /dev/null
+++ b/wearable/wear/SynchronizedNotifications/Wearable/src/template/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/wearable/wear/SynchronizedNotifications/Wearable/src/template/res/drawable-mdpi/ic_launcher.png b/wearable/wear/SynchronizedNotifications/Wearable/src/template/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000..fef2da7
--- /dev/null
+++ b/wearable/wear/SynchronizedNotifications/Wearable/src/template/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/wearable/wear/SynchronizedNotifications/Wearable/src/template/res/drawable-xhdpi/ic_launcher.png b/wearable/wear/SynchronizedNotifications/Wearable/src/template/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..f2fb03c
--- /dev/null
+++ b/wearable/wear/SynchronizedNotifications/Wearable/src/template/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/wearable/wear/SynchronizedNotifications/build.gradle b/wearable/wear/SynchronizedNotifications/build.gradle
new file mode 100644
index 0000000..be1fa82
--- /dev/null
+++ b/wearable/wear/SynchronizedNotifications/build.gradle
@@ -0,0 +1,14 @@
+
+
+
+
+// BEGIN_EXCLUDE
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
+samplegen {
+ pathToBuild "../../../../../build"
+ pathToSamplesCommon "../../../common"
+}
+apply from: "../../../../../build/build.gradle"
+// END_EXCLUDE
diff --git a/wearable/wear/SynchronizedNotifications/buildSrc/build.gradle b/wearable/wear/SynchronizedNotifications/buildSrc/build.gradle
new file mode 100644
index 0000000..e344a8c
--- /dev/null
+++ b/wearable/wear/SynchronizedNotifications/buildSrc/build.gradle
@@ -0,0 +1,18 @@
+
+
+
+repositories {
+ mavenCentral()
+}
+dependencies {
+ compile 'org.freemarker:freemarker:2.3.20'
+}
+
+sourceSets {
+ main {
+ groovy {
+ srcDir new File(rootDir, "../../../../../../build/buildSrc/src/main/groovy")
+ }
+ }
+}
+
diff --git a/wearable/wear/SynchronizedNotifications/gradle/wrapper/gradle-wrapper.jar b/wearable/wear/SynchronizedNotifications/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..8c0fb64
--- /dev/null
+++ b/wearable/wear/SynchronizedNotifications/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/wearable/wear/SynchronizedNotifications/gradle/wrapper/gradle-wrapper.properties b/wearable/wear/SynchronizedNotifications/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..d7f03cf
--- /dev/null
+++ b/wearable/wear/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/wearable/wear/SynchronizedNotifications/gradlew b/wearable/wear/SynchronizedNotifications/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/wearable/wear/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/wearable/wear/SynchronizedNotifications/gradlew.bat b/wearable/wear/SynchronizedNotifications/gradlew.bat
new file mode 100644
index 0000000..8a0b282
--- /dev/null
+++ b/wearable/wear/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/wearable/wear/SynchronizedNotifications/settings.gradle b/wearable/wear/SynchronizedNotifications/settings.gradle
new file mode 100644
index 0000000..fc20be4
--- /dev/null
+++ b/wearable/wear/SynchronizedNotifications/settings.gradle
@@ -0,0 +1,4 @@
+
+
+
+include ':Application', ':Wearable', ':Shared'
diff --git a/wearable/wear/SynchronizedNotifications/template-params.xml b/wearable/wear/SynchronizedNotifications/template-params.xml
new file mode 100644
index 0000000..fda47d8
--- /dev/null
+++ b/wearable/wear/SynchronizedNotifications/template-params.xml
@@ -0,0 +1,46 @@
+<?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.
+-->
+
+
+
+<sample>
+ <name>SynchronizedNotifications</name>
+ <group>Connectivity</group>
+ <package>com.example.android.synchronizednotifications</package>
+
+
+
+ <!-- change minSdk if needed-->
+ <minSdk>20</minSdk>
+
+
+ <strings>
+ <intro>
+ <![CDATA[
+ This sample creates simple or synchronized notifications on a
+ device and an Android Wear watch.
+ ]]>
+ </intro>
+ </strings>
+
+ <template src="base"/>
+ <template src="SimpleView"/>
+ <template src="Wear"/>
+ <common src="logger"/>
+ <common src="activities"/>
+
+</sample>
