Google Git
Sign in
android / platform / developers / samples / android / c813ce8^! / .
commitc813ce876c4262e87bf909464d395cedc9f1789b[log] [tgz]
authorTrevor Johns <trevorjohns@google.com>Tue Jul 23 13:25:38 2013 -0700
committerTrevor Johns <trevorjohns@google.com>Tue Jul 23 13:25:38 2013 -0700
tree52959d0bd8b09877b45a407c3e42e90225d52226
parent777c654302ce44b5450c3a82647b672299ce8530 [diff]
Move BasicNetworkDemo/NetworkConnect to 2-level structure

Adding sub-project for BasicNetworkDemo and NetworkConnect
builds for consistency with other projects.

Change-Id: Ic4db1948494c91020534b6223b85d26b153c2d22

diff --git a/connectivity/BasicNetworkDemo/BasicNetworkDemo/build.gradle b/connectivity/BasicNetworkDemo/BasicNetworkDemo/build.gradle
new file mode 100644
index 0000000..e3b2dce
--- /dev/null
+++ b/connectivity/BasicNetworkDemo/BasicNetworkDemo/build.gradle

@@ -0,0 +1,18 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.5.+'
+    }
+}
+apply plugin: 'android'
+
+dependencies {
+    compile "com.android.support:support-v4:18.0.+"
+}
+
+android {
+    compileSdkVersion 17
+    buildToolsVersion "17.0.0"
+}

diff --git a/connectivity/BasicNetworkDemo/src/main/AndroidManifest.xml b/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/AndroidManifest.xml
similarity index 100%
rename from connectivity/BasicNetworkDemo/src/main/AndroidManifest.xml
rename to connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/AndroidManifest.xml

diff --git a/connectivity/BasicNetworkDemo/src/main/java/com/example/android/common/SimpleTextFragment.java b/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/SimpleTextFragment.java
similarity index 100%
rename from connectivity/BasicNetworkDemo/src/main/java/com/example/android/common/SimpleTextFragment.java
rename to connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/SimpleTextFragment.java

diff --git a/connectivity/BasicNetworkDemo/src/main/java/com/example/android/common/logger/Log.java b/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from connectivity/BasicNetworkDemo/src/main/java/com/example/android/common/logger/Log.java
rename to connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/Log.java

diff --git a/connectivity/BasicNetworkDemo/src/main/java/com/example/android/common/logger/LogNode.java b/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from connectivity/BasicNetworkDemo/src/main/java/com/example/android/common/logger/LogNode.java
rename to connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/connectivity/BasicNetworkDemo/src/main/java/com/example/android/common/logger/LogView.java b/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from connectivity/BasicNetworkDemo/src/main/java/com/example/android/common/logger/LogView.java
rename to connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/connectivity/BasicNetworkDemo/src/main/java/com/example/android/common/logger/LogWrapper.java b/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from connectivity/BasicNetworkDemo/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/connectivity/BasicNetworkDemo/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from connectivity/BasicNetworkDemo/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/connectivity/BasicNetworkDemo/src/main/java/com/example/android/networkbasic/LogFragment.java b/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/networkbasic/LogFragment.java
similarity index 100%
rename from connectivity/BasicNetworkDemo/src/main/java/com/example/android/networkbasic/LogFragment.java
rename to connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/networkbasic/LogFragment.java

diff --git a/connectivity/BasicNetworkDemo/src/main/java/com/example/android/networkbasic/MainActivity.java b/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/networkbasic/MainActivity.java
similarity index 100%
rename from connectivity/BasicNetworkDemo/src/main/java/com/example/android/networkbasic/MainActivity.java
rename to connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/networkbasic/MainActivity.java

