commit | 743f2786d8ae5c8b74d8b61a75893f7862b9382e | [log] [tgz] |
---|---|---|
author | Trevor Johns <trevorjohns@google.com> | Mon Jul 22 23:11:33 2013 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jul 22 23:11:33 2013 +0000 |
tree | b16837dd545503bbe00709809ad58d60bbb5f71b | |
parent | 87079247cbd1468a3b990ab4191f62f700825f9e [diff] | |
parent | 13418930a695ded96507ae52f55cd65f42f0b643 [diff] |
Merge "CustomChoiceList: Convert build to gradle" into jb-mr2-dev
diff --git a/ui/lists/CustomChoiceList/CustomChoiceList/build.gradle b/ui/lists/CustomChoiceList/CustomChoiceList/build.gradle new file mode 100644 index 0000000..0567910 --- /dev/null +++ b/ui/lists/CustomChoiceList/CustomChoiceList/build.gradle
@@ -0,0 +1,20 @@ +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 3 + targetSdkVersion 17 + } +} +
diff --git a/ui/lists/CustomChoiceList/AndroidManifest.xml b/ui/lists/CustomChoiceList/CustomChoiceList/src/main/AndroidManifest.xml similarity index 100% rename from ui/lists/CustomChoiceList/AndroidManifest.xml rename to ui/lists/CustomChoiceList/CustomChoiceList/src/main/AndroidManifest.xml
diff --git a/ui/lists/CustomChoiceList/src/com/example/android/customchoicelist/CheckableLinearLayout.java b/ui/lists/CustomChoiceList/CustomChoiceList/src/main/java/com/example/android/customchoicelist/CheckableLinearLayout.java similarity index 100% rename from ui/lists/CustomChoiceList/src/com/example/android/customchoicelist/CheckableLinearLayout.java rename to ui/lists/CustomChoiceList/CustomChoiceList/src/main/java/com/example/android/customchoicelist/CheckableLinearLayout.java
diff --git a/ui/lists/CustomChoiceList/src/com/example/android/customchoicelist/Cheeses.java b/ui/lists/CustomChoiceList/CustomChoiceList/src/main/java/com/example/android/customchoicelist/Cheeses.java similarity index 100% rename from ui/lists/CustomChoiceList/src/com/example/android/customchoicelist/Cheeses.java rename to ui/lists/CustomChoiceList/CustomChoiceList/src/main/java/com/example/android/customchoicelist/Cheeses.java
diff --git a/ui/lists/CustomChoiceList/src/com/example/android/customchoicelist/MainActivity.java b/ui/lists/CustomChoiceList/CustomChoiceList/src/main/java/com/example/android/customchoicelist/MainActivity.java similarity index 100% rename from ui/lists/CustomChoiceList/src/com/example/android/customchoicelist/MainActivity.java rename to ui/lists/CustomChoiceList/CustomChoiceList/src/main/java/com/example/android/customchoicelist/MainActivity.java
diff --git a/ui/lists/CustomChoiceList/res/color/hideable_text_color.xml b/ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/color/hideable_text_color.xml similarity index 100% rename from ui/lists/CustomChoiceList/res/color/hideable_text_color.xml rename to ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/color/hideable_text_color.xml
diff --git a/ui/lists/CustomChoiceList/res/drawable-hdpi/ic_launcher.png b/ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from ui/lists/CustomChoiceList/res/drawable-hdpi/ic_launcher.png rename to ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/drawable-hdpi/ic_launcher.png Binary files differ
diff --git a/ui/lists/CustomChoiceList/res/drawable-mdpi/ic_launcher.png b/ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from ui/lists/CustomChoiceList/res/drawable-mdpi/ic_launcher.png rename to ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/drawable-mdpi/ic_launcher.png Binary files differ
diff --git a/ui/lists/CustomChoiceList/res/drawable-xhdpi/ic_hideable_item_checked.png b/ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/drawable-xhdpi/ic_hideable_item_checked.png similarity index 100% rename from ui/lists/CustomChoiceList/res/drawable-xhdpi/ic_hideable_item_checked.png rename to ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/drawable-xhdpi/ic_hideable_item_checked.png Binary files differ
diff --git a/ui/lists/CustomChoiceList/res/drawable-xhdpi/ic_hideable_item_unchecked.png b/ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/drawable-xhdpi/ic_hideable_item_unchecked.png similarity index 100% rename from ui/lists/CustomChoiceList/res/drawable-xhdpi/ic_hideable_item_unchecked.png rename to ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/drawable-xhdpi/ic_hideable_item_unchecked.png Binary files differ
diff --git a/ui/lists/CustomChoiceList/res/drawable-xhdpi/ic_launcher.png b/ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from ui/lists/CustomChoiceList/res/drawable-xhdpi/ic_launcher.png rename to ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/drawable-xhdpi/ic_launcher.png Binary files differ
diff --git a/ui/lists/CustomChoiceList/res/drawable-xxhdpi/ic_launcher.png b/ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from ui/lists/CustomChoiceList/res/drawable-xxhdpi/ic_launcher.png rename to ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/drawable-xxhdpi/ic_launcher.png Binary files differ
diff --git a/ui/lists/CustomChoiceList/res/drawable/ic_hideable_item.xml b/ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/drawable/ic_hideable_item.xml similarity index 100% rename from ui/lists/CustomChoiceList/res/drawable/ic_hideable_item.xml rename to ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/drawable/ic_hideable_item.xml
diff --git a/ui/lists/CustomChoiceList/res/layout/activity_main.xml b/ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/layout/activity_main.xml similarity index 100% rename from ui/lists/CustomChoiceList/res/layout/activity_main.xml rename to ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/layout/activity_main.xml
diff --git a/ui/lists/CustomChoiceList/res/layout/list_item.xml b/ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/layout/list_item.xml similarity index 100% rename from ui/lists/CustomChoiceList/res/layout/list_item.xml rename to ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/layout/list_item.xml
diff --git a/ui/lists/CustomChoiceList/res/values-sw600dp/dimens.xml b/ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/values-sw600dp/dimens.xml similarity index 100% rename from ui/lists/CustomChoiceList/res/values-sw600dp/dimens.xml rename to ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/values-sw600dp/dimens.xml
diff --git a/ui/lists/CustomChoiceList/res/values-sw600dp/styles.xml b/ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/values-sw600dp/styles.xml similarity index 100% rename from ui/lists/CustomChoiceList/res/values-sw600dp/styles.xml rename to ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/values-sw600dp/styles.xml
diff --git a/ui/lists/CustomChoiceList/res/values-v11/styles.xml b/ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/values-v11/styles.xml similarity index 100% rename from ui/lists/CustomChoiceList/res/values-v11/styles.xml rename to ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/values-v11/styles.xml
diff --git a/ui/lists/CustomChoiceList/res/values/dimens.xml b/ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/values/dimens.xml similarity index 100% rename from ui/lists/CustomChoiceList/res/values/dimens.xml rename to ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/values/dimens.xml
diff --git a/ui/lists/CustomChoiceList/res/values/strings.xml b/ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/values/strings.xml similarity index 100% rename from ui/lists/CustomChoiceList/res/values/strings.xml rename to ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/values/strings.xml
diff --git a/ui/lists/CustomChoiceList/res/values/styles.xml b/ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/values/styles.xml similarity index 100% rename from ui/lists/CustomChoiceList/res/values/styles.xml rename to ui/lists/CustomChoiceList/CustomChoiceList/src/main/res/values/styles.xml
diff --git a/ui/lists/CustomChoiceList/build.gradle b/ui/lists/CustomChoiceList/build.gradle new file mode 100644 index 0000000..f82180e --- /dev/null +++ b/ui/lists/CustomChoiceList/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/lists/CustomChoiceList/settings.gradle b/ui/lists/CustomChoiceList/settings.gradle new file mode 100644 index 0000000..0c9c7b4 --- /dev/null +++ b/ui/lists/CustomChoiceList/settings.gradle
@@ -0,0 +1 @@ +include ':CustomChoiceList'