Changed project structure so that all subprojects are in the same roo…

…t, otherwise AS chokes
ManuelPeinado · Apr 11, 2014 · a4f289d · a4f289d
1 parent 0adeebc
commit a4f289d
Show file tree

Hide file tree

Showing 166 changed files with 9 additions and 9 deletions.
diff --git a/extras/actionbarcompat/AndroidManifest.xml → extras-actionbarcompat/AndroidManifest.xml b/extras/actionbarcompat/AndroidManifest.xml → extras-actionbarcompat/AndroidManifest.xml
diff --git a/extras/actionbarcompat/build.gradle → extras-actionbarcompat/build.gradle b/extras/actionbarcompat/build.gradle → extras-actionbarcompat/build.gradle
@@ -25,4 +25,4 @@ android {
     }
 }
 
-apply from: '../../maven_push.gradle'
+apply from: '../maven_push.gradle'
diff --git a/extras/actionbarcompat/gradle.properties → extras-actionbarcompat/gradle.properties b/extras/actionbarcompat/gradle.properties → extras-actionbarcompat/gradle.properties
diff --git a/extras/actionbarcompat/proguard-project.txt → extras-actionbarcompat/proguard-project.txt b/extras/actionbarcompat/proguard-project.txt → extras-actionbarcompat/proguard-project.txt
diff --git a/...ctionbarcompat/FadingActionBarHelper.java → ...ctionbarcompat/FadingActionBarHelper.java b/...ctionbarcompat/FadingActionBarHelper.java → ...ctionbarcompat/FadingActionBarHelper.java
diff --git a/extras/actionbarsherlock/AndroidManifest.xml → extras-actionbarsherlock/AndroidManifest.xml b/extras/actionbarsherlock/AndroidManifest.xml → extras-actionbarsherlock/AndroidManifest.xml
diff --git a/extras/actionbarsherlock/build.gradle → extras-actionbarsherlock/build.gradle b/extras/actionbarsherlock/build.gradle → extras-actionbarsherlock/build.gradle
@@ -29,4 +29,4 @@ android {
     }
 }
 