diff --git a/connectivity/BasicNetworkDemo/src/main/res/drawable-hdpi/ic_launcher.png b/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from connectivity/BasicNetworkDemo/src/main/res/drawable-hdpi/ic_launcher.png
rename to connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/connectivity/BasicNetworkDemo/src/main/res/drawable-mdpi/ic_launcher.png b/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from connectivity/BasicNetworkDemo/src/main/res/drawable-mdpi/ic_launcher.png
rename to connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/connectivity/BasicNetworkDemo/src/main/res/drawable-xhdpi/ic_launcher.png b/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from connectivity/BasicNetworkDemo/src/main/res/drawable-xhdpi/ic_launcher.png
rename to connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/connectivity/BasicNetworkDemo/src/main/res/drawable-xxhdpi/ic_launcher.png b/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from connectivity/BasicNetworkDemo/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/connectivity/BasicNetworkDemo/src/main/res/layout/activity_main.xml b/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/layout/activity_main.xml
similarity index 100%
rename from connectivity/BasicNetworkDemo/src/main/res/layout/activity_main.xml
rename to connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/layout/activity_main.xml

diff --git a/connectivity/BasicNetworkDemo/src/main/res/layout/log_fragment.xml b/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/layout/log_fragment.xml
similarity index 100%
rename from connectivity/BasicNetworkDemo/src/main/res/layout/log_fragment.xml
rename to connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/layout/log_fragment.xml

diff --git a/connectivity/BasicNetworkDemo/src/main/res/menu/main.xml b/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/menu/main.xml
similarity index 100%
rename from connectivity/BasicNetworkDemo/src/main/res/menu/main.xml
rename to connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/menu/main.xml

diff --git a/connectivity/BasicNetworkDemo/src/main/res/values-sw600dp/styles.xml b/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values-sw600dp/styles.xml
similarity index 100%
rename from connectivity/BasicNetworkDemo/src/main/res/values-sw600dp/styles.xml
rename to connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values-sw600dp/styles.xml

diff --git a/connectivity/BasicNetworkDemo/src/main/res/values-v11/styles.xml b/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values-v11/styles.xml
similarity index 100%
rename from connectivity/BasicNetworkDemo/src/main/res/values-v11/styles.xml
rename to connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values-v11/styles.xml

diff --git a/connectivity/BasicNetworkDemo/src/main/res/values/dimens.xml b/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values/dimens.xml
similarity index 100%
rename from connectivity/BasicNetworkDemo/src/main/res/values/dimens.xml
rename to connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values/dimens.xml

diff --git a/connectivity/BasicNetworkDemo/src/main/res/values/strings.xml b/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values/strings.xml
similarity index 100%
rename from connectivity/BasicNetworkDemo/src/main/res/values/strings.xml
rename to connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values/strings.xml

diff --git a/connectivity/BasicNetworkDemo/src/main/res/values/styles.xml b/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values/styles.xml
similarity index 100%
rename from connectivity/BasicNetworkDemo/src/main/res/values/styles.xml
rename to connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values/styles.xml

diff --git a/connectivity/BasicNetworkDemo/build.gradle b/connectivity/BasicNetworkDemo/build.gradle
index e3b2dce..495c503 100644
--- a/connectivity/BasicNetworkDemo/build.gradle
+++ b/connectivity/BasicNetworkDemo/build.gradle

@@ -1,18 +1 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.+'
-    }
-}
-apply plugin: 'android'
-
-dependencies {
-    compile "com.android.support:support-v4:18.0.+"
-}
-
-android {
-    compileSdkVersion 17
-    buildToolsVersion "17.0.0"
-}
+// Top-level build file where you can add configuration options common to all sub-projects/modules.

diff --git a/connectivity/BasicNetworkDemo/settings.gradle b/connectivity/BasicNetworkDemo/settings.gradle
new file mode 100644
index 0000000..4981654
--- /dev/null
+++ b/connectivity/BasicNetworkDemo/settings.gradle

@@ -0,0 +1 @@
+include ':BasicNetworkDemo'

diff --git a/connectivity/NetworkConnect/NetworkConnect/build.gradle b/connectivity/NetworkConnect/NetworkConnect/build.gradle
new file mode 100644
index 0000000..e3b2dce
--- /dev/null
+++ b/connectivity/NetworkConnect/NetworkConnect/build.gradle

