Merge changes Iecfa6cb6,I34f314a0,I9f85172e,I8e2e61be,Iddfbe12e,Ie2e088ec,I1aa3268f into jb-mr2-dev
* changes:
Update NetworkConnect sample to use Gradle for build
Update BasicNetworkSample to use Gradle for build
Move BasicSyncAdapter to "connectivity"
Code sample: connect to network, fetch raw HTML
Sample app: basic network connection
Rename "Multitouch" directory to "multitouch"
Add Android dependency to actionbarcompat samples
diff --git a/ui/holo/BorderlessButtons/BorderlessButtons/build.gradle b/ui/holo/BorderlessButtons/BorderlessButtons/build.gradle
new file mode 100644
index 0000000..dd97c2b
--- /dev/null
+++ b/ui/holo/BorderlessButtons/BorderlessButtons/build.gradle
@@ -0,0 +1,19 @@
+buildscript {
+ repositories {
+ maven { url 'http://repo1.maven.org/maven2' }
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:0.5.+'
+ }
+}
+apply plugin: 'android'
+
+android {
+ compileSdkVersion 17
+ buildToolsVersion "17.0.0"
+
+ defaultConfig {
+ minSdkVersion 14
+ targetSdkVersion 17
+ }
+}
diff --git a/ui/holo/BorderlessButtons/AndroidManifest.xml b/ui/holo/BorderlessButtons/BorderlessButtons/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/holo/BorderlessButtons/AndroidManifest.xml
rename to ui/holo/BorderlessButtons/BorderlessButtons/src/main/AndroidManifest.xml
diff --git a/ui/holo/BorderlessButtons/big_icon.png b/ui/holo/BorderlessButtons/BorderlessButtons/src/main/big_icon.png
similarity index 100%
rename from ui/holo/BorderlessButtons/big_icon.png
rename to ui/holo/BorderlessButtons/BorderlessButtons/src/main/big_icon.png
Binary files differ
diff --git a/ui/holo/BorderlessButtons/src/com/example/android/borderlessbuttons/MainActivity.java b/ui/holo/BorderlessButtons/BorderlessButtons/src/main/java/com/example/android/borderlessbuttons/MainActivity.java
similarity index 100%
rename from ui/holo/BorderlessButtons/src/com/example/android/borderlessbuttons/MainActivity.java
rename to ui/holo/BorderlessButtons/BorderlessButtons/src/main/java/com/example/android/borderlessbuttons/MainActivity.java
diff --git a/ui/holo/BorderlessButtons/res/drawable-hdpi/ic_action_delete.png b/ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/drawable-hdpi/ic_action_delete.png
similarity index 100%
rename from ui/holo/BorderlessButtons/res/drawable-hdpi/ic_action_delete.png
rename to ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/drawable-hdpi/ic_action_delete.png
Binary files differ
diff --git a/ui/holo/BorderlessButtons/res/drawable-hdpi/ic_launcher.png b/ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/holo/BorderlessButtons/res/drawable-hdpi/ic_launcher.png
rename to ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/holo/BorderlessButtons/res/drawable-mdpi/ic_action_delete.png b/ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/drawable-mdpi/ic_action_delete.png
similarity index 100%
rename from ui/holo/BorderlessButtons/res/drawable-mdpi/ic_action_delete.png
rename to ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/drawable-mdpi/ic_action_delete.png
Binary files differ
diff --git a/ui/holo/BorderlessButtons/res/drawable-mdpi/ic_launcher.png b/ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/holo/BorderlessButtons/res/drawable-mdpi/ic_launcher.png
rename to ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/holo/BorderlessButtons/res/drawable-xhdpi/ic_action_delete.png b/ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/drawable-xhdpi/ic_action_delete.png
similarity index 100%
rename from ui/holo/BorderlessButtons/res/drawable-xhdpi/ic_action_delete.png
rename to ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/drawable-xhdpi/ic_action_delete.png
Binary files differ
diff --git a/ui/holo/BorderlessButtons/res/drawable-xhdpi/ic_launcher.png b/ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/holo/BorderlessButtons/res/drawable-xhdpi/ic_launcher.png
rename to ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/holo/BorderlessButtons/res/drawable-xxhdpi/ic_launcher.png b/ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/holo/BorderlessButtons/res/drawable-xxhdpi/ic_launcher.png
rename to ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/holo/BorderlessButtons/res/layout/activity_main.xml b/ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/layout/activity_main.xml
similarity index 100%
rename from ui/holo/BorderlessButtons/res/layout/activity_main.xml
rename to ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/layout/activity_main.xml
diff --git a/ui/holo/BorderlessButtons/res/layout/list_item.xml b/ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/layout/list_item.xml
similarity index 100%
rename from ui/holo/BorderlessButtons/res/layout/list_item.xml
rename to ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/layout/list_item.xml
diff --git a/ui/holo/BorderlessButtons/res/menu/main.xml b/ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/menu/main.xml
similarity index 100%
rename from ui/holo/BorderlessButtons/res/menu/main.xml
rename to ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/menu/main.xml
diff --git a/ui/holo/BorderlessButtons/res/values-sw600dp/dimens.xml b/ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/values-sw600dp/dimens.xml
similarity index 100%
rename from ui/holo/BorderlessButtons/res/values-sw600dp/dimens.xml
rename to ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/values-sw600dp/dimens.xml
diff --git a/ui/holo/BorderlessButtons/res/values-sw600dp/styles.xml b/ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/values-sw600dp/styles.xml
similarity index 100%
rename from ui/holo/BorderlessButtons/res/values-sw600dp/styles.xml
rename to ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/values-sw600dp/styles.xml
diff --git a/ui/holo/BorderlessButtons/res/values/dimens.xml b/ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/values/dimens.xml
similarity index 100%
rename from ui/holo/BorderlessButtons/res/values/dimens.xml
rename to ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/values/dimens.xml
diff --git a/ui/holo/BorderlessButtons/res/values/strings.xml b/ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/values/strings.xml
similarity index 100%
rename from ui/holo/BorderlessButtons/res/values/strings.xml
rename to ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/values/strings.xml
diff --git a/ui/holo/BorderlessButtons/res/values/styles.xml b/ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/values/styles.xml
similarity index 100%
rename from ui/holo/BorderlessButtons/res/values/styles.xml
rename to ui/holo/BorderlessButtons/BorderlessButtons/src/main/res/values/styles.xml
diff --git a/ui/holo/BorderlessButtons/build.gradle b/ui/holo/BorderlessButtons/build.gradle
new file mode 100644
index 0000000..f82180e
--- /dev/null
+++ b/ui/holo/BorderlessButtons/build.gradle
@@ -0,0 +1,2 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
diff --git a/ui/holo/BorderlessButtons/settings.gradle b/ui/holo/BorderlessButtons/settings.gradle
new file mode 100644
index 0000000..d543498
--- /dev/null
+++ b/ui/holo/BorderlessButtons/settings.gradle
@@ -0,0 +1 @@
+include ':BorderlessButtons'