-apply from: '../../maven_push.gradle'
+apply from: '../maven_push.gradle'
diff --git a/extras/actionbarsherlock/gradle.properties → extras-actionbarsherlock/gradle.properties b/extras/actionbarsherlock/gradle.properties → extras-actionbarsherlock/gradle.properties
diff --git a/...as/actionbarsherlock/proguard-project.txt → ...as-actionbarsherlock/proguard-project.txt b/...as/actionbarsherlock/proguard-project.txt → ...as-actionbarsherlock/proguard-project.txt
diff --git a/...ionbarsherlock/FadingActionBarHelper.java → ...ionbarsherlock/FadingActionBarHelper.java b/...ionbarsherlock/FadingActionBarHelper.java → ...ionbarsherlock/FadingActionBarHelper.java
diff --git a/samples/actionbarcompat/AndroidManifest.xml → samples-actionbarcompat/AndroidManifest.xml b/samples/actionbarcompat/AndroidManifest.xml → samples-actionbarcompat/AndroidManifest.xml
diff --git a/samples/actionbarcompat/build.gradle → samples-actionbarcompat/build.gradle b/samples/actionbarcompat/build.gradle → samples-actionbarcompat/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'android'
 
 dependencies {
-    compile project(':extras/actionbarcompat')
+    compile project(':extras-actionbarcompat')
 }
 
 android {

diff --git a/samples/actionbarcompat/ic_launcher-web.png → samples-actionbarcompat/ic_launcher-web.png b/samples/actionbarcompat/ic_launcher-web.png → samples-actionbarcompat/ic_launcher-web.png
diff --git a/samples/actionbarcompat/proguard-project.txt → samples-actionbarcompat/proguard-project.txt b/samples/actionbarcompat/proguard-project.txt → samples-actionbarcompat/proguard-project.txt
diff --git a/...pat/res/drawable-hdpi/drawer_shadow.9.png → ...pat/res/drawable-hdpi/drawer_shadow.9.png b/...pat/res/drawable-hdpi/drawer_shadow.9.png → ...pat/res/drawable-hdpi/drawer_shadow.9.png
diff --git a/...barcompat/res/drawable-hdpi/ic_drawer.png → ...barcompat/res/drawable-hdpi/ic_drawer.png b/...barcompat/res/drawable-hdpi/ic_drawer.png → ...barcompat/res/drawable-hdpi/ic_drawer.png
diff --git a/...rcompat/res/drawable-hdpi/ic_launcher.png → ...rcompat/res/drawable-hdpi/ic_launcher.png b/...rcompat/res/drawable-hdpi/ic_launcher.png → ...rcompat/res/drawable-hdpi/ic_launcher.png
diff --git a/...barcompat/res/drawable-mdpi/ic_drawer.png → ...barcompat/res/drawable-mdpi/ic_drawer.png b/...barcompat/res/drawable-mdpi/ic_drawer.png → ...barcompat/res/drawable-mdpi/ic_drawer.png
diff --git a/...rcompat/res/drawable-mdpi/ic_launcher.png → ...rcompat/res/drawable-mdpi/ic_launcher.png b/...rcompat/res/drawable-mdpi/ic_launcher.png → ...rcompat/res/drawable-mdpi/ic_launcher.png
diff --git a/...at/res/drawable-xhdpi/ab_background.9.png → ...at/res/drawable-xhdpi/ab_background.9.png b/...at/res/drawable-xhdpi/ab_background.9.png → ...at/res/drawable-xhdpi/ab_background.9.png
diff --git a/.../drawable-xhdpi/ab_background_light.9.png → .../drawable-xhdpi/ab_background_light.9.png b/.../drawable-xhdpi/ab_background_light.9.png → .../drawable-xhdpi/ab_background_light.9.png
diff --git a/...at/res/drawable-xhdpi/drawer_shadow.9.png → ...at/res/drawable-xhdpi/drawer_shadow.9.png b/...at/res/drawable-xhdpi/drawer_shadow.9.png → ...at/res/drawable-xhdpi/drawer_shadow.9.png
diff --git a/...arcompat/res/drawable-xhdpi/ic_drawer.png → ...arcompat/res/drawable-xhdpi/ic_drawer.png b/...arcompat/res/drawable-xhdpi/ic_drawer.png → ...arcompat/res/drawable-xhdpi/ic_drawer.png
diff --git a/...compat/res/drawable-xhdpi/ic_launcher.png → ...compat/res/drawable-xhdpi/ic_launcher.png b/...compat/res/drawable-xhdpi/ic_launcher.png → ...compat/res/drawable-xhdpi/ic_launcher.png
diff --git a/...at/res/drawable-xhdpi/ic_location_map.png → ...at/res/drawable-xhdpi/ic_location_map.png b/...at/res/drawable-xhdpi/ic_location_map.png → ...at/res/drawable-xhdpi/ic_location_map.png
diff --git a/...s/drawable-xhdpi/ic_location_map_dark.png → ...s/drawable-xhdpi/ic_location_map_dark.png b/...s/drawable-xhdpi/ic_location_map_dark.png → ...s/drawable-xhdpi/ic_location_map_dark.png
diff --git a/...pat/res/drawable-xhdpi/ic_rating_good.png → ...pat/res/drawable-xhdpi/ic_rating_good.png b/...pat/res/drawable-xhdpi/ic_rating_good.png → ...pat/res/drawable-xhdpi/ic_rating_good.png
diff --git a/...onbarcompat/res/drawable-xhdpi/london.jpg → ...onbarcompat/res/drawable-xhdpi/london.jpg b/...onbarcompat/res/drawable-xhdpi/london.jpg → ...onbarcompat/res/drawable-xhdpi/london.jpg
diff --git a/...actionbarcompat/res/drawable-xhdpi/ny.png → ...actionbarcompat/res/drawable-xhdpi/ny.png b/...actionbarcompat/res/drawable-xhdpi/ny.png → ...actionbarcompat/res/drawable-xhdpi/ny.png
diff --git a/...barcompat/res/drawable-xhdpi/ny_light.jpg → ...barcompat/res/drawable-xhdpi/ny_light.jpg b/...barcompat/res/drawable-xhdpi/ny_light.jpg → ...barcompat/res/drawable-xhdpi/ny_light.jpg
diff --git a/...ionbarcompat/res/drawable-xhdpi/tokyo.jpg → ...ionbarcompat/res/drawable-xhdpi/tokyo.jpg b/...ionbarcompat/res/drawable-xhdpi/tokyo.jpg → ...ionbarcompat/res/drawable-xhdpi/tokyo.jpg
diff --git a/...ompat/res/drawable-xxhdpi/ic_launcher.png → ...ompat/res/drawable-xxhdpi/ic_launcher.png b/...ompat/res/drawable-xxhdpi/ic_launcher.png → ...ompat/res/drawable-xxhdpi/ic_launcher.png
diff --git a/...awable/activated_background_indicator.xml → ...awable/activated_background_indicator.xml b/...awable/activated_background_indicator.xml → ...awable/activated_background_indicator.xml
diff --git a/...arcompat/res/layout/activity_fragment.xml → ...arcompat/res/layout/activity_fragment.xml b/...arcompat/res/layout/activity_fragment.xml → ...arcompat/res/layout/activity_fragment.xml
diff --git a/...ionbarcompat/res/layout/activity_home.xml → ...ionbarcompat/res/layout/activity_home.xml b/...ionbarcompat/res/layout/activity_home.xml → ...ionbarcompat/res/layout/activity_home.xml
diff --git a/...arcompat/res/layout/activity_listview.xml → ...arcompat/res/layout/activity_listview.xml b/...arcompat/res/layout/activity_listview.xml → ...arcompat/res/layout/activity_listview.xml
diff --git a/...res/layout/activity_navigation_drawer.xml → ...res/layout/activity_navigation_drawer.xml b/...res/layout/activity_navigation_drawer.xml → ...res/layout/activity_navigation_drawer.xml
diff --git a/...compat/res/layout/activity_scrollview.xml → ...compat/res/layout/activity_scrollview.xml b/...compat/res/layout/activity_scrollview.xml → ...compat/res/layout/activity_scrollview.xml
diff --git a/...barcompat/res/layout/activity_webview.xml → ...barcompat/res/layout/activity_webview.xml b/...barcompat/res/layout/activity_webview.xml → ...barcompat/res/layout/activity_webview.xml
diff --git a/...barcompat/res/layout/drawer_list_item.xml → ...barcompat/res/layout/drawer_list_item.xml b/...barcompat/res/layout/drawer_list_item.xml → ...barcompat/res/layout/drawer_list_item.xml
diff --git a/...les/actionbarcompat/res/layout/header.xml → ...les-actionbarcompat/res/layout/header.xml b/...les/actionbarcompat/res/layout/header.xml → ...les-actionbarcompat/res/layout/header.xml
diff --git a/...tionbarcompat/res/layout/header_light.xml → ...tionbarcompat/res/layout/header_light.xml b/...tionbarcompat/res/layout/header_light.xml → ...tionbarcompat/res/layout/header_light.xml
diff --git a/...onbarcompat/res/layout/header_overlay.xml → ...onbarcompat/res/layout/header_overlay.xml b/...onbarcompat/res/layout/header_overlay.xml → ...onbarcompat/res/layout/header_overlay.xml
diff --git a/...ctionbarcompat/res/menu/activity_menu.xml → ...ctionbarcompat/res/menu/activity_menu.xml b/...ctionbarcompat/res/menu/activity_menu.xml → ...ctionbarcompat/res/menu/activity_menu.xml
diff --git a/...les/actionbarcompat/res/raw/nyc_sites.txt → ...les-actionbarcompat/res/raw/nyc_sites.txt b/...les/actionbarcompat/res/raw/nyc_sites.txt → ...les-actionbarcompat/res/raw/nyc_sites.txt
diff --git a/...les/actionbarcompat/res/values/arrays.xml → ...les-actionbarcompat/res/values/arrays.xml b/...les/actionbarcompat/res/values/arrays.xml → ...les-actionbarcompat/res/values/arrays.xml
diff --git a/...es/actionbarcompat/res/values/strings.xml → ...es-actionbarcompat/res/values/strings.xml b/...es/actionbarcompat/res/values/strings.xml → ...es-actionbarcompat/res/values/strings.xml
diff --git a/...les/actionbarcompat/res/values/styles.xml → ...les-actionbarcompat/res/values/styles.xml b/...les/actionbarcompat/res/values/styles.xml → ...les-actionbarcompat/res/values/styles.xml
diff --git a/...les/actionbarcompat/res/values/themes.xml → ...les-actionbarcompat/res/values/themes.xml b/...les/actionbarcompat/res/values/themes.xml → ...les-actionbarcompat/res/values/themes.xml
diff --git a/...samples/actionbarcompat/ActivityInfo.java → ...samples/actionbarcompat/ActivityInfo.java b/...samples/actionbarcompat/ActivityInfo.java → ...samples/actionbarcompat/ActivityInfo.java
diff --git a/...ctionbarcompat/HeaderOverlayActivity.java → ...ctionbarcompat/HeaderOverlayActivity.java b/...ctionbarcompat/HeaderOverlayActivity.java → ...ctionbarcompat/HeaderOverlayActivity.java
diff --git a/...samples/actionbarcompat/HomeActivity.java → ...samples/actionbarcompat/HomeActivity.java b/...samples/actionbarcompat/HomeActivity.java → ...samples/actionbarcompat/HomeActivity.java
diff --git a/...tionbarcompat/LightActionBarActivity.java → ...tionbarcompat/LightActionBarActivity.java b/...tionbarcompat/LightActionBarActivity.java → ...tionbarcompat/LightActionBarActivity.java
diff --git a/...ionbarcompat/LightBackgroundActivity.java → ...ionbarcompat/LightBackgroundActivity.java b/...ionbarcompat/LightBackgroundActivity.java → ...ionbarcompat/LightBackgroundActivity.java
diff --git a/...les/actionbarcompat/ListViewActivity.java → ...les/actionbarcompat/ListViewActivity.java b/...les/actionbarcompat/ListViewActivity.java → ...les/actionbarcompat/ListViewActivity.java
diff --git a/...s/actionbarcompat/NoParallaxActivity.java → ...s/actionbarcompat/NoParallaxActivity.java b/...s/actionbarcompat/NoParallaxActivity.java → ...s/actionbarcompat/NoParallaxActivity.java
diff --git a/...mples/actionbarcompat/SampleFragment.java → ...mples/actionbarcompat/SampleFragment.java b/...mples/actionbarcompat/SampleFragment.java → ...mples/actionbarcompat/SampleFragment.java
diff --git a/...tionbarcompat/SampleFragmentActivity.java → ...tionbarcompat/SampleFragmentActivity.java b/...tionbarcompat/SampleFragmentActivity.java → ...tionbarcompat/SampleFragmentActivity.java
diff --git a/...s/actionbarcompat/ScrollViewActivity.java → ...s/actionbarcompat/ScrollViewActivity.java b/...s/actionbarcompat/ScrollViewActivity.java → ...s/actionbarcompat/ScrollViewActivity.java
diff --git a/...ples/actionbarcompat/WebViewActivity.java → ...ples/actionbarcompat/WebViewActivity.java b/...ples/actionbarcompat/WebViewActivity.java → ...ples/actionbarcompat/WebViewActivity.java
diff --git a/...les/actionbarsherlock/AndroidManifest.xml → ...les-actionbarsherlock/AndroidManifest.xml b/...les/actionbarsherlock/AndroidManifest.xml → ...les-actionbarsherlock/AndroidManifest.xml
diff --git a/samples/actionbarsherlock/build.gradle → samples-actionbarsherlock/build.gradle b/samples/actionbarsherlock/build.gradle → samples-actionbarsherlock/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'android'
 
 dependencies {
-    compile project(':extras/actionbarsherlock')
+    compile project(':extras-actionbarsherlock')
 }
 
 android {

diff --git a/...les/actionbarsherlock/ic_launcher-web.png → ...les-actionbarsherlock/ic_launcher-web.png b/...les/actionbarsherlock/ic_launcher-web.png → ...les-actionbarsherlock/ic_launcher-web.png
diff --git a/...es/actionbarsherlock/proguard-project.txt → ...es-actionbarsherlock/proguard-project.txt b/...es/actionbarsherlock/proguard-project.txt → ...es-actionbarsherlock/proguard-project.txt
diff --git a/...ock/res/drawable-hdpi/drawer_shadow.9.png → ...ock/res/drawable-hdpi/drawer_shadow.9.png b/...ock/res/drawable-hdpi/drawer_shadow.9.png → ...ock/res/drawable-hdpi/drawer_shadow.9.png
diff --git a/...rsherlock/res/drawable-hdpi/ic_drawer.png → ...rsherlock/res/drawable-hdpi/ic_drawer.png b/...rsherlock/res/drawable-hdpi/ic_drawer.png → ...rsherlock/res/drawable-hdpi/ic_drawer.png
diff --git a/...herlock/res/drawable-hdpi/ic_launcher.png → ...herlock/res/drawable-hdpi/ic_launcher.png b/...herlock/res/drawable-hdpi/ic_launcher.png → ...herlock/res/drawable-hdpi/ic_launcher.png
diff --git a/...rsherlock/res/drawable-mdpi/ic_drawer.png → ...rsherlock/res/drawable-mdpi/ic_drawer.png b/...rsherlock/res/drawable-mdpi/ic_drawer.png → ...rsherlock/res/drawable-mdpi/ic_drawer.png
diff --git a/...herlock/res/drawable-mdpi/ic_launcher.png → ...herlock/res/drawable-mdpi/ic_launcher.png b/...herlock/res/drawable-mdpi/ic_launcher.png → ...herlock/res/drawable-mdpi/ic_launcher.png
diff --git a/...ck/res/drawable-xhdpi/ab_background.9.png → ...ck/res/drawable-xhdpi/ab_background.9.png b/...ck/res/drawable-xhdpi/ab_background.9.png → ...ck/res/drawable-xhdpi/ab_background.9.png
diff --git a/.../drawable-xhdpi/ab_background_light.9.png → .../drawable-xhdpi/ab_background_light.9.png b/.../drawable-xhdpi/ab_background_light.9.png → .../drawable-xhdpi/ab_background_light.9.png
diff --git a/...ck/res/drawable-xhdpi/drawer_shadow.9.png → ...ck/res/drawable-xhdpi/drawer_shadow.9.png b/...ck/res/drawable-xhdpi/drawer_shadow.9.png → ...ck/res/drawable-xhdpi/drawer_shadow.9.png
diff --git a/...sherlock/res/drawable-xhdpi/ic_drawer.png → ...sherlock/res/drawable-xhdpi/ic_drawer.png b/...sherlock/res/drawable-xhdpi/ic_drawer.png → ...sherlock/res/drawable-xhdpi/ic_drawer.png
diff --git a/...erlock/res/drawable-xhdpi/ic_launcher.png → ...erlock/res/drawable-xhdpi/ic_launcher.png b/...erlock/res/drawable-xhdpi/ic_launcher.png → ...erlock/res/drawable-xhdpi/ic_launcher.png
diff --git a/...ck/res/drawable-xhdpi/ic_location_map.png → ...ck/res/drawable-xhdpi/ic_location_map.png b/...ck/res/drawable-xhdpi/ic_location_map.png → ...ck/res/drawable-xhdpi/ic_location_map.png
diff --git a/...s/drawable-xhdpi/ic_location_map_dark.png → ...s/drawable-xhdpi/ic_location_map_dark.png b/...s/drawable-xhdpi/ic_location_map_dark.png → ...s/drawable-xhdpi/ic_location_map_dark.png
diff --git a/...ock/res/drawable-xhdpi/ic_rating_good.png → ...ock/res/drawable-xhdpi/ic_rating_good.png b/...ock/res/drawable-xhdpi/ic_rating_good.png → ...ock/res/drawable-xhdpi/ic_rating_good.png
diff --git a/...barsherlock/res/drawable-xhdpi/london.jpg → ...barsherlock/res/drawable-xhdpi/london.jpg b/...barsherlock/res/drawable-xhdpi/london.jpg → ...barsherlock/res/drawable-xhdpi/london.jpg
diff --git a/...tionbarsherlock/res/drawable-xhdpi/ny.png → ...tionbarsherlock/res/drawable-xhdpi/ny.png b/...tionbarsherlock/res/drawable-xhdpi/ny.png → ...tionbarsherlock/res/drawable-xhdpi/ny.png
diff --git a/...rsherlock/res/drawable-xhdpi/ny_light.jpg → ...rsherlock/res/drawable-xhdpi/ny_light.jpg b/...rsherlock/res/drawable-xhdpi/ny_light.jpg → ...rsherlock/res/drawable-xhdpi/ny_light.jpg
diff --git a/...nbarsherlock/res/drawable-xhdpi/tokyo.jpg → ...nbarsherlock/res/drawable-xhdpi/tokyo.jpg b/...nbarsherlock/res/drawable-xhdpi/tokyo.jpg → ...nbarsherlock/res/drawable-xhdpi/tokyo.jpg
diff --git a/...rlock/res/drawable-xxhdpi/ic_launcher.png → ...rlock/res/drawable-xxhdpi/ic_launcher.png b/...rlock/res/drawable-xxhdpi/ic_launcher.png → ...rlock/res/drawable-xxhdpi/ic_launcher.png
diff --git a/...awable/activated_background_indicator.xml → ...awable/activated_background_indicator.xml b/...awable/activated_background_indicator.xml → ...awable/activated_background_indicator.xml
diff --git a/...sherlock/res/layout/activity_fragment.xml → ...sherlock/res/layout/activity_fragment.xml b/...sherlock/res/layout/activity_fragment.xml → ...sherlock/res/layout/activity_fragment.xml
diff --git a/...nbarsherlock/res/layout/activity_home.xml → ...nbarsherlock/res/layout/activity_home.xml b/...nbarsherlock/res/layout/activity_home.xml → ...nbarsherlock/res/layout/activity_home.xml
diff --git a/...sherlock/res/layout/activity_listview.xml → ...sherlock/res/layout/activity_listview.xml b/...sherlock/res/layout/activity_listview.xml → ...sherlock/res/layout/activity_listview.xml
diff --git a/...res/layout/activity_navigation_drawer.xml → ...res/layout/activity_navigation_drawer.xml b/...res/layout/activity_navigation_drawer.xml → ...res/layout/activity_navigation_drawer.xml
diff --git a/...erlock/res/layout/activity_scrollview.xml → ...erlock/res/layout/activity_scrollview.xml b/...erlock/res/layout/activity_scrollview.xml → ...erlock/res/layout/activity_scrollview.xml
diff --git a/...rsherlock/res/layout/activity_webview.xml → ...rsherlock/res/layout/activity_webview.xml b/...rsherlock/res/layout/activity_webview.xml → ...rsherlock/res/layout/activity_webview.xml
diff --git a/...rsherlock/res/layout/drawer_list_item.xml → ...rsherlock/res/layout/drawer_list_item.xml b/...rsherlock/res/layout/drawer_list_item.xml → ...rsherlock/res/layout/drawer_list_item.xml
diff --git a/...s/actionbarsherlock/res/layout/header.xml → ...s-actionbarsherlock/res/layout/header.xml b/...s/actionbarsherlock/res/layout/header.xml → ...s-actionbarsherlock/res/layout/header.xml
diff --git a/...onbarsherlock/res/layout/header_light.xml → ...onbarsherlock/res/layout/header_light.xml b/...onbarsherlock/res/layout/header_light.xml → ...onbarsherlock/res/layout/header_light.xml
diff --git a/...barsherlock/res/layout/header_overlay.xml → ...barsherlock/res/layout/header_overlay.xml b/...barsherlock/res/layout/header_overlay.xml → ...barsherlock/res/layout/header_overlay.xml
diff --git a/...ionbarsherlock/res/menu/activity_menu.xml → ...ionbarsherlock/res/menu/activity_menu.xml b/...ionbarsherlock/res/menu/activity_menu.xml → ...ionbarsherlock/res/menu/activity_menu.xml
diff --git a/...s/actionbarsherlock/res/raw/nyc_sites.txt → ...s-actionbarsherlock/res/raw/nyc_sites.txt b/...s/actionbarsherlock/res/raw/nyc_sites.txt → ...s-actionbarsherlock/res/raw/nyc_sites.txt
diff --git a/...s/actionbarsherlock/res/values/arrays.xml → ...s-actionbarsherlock/res/values/arrays.xml b/...s/actionbarsherlock/res/values/arrays.xml → ...s-actionbarsherlock/res/values/arrays.xml
diff --git a/.../actionbarsherlock/res/values/strings.xml → ...-actionbarsherlock/res/values/strings.xml b/.../actionbarsherlock/res/values/strings.xml → ...-actionbarsherlock/res/values/strings.xml
diff --git a/...s/actionbarsherlock/res/values/styles.xml → ...s-actionbarsherlock/res/values/styles.xml b/...s/actionbarsherlock/res/values/styles.xml → ...s-actionbarsherlock/res/values/styles.xml
diff --git a/...s/actionbarsherlock/res/values/themes.xml → ...s-actionbarsherlock/res/values/themes.xml b/...s/actionbarsherlock/res/values/themes.xml → ...s-actionbarsherlock/res/values/themes.xml
diff --git a/...mples/actionbarsherlock/ActivityInfo.java → ...mples/actionbarsherlock/ActivityInfo.java b/...mples/actionbarsherlock/ActivityInfo.java → ...mples/actionbarsherlock/ActivityInfo.java
diff --git a/...ionbarsherlock/HeaderOverlayActivity.java → ...ionbarsherlock/HeaderOverlayActivity.java b/...ionbarsherlock/HeaderOverlayActivity.java → ...ionbarsherlock/HeaderOverlayActivity.java
diff --git a/...mples/actionbarsherlock/HomeActivity.java → ...mples/actionbarsherlock/HomeActivity.java b/...mples/actionbarsherlock/HomeActivity.java → ...mples/actionbarsherlock/HomeActivity.java
diff --git a/...onbarsherlock/LightActionBarActivity.java → ...onbarsherlock/LightActionBarActivity.java b/...onbarsherlock/LightActionBarActivity.java → ...onbarsherlock/LightActionBarActivity.java
diff --git a/...nbarsherlock/LightBackgroundActivity.java → ...nbarsherlock/LightBackgroundActivity.java b/...nbarsherlock/LightBackgroundActivity.java → ...nbarsherlock/LightBackgroundActivity.java
diff --git a/...s/actionbarsherlock/ListViewActivity.java → ...s/actionbarsherlock/ListViewActivity.java b/...s/actionbarsherlock/ListViewActivity.java → ...s/actionbarsherlock/ListViewActivity.java
diff --git a/...actionbarsherlock/NoParallaxActivity.java → ...actionbarsherlock/NoParallaxActivity.java b/...actionbarsherlock/NoParallaxActivity.java → ...actionbarsherlock/NoParallaxActivity.java
diff --git a/...les/actionbarsherlock/SampleFragment.java → ...les/actionbarsherlock/SampleFragment.java b/...les/actionbarsherlock/SampleFragment.java → ...les/actionbarsherlock/SampleFragment.java
diff --git a/...onbarsherlock/SampleFragmentActivity.java → ...onbarsherlock/SampleFragmentActivity.java b/...onbarsherlock/SampleFragmentActivity.java → ...onbarsherlock/SampleFragmentActivity.java
diff --git a/...actionbarsherlock/ScrollViewActivity.java → ...actionbarsherlock/ScrollViewActivity.java b/...actionbarsherlock/ScrollViewActivity.java → ...actionbarsherlock/ScrollViewActivity.java
diff --git a/...es/actionbarsherlock/WebViewActivity.java → ...es/actionbarsherlock/WebViewActivity.java b/...es/actionbarsherlock/WebViewActivity.java → ...es/actionbarsherlock/WebViewActivity.java
diff --git a/samples/stock/AndroidManifest.xml → samples-stock/AndroidManifest.xml b/samples/stock/AndroidManifest.xml → samples-stock/AndroidManifest.xml
diff --git a/samples/stock/build.gradle → samples-stock/build.gradle b/samples/stock/build.gradle → samples-stock/build.gradle
diff --git a/samples/stock/ic_launcher-web.png → samples-stock/ic_launcher-web.png b/samples/stock/ic_launcher-web.png → samples-stock/ic_launcher-web.png
diff --git a/samples/stock/libs/android-support-v4.jar → samples-stock/libs/android-support-v4.jar b/samples/stock/libs/android-support-v4.jar → samples-stock/libs/android-support-v4.jar
diff --git a/samples/stock/proguard-project.txt → samples-stock/proguard-project.txt b/samples/stock/proguard-project.txt → samples-stock/proguard-project.txt
diff --git a/...ock/res/drawable-hdpi/drawer_shadow.9.png → ...ock/res/drawable-hdpi/drawer_shadow.9.png b/...ock/res/drawable-hdpi/drawer_shadow.9.png → ...ock/res/drawable-hdpi/drawer_shadow.9.png
diff --git a/...les/stock/res/drawable-hdpi/ic_drawer.png → ...les-stock/res/drawable-hdpi/ic_drawer.png b/...les/stock/res/drawable-hdpi/ic_drawer.png → ...les-stock/res/drawable-hdpi/ic_drawer.png
diff --git a/...s/stock/res/drawable-hdpi/ic_launcher.png → ...s-stock/res/drawable-hdpi/ic_launcher.png b/...s/stock/res/drawable-hdpi/ic_launcher.png → ...s-stock/res/drawable-hdpi/ic_launcher.png
diff --git a/...les/stock/res/drawable-mdpi/ic_drawer.png → ...les-stock/res/drawable-mdpi/ic_drawer.png b/...les/stock/res/drawable-mdpi/ic_drawer.png → ...les-stock/res/drawable-mdpi/ic_drawer.png
diff --git a/...s/stock/res/drawable-mdpi/ic_launcher.png → ...s-stock/res/drawable-mdpi/ic_launcher.png b/...s/stock/res/drawable-mdpi/ic_launcher.png → ...s-stock/res/drawable-mdpi/ic_launcher.png
diff --git a/...ck/res/drawable-xhdpi/ab_background.9.png → ...ck/res/drawable-xhdpi/ab_background.9.png b/...ck/res/drawable-xhdpi/ab_background.9.png → ...ck/res/drawable-xhdpi/ab_background.9.png
diff --git a/.../drawable-xhdpi/ab_background_light.9.png → .../drawable-xhdpi/ab_background_light.9.png b/.../drawable-xhdpi/ab_background_light.9.png → .../drawable-xhdpi/ab_background_light.9.png
diff --git a/...ck/res/drawable-xhdpi/drawer_shadow.9.png → ...ck/res/drawable-xhdpi/drawer_shadow.9.png b/...ck/res/drawable-xhdpi/drawer_shadow.9.png → ...ck/res/drawable-xhdpi/drawer_shadow.9.png
diff --git a/...es/stock/res/drawable-xhdpi/ic_drawer.png → ...es-stock/res/drawable-xhdpi/ic_drawer.png b/...es/stock/res/drawable-xhdpi/ic_drawer.png → ...es-stock/res/drawable-xhdpi/ic_drawer.png
diff --git a/.../stock/res/drawable-xhdpi/ic_launcher.png → ...-stock/res/drawable-xhdpi/ic_launcher.png b/.../stock/res/drawable-xhdpi/ic_launcher.png → ...-stock/res/drawable-xhdpi/ic_launcher.png
diff --git a/...ck/res/drawable-xhdpi/ic_location_map.png → ...ck/res/drawable-xhdpi/ic_location_map.png b/...ck/res/drawable-xhdpi/ic_location_map.png → ...ck/res/drawable-xhdpi/ic_location_map.png
diff --git a/...s/drawable-xhdpi/ic_location_map_dark.png → ...s/drawable-xhdpi/ic_location_map_dark.png b/...s/drawable-xhdpi/ic_location_map_dark.png → ...s/drawable-xhdpi/ic_location_map_dark.png
diff --git a/...ock/res/drawable-xhdpi/ic_rating_good.png → ...ock/res/drawable-xhdpi/ic_rating_good.png b/...ock/res/drawable-xhdpi/ic_rating_good.png → ...ock/res/drawable-xhdpi/ic_rating_good.png
diff --git a/samples/stock/res/drawable-xhdpi/london.jpg → samples-stock/res/drawable-xhdpi/london.jpg b/samples/stock/res/drawable-xhdpi/london.jpg → samples-stock/res/drawable-xhdpi/london.jpg
diff --git a/samples/stock/res/drawable-xhdpi/ny.png → samples-stock/res/drawable-xhdpi/ny.png b/samples/stock/res/drawable-xhdpi/ny.png → samples-stock/res/drawable-xhdpi/ny.png
diff --git a/...les/stock/res/drawable-xhdpi/ny_light.jpg → ...les-stock/res/drawable-xhdpi/ny_light.jpg b/...les/stock/res/drawable-xhdpi/ny_light.jpg → ...les-stock/res/drawable-xhdpi/ny_light.jpg
diff --git a/samples/stock/res/drawable-xhdpi/tokyo.jpg → samples-stock/res/drawable-xhdpi/tokyo.jpg b/samples/stock/res/drawable-xhdpi/tokyo.jpg → samples-stock/res/drawable-xhdpi/tokyo.jpg
diff --git a/...stock/res/drawable-xxhdpi/ic_launcher.png → ...stock/res/drawable-xxhdpi/ic_launcher.png b/...stock/res/drawable-xxhdpi/ic_launcher.png → ...stock/res/drawable-xxhdpi/ic_launcher.png
diff --git a/...awable/activated_background_indicator.xml → ...awable/activated_background_indicator.xml b/...awable/activated_background_indicator.xml → ...awable/activated_background_indicator.xml
diff --git a/...es/stock/res/layout/activity_fragment.xml → ...es-stock/res/layout/activity_fragment.xml b/...es/stock/res/layout/activity_fragment.xml → ...es-stock/res/layout/activity_fragment.xml
diff --git a/samples/stock/res/layout/activity_home.xml → samples-stock/res/layout/activity_home.xml b/samples/stock/res/layout/activity_home.xml → samples-stock/res/layout/activity_home.xml
diff --git a/...es/stock/res/layout/activity_listview.xml → ...es-stock/res/layout/activity_listview.xml b/...es/stock/res/layout/activity_listview.xml → ...es-stock/res/layout/activity_listview.xml
diff --git a/...res/layout/activity_navigation_drawer.xml → ...res/layout/activity_navigation_drawer.xml b/...res/layout/activity_navigation_drawer.xml → ...res/layout/activity_navigation_drawer.xml
diff --git a/.../stock/res/layout/activity_scrollview.xml → ...-stock/res/layout/activity_scrollview.xml b/.../stock/res/layout/activity_scrollview.xml → ...-stock/res/layout/activity_scrollview.xml
diff --git a/...ock/res/layout/activity_short_content.xml → ...ock/res/layout/activity_short_content.xml b/...ock/res/layout/activity_short_content.xml → ...ock/res/layout/activity_short_content.xml
diff --git a/...les/stock/res/layout/activity_webview.xml → ...les-stock/res/layout/activity_webview.xml b/...les/stock/res/layout/activity_webview.xml → ...les-stock/res/layout/activity_webview.xml
diff --git a/...les/stock/res/layout/drawer_list_item.xml → ...les-stock/res/layout/drawer_list_item.xml b/...les/stock/res/layout/drawer_list_item.xml → ...les-stock/res/layout/drawer_list_item.xml
diff --git a/samples/stock/res/layout/header.xml → samples-stock/res/layout/header.xml b/samples/stock/res/layout/header.xml → samples-stock/res/layout/header.xml
diff --git a/samples/stock/res/layout/header_light.xml → samples-stock/res/layout/header_light.xml b/samples/stock/res/layout/header_light.xml → samples-stock/res/layout/header_light.xml
diff --git a/samples/stock/res/layout/header_overlay.xml → samples-stock/res/layout/header_overlay.xml b/samples/stock/res/layout/header_overlay.xml → samples-stock/res/layout/header_overlay.xml
diff --git a/samples/stock/res/menu/activity_menu.xml → samples-stock/res/menu/activity_menu.xml b/samples/stock/res/menu/activity_menu.xml → samples-stock/res/menu/activity_menu.xml
diff --git a/...stock/res/menu/listview_activity_menu.xml → ...stock/res/menu/listview_activity_menu.xml b/...stock/res/menu/listview_activity_menu.xml → ...stock/res/menu/listview_activity_menu.xml
diff --git a/samples/stock/res/raw/nyc_sites.txt → samples-stock/res/raw/nyc_sites.txt b/samples/stock/res/raw/nyc_sites.txt → samples-stock/res/raw/nyc_sites.txt
diff --git a/samples/stock/res/values/arrays.xml → samples-stock/res/values/arrays.xml b/samples/stock/res/values/arrays.xml → samples-stock/res/values/arrays.xml
diff --git a/samples/stock/res/values/strings.xml → samples-stock/res/values/strings.xml b/samples/stock/res/values/strings.xml → samples-stock/res/values/strings.xml
diff --git a/samples/stock/res/values/styles.xml → samples-stock/res/values/styles.xml b/samples/stock/res/values/styles.xml → samples-stock/res/values/styles.xml
diff --git a/samples/stock/res/values/themes.xml → samples-stock/res/values/themes.xml b/samples/stock/res/values/themes.xml → samples-stock/res/values/themes.xml
diff --git a/...do/fadingactionbar/demo/ActivityInfo.java → ...do/fadingactionbar/demo/ActivityInfo.java b/...do/fadingactionbar/demo/ActivityInfo.java → ...do/fadingactionbar/demo/ActivityInfo.java
diff --git a/...actionbar/demo/HeaderOverlayActivity.java → ...actionbar/demo/HeaderOverlayActivity.java b/...actionbar/demo/HeaderOverlayActivity.java → ...actionbar/demo/HeaderOverlayActivity.java
diff --git a/...do/fadingactionbar/demo/HomeActivity.java → ...do/fadingactionbar/demo/HomeActivity.java b/...do/fadingactionbar/demo/HomeActivity.java → ...do/fadingactionbar/demo/HomeActivity.java
diff --git a/...ctionbar/demo/LightActionBarActivity.java → ...ctionbar/demo/LightActionBarActivity.java b/...ctionbar/demo/LightActionBarActivity.java → ...ctionbar/demo/LightActionBarActivity.java
diff --git a/...tionbar/demo/LightBackgroundActivity.java → ...tionbar/demo/LightBackgroundActivity.java b/...tionbar/demo/LightBackgroundActivity.java → ...tionbar/demo/LightBackgroundActivity.java
diff --git a/...adingactionbar/demo/ListViewActivity.java → ...adingactionbar/demo/ListViewActivity.java b/...adingactionbar/demo/ListViewActivity.java → ...adingactionbar/demo/ListViewActivity.java
diff --git a/...ionbar/demo/NavigationDrawerActivity.java → ...ionbar/demo/NavigationDrawerActivity.java b/...ionbar/demo/NavigationDrawerActivity.java → ...ionbar/demo/NavigationDrawerActivity.java
diff --git a/...ingactionbar/demo/NoParallaxActivity.java → ...ingactionbar/demo/NoParallaxActivity.java b/...ingactionbar/demo/NoParallaxActivity.java → ...ingactionbar/demo/NoParallaxActivity.java
diff --git a/.../fadingactionbar/demo/SampleFragment.java → .../fadingactionbar/demo/SampleFragment.java b/.../fadingactionbar/demo/SampleFragment.java → .../fadingactionbar/demo/SampleFragment.java
diff --git a/...ctionbar/demo/SampleFragmentActivity.java → ...ctionbar/demo/SampleFragmentActivity.java b/...ctionbar/demo/SampleFragmentActivity.java → ...ctionbar/demo/SampleFragmentActivity.java
diff --git a/...ingactionbar/demo/ScrollViewActivity.java → ...ingactionbar/demo/ScrollViewActivity.java b/...ingactionbar/demo/ScrollViewActivity.java → ...ingactionbar/demo/ScrollViewActivity.java
diff --git a/...gactionbar/demo/ShortContentActivity.java → ...gactionbar/demo/ShortContentActivity.java b/...gactionbar/demo/ShortContentActivity.java → ...gactionbar/demo/ShortContentActivity.java
diff --git a/...fadingactionbar/demo/WebViewActivity.java → ...fadingactionbar/demo/WebViewActivity.java b/...fadingactionbar/demo/WebViewActivity.java → ...fadingactionbar/demo/WebViewActivity.java
diff --git a/settings.gradle b/settings.gradle
@@ -1,8 +1,8 @@
 include ':library'
-include ':samples/stock'
+include ':samples-stock'
 
-include 'extras/actionbarsherlock'
-include ':samples/actionbarsherlock'
+include 'extras-actionbarsherlock'
+include ':samples-actionbarsherlock'
 
-include 'extras/actionbarcompat'
-include ':samples/actionbarcompat'
+include 'extras-actionbarcompat'
+include ':samples-actionbarcompat'