@@ -0,0 +1,18 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.5.+'
+    }
+}
+apply plugin: 'android'
+
+dependencies {
+    compile "com.android.support:support-v4:18.0.+"
+}
+
+android {
+    compileSdkVersion 17
+    buildToolsVersion "17.0.0"
+}

diff --git a/connectivity/NetworkConnect/src/main/AndroidManifest.xml b/connectivity/NetworkConnect/NetworkConnect/src/main/AndroidManifest.xml
similarity index 100%
rename from connectivity/NetworkConnect/src/main/AndroidManifest.xml
rename to connectivity/NetworkConnect/NetworkConnect/src/main/AndroidManifest.xml

diff --git a/connectivity/NetworkConnect/src/main/java/com/example/android/common/SimpleTextFragment.java b/connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/SimpleTextFragment.java
similarity index 100%
rename from connectivity/NetworkConnect/src/main/java/com/example/android/common/SimpleTextFragment.java
rename to connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/SimpleTextFragment.java

diff --git a/connectivity/NetworkConnect/src/main/java/com/example/android/common/logger/Log.java b/connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from connectivity/NetworkConnect/src/main/java/com/example/android/common/logger/Log.java
rename to connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/Log.java

diff --git a/connectivity/NetworkConnect/src/main/java/com/example/android/common/logger/LogNode.java b/connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from connectivity/NetworkConnect/src/main/java/com/example/android/common/logger/LogNode.java
rename to connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/connectivity/NetworkConnect/src/main/java/com/example/android/common/logger/LogView.java b/connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from connectivity/NetworkConnect/src/main/java/com/example/android/common/logger/LogView.java
rename to connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/connectivity/NetworkConnect/src/main/java/com/example/android/common/logger/LogWrapper.java b/connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from connectivity/NetworkConnect/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/connectivity/NetworkConnect/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from connectivity/NetworkConnect/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/connectivity/NetworkConnect/src/main/java/com/example/android/networkconnect/LogFragment.java b/connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/networkconnect/LogFragment.java
similarity index 100%
rename from connectivity/NetworkConnect/src/main/java/com/example/android/networkconnect/LogFragment.java
rename to connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/networkconnect/LogFragment.java

diff --git a/connectivity/NetworkConnect/src/main/java/com/example/android/networkconnect/MainActivity.java b/connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/networkconnect/MainActivity.java
similarity index 100%
rename from connectivity/NetworkConnect/src/main/java/com/example/android/networkconnect/MainActivity.java
rename to connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/networkconnect/MainActivity.java

diff --git a/connectivity/NetworkConnect/src/main/res/drawable-hdpi/ic_launcher.png b/connectivity/NetworkConnect/NetworkConnect/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from connectivity/NetworkConnect/src/main/res/drawable-hdpi/ic_launcher.png
rename to connectivity/NetworkConnect/NetworkConnect/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/connectivity/NetworkConnect/src/main/res/drawable-mdpi/ic_launcher.png b/connectivity/NetworkConnect/NetworkConnect/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from connectivity/NetworkConnect/src/main/res/drawable-mdpi/ic_launcher.png
rename to connectivity/NetworkConnect/NetworkConnect/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/connectivity/NetworkConnect/src/main/res/drawable-xhdpi/ic_launcher.png b/connectivity/NetworkConnect/NetworkConnect/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from connectivity/NetworkConnect/src/main/res/drawable-xhdpi/ic_launcher.png
rename to connectivity/NetworkConnect/NetworkConnect/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/connectivity/NetworkConnect/src/main/res/drawable-xxhdpi/ic_launcher.png b/connectivity/NetworkConnect/NetworkConnect/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from connectivity/NetworkConnect/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to connectivity/NetworkConnect/NetworkConnect/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/connectivity/NetworkConnect/src/main/res/layout/activity_main.xml b/connectivity/NetworkConnect/NetworkConnect/src/main/res/layout/activity_main.xml
similarity index 100%
rename from connectivity/NetworkConnect/src/main/res/layout/activity_main.xml
rename to connectivity/NetworkConnect/NetworkConnect/src/main/res/layout/activity_main.xml

diff --git a/connectivity/NetworkConnect/src/main/res/layout/log_fragment.xml b/connectivity/NetworkConnect/NetworkConnect/src/main/res/layout/log_fragment.xml
similarity index 100%
rename from connectivity/NetworkConnect/src/main/res/layout/log_fragment.xml
rename to connectivity/NetworkConnect/NetworkConnect/src/main/res/layout/log_fragment.xml

diff --git a/connectivity/NetworkConnect/src/main/res/menu/main.xml b/connectivity/NetworkConnect/NetworkConnect/src/main/res/menu/main.xml
similarity index 100%
rename from connectivity/NetworkConnect/src/main/res/menu/main.xml
rename to connectivity/NetworkConnect/NetworkConnect/src/main/res/menu/main.xml

diff --git a/connectivity/NetworkConnect/src/main/res/values-sw600dp/styles.xml b/connectivity/NetworkConnect/NetworkConnect/src/main/res/values-sw600dp/styles.xml
similarity index 100%
rename from connectivity/NetworkConnect/src/main/res/values-sw600dp/styles.xml
rename to connectivity/NetworkConnect/NetworkConnect/src/main/res/values-sw600dp/styles.xml

diff --git a/connectivity/NetworkConnect/src/main/res/values-v11/styles.xml b/connectivity/NetworkConnect/NetworkConnect/src/main/res/values-v11/styles.xml
similarity index 100%
rename from connectivity/NetworkConnect/src/main/res/values-v11/styles.xml
rename to connectivity/NetworkConnect/NetworkConnect/src/main/res/values-v11/styles.xml

diff --git a/connectivity/NetworkConnect/src/main/res/values/dimens.xml b/connectivity/NetworkConnect/NetworkConnect/src/main/res/values/dimens.xml
similarity index 100%
rename from connectivity/NetworkConnect/src/main/res/values/dimens.xml
rename to connectivity/NetworkConnect/NetworkConnect/src/main/res/values/dimens.xml

diff --git a/connectivity/NetworkConnect/src/main/res/values/strings.xml b/connectivity/NetworkConnect/NetworkConnect/src/main/res/values/strings.xml
similarity index 100%
rename from connectivity/NetworkConnect/src/main/res/values/strings.xml
rename to connectivity/NetworkConnect/NetworkConnect/src/main/res/values/strings.xml

diff --git a/connectivity/NetworkConnect/src/main/res/values/styles.xml b/connectivity/NetworkConnect/NetworkConnect/src/main/res/values/styles.xml
similarity index 100%
rename from connectivity/NetworkConnect/src/main/res/values/styles.xml
rename to connectivity/NetworkConnect/NetworkConnect/src/main/res/values/styles.xml

diff --git a/connectivity/NetworkConnect/build.gradle b/connectivity/NetworkConnect/build.gradle
index e3b2dce..495c503 100644
--- a/connectivity/NetworkConnect/build.gradle
+++ b/connectivity/NetworkConnect/build.gradle

@@ -1,18 +1 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.+'
-    }
-}
-apply plugin: 'android'
-
-dependencies {
-    compile "com.android.support:support-v4:18.0.+"
-}
-
-android {
-    compileSdkVersion 17
-    buildToolsVersion "17.0.0"
-}
+// Top-level build file where you can add configuration options common to all sub-projects/modules.

diff --git a/connectivity/NetworkConnect/settings.gradle b/connectivity/NetworkConnect/settings.gradle
new file mode 100644
index 0000000..771d665
--- /dev/null
+++ b/connectivity/NetworkConnect/settings.gradle

@@ -0,0 +1 @@
+include ':NetworkConnect'