Google Git
Sign in
ara-mdk / platform / developers / samples / android / fb177f0083de35ef213bb94b2ad1fca83d716bc5^! / .
commitfb177f0083de35ef213bb94b2ad1fca83d716bc5[log] [tgz]
authorTrevor Johns <trevorjohns@google.com>Tue Jul 23 13:28:28 2013 -0700
committerTrevor Johns <trevorjohns@google.com>Tue Jul 23 13:29:11 2013 -0700
treef06b26a6ca77514660c2292d230e4d3c01028c2c
parent777c654302ce44b5450c3a82647b672299ce8530 [diff]
Update ActionBarCompat "Basic" sample to use 2-level layout

Adding sub-project for consistency with other projects.

Change-Id: Ie47af76e8d6c1898e5dfa70fa087a3899bb8ec5d

diff --git a/ui/actionbarcompat/Basic/Basic/build.gradle b/ui/actionbarcompat/Basic/Basic/build.gradle
new file mode 100644
index 0000000..13f4f48
--- /dev/null
+++ b/ui/actionbarcompat/Basic/Basic/build.gradle

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

diff --git a/ui/actionbarcompat/Basic/src/main/AndroidManifest.xml b/ui/actionbarcompat/Basic/Basic/src/main/AndroidManifest.xml
similarity index 100%
rename from ui/actionbarcompat/Basic/src/main/AndroidManifest.xml
rename to ui/actionbarcompat/Basic/Basic/src/main/AndroidManifest.xml

diff --git a/ui/actionbarcompat/Basic/src/main/res/drawable-hdpi/ic_action_location.png b/ui/actionbarcompat/Basic/Basic/src/main/res/drawable-hdpi/ic_action_location.png
similarity index 100%
rename from ui/actionbarcompat/Basic/src/main/res/drawable-hdpi/ic_action_location.png
rename to ui/actionbarcompat/Basic/Basic/src/main/res/drawable-hdpi/ic_action_location.png
Binary files differ

diff --git a/ui/actionbarcompat/Basic/src/main/res/drawable-hdpi/ic_action_refresh.png b/ui/actionbarcompat/Basic/Basic/src/main/res/drawable-hdpi/ic_action_refresh.png
similarity index 100%
rename from ui/actionbarcompat/Basic/src/main/res/drawable-hdpi/ic_action_refresh.png
rename to ui/actionbarcompat/Basic/Basic/src/main/res/drawable-hdpi/ic_action_refresh.png
Binary files differ

diff --git a/ui/actionbarcompat/Basic/src/main/res/drawable-hdpi/ic_action_settings.png b/ui/actionbarcompat/Basic/Basic/src/main/res/drawable-hdpi/ic_action_settings.png
similarity index 100%
rename from ui/actionbarcompat/Basic/src/main/res/drawable-hdpi/ic_action_settings.png
rename to ui/actionbarcompat/Basic/Basic/src/main/res/drawable-hdpi/ic_action_settings.png
Binary files differ

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

diff --git a/ui/actionbarcompat/Basic/src/main/res/drawable-mdpi/ic_action_location.png b/ui/actionbarcompat/Basic/Basic/src/main/res/drawable-mdpi/ic_action_location.png
similarity index 100%
rename from ui/actionbarcompat/Basic/src/main/res/drawable-mdpi/ic_action_location.png
rename to ui/actionbarcompat/Basic/Basic/src/main/res/drawable-mdpi/ic_action_location.png
Binary files differ

diff --git a/ui/actionbarcompat/Basic/src/main/res/drawable-mdpi/ic_action_refresh.png b/ui/actionbarcompat/Basic/Basic/src/main/res/drawable-mdpi/ic_action_refresh.png
similarity index 100%
rename from ui/actionbarcompat/Basic/src/main/res/drawable-mdpi/ic_action_refresh.png
rename to ui/actionbarcompat/Basic/Basic/src/main/res/drawable-mdpi/ic_action_refresh.png
Binary files differ

diff --git a/ui/actionbarcompat/Basic/src/main/res/drawable-mdpi/ic_action_settings.png b/ui/actionbarcompat/Basic/Basic/src/main/res/drawable-mdpi/ic_action_settings.png
similarity index 100%
rename from ui/actionbarcompat/Basic/src/main/res/drawable-mdpi/ic_action_settings.png
rename to ui/actionbarcompat/Basic/Basic/src/main/res/drawable-mdpi/ic_action_settings.png
Binary files differ

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

diff --git a/ui/actionbarcompat/Basic/src/main/res/drawable-xhdpi/ic_action_location.png b/ui/actionbarcompat/Basic/Basic/src/main/res/drawable-xhdpi/ic_action_location.png
similarity index 100%
rename from ui/actionbarcompat/Basic/src/main/res/drawable-xhdpi/ic_action_location.png
rename to ui/actionbarcompat/Basic/Basic/src/main/res/drawable-xhdpi/ic_action_location.png
Binary files differ

diff --git a/ui/actionbarcompat/Basic/src/main/res/drawable-xhdpi/ic_action_refresh.png b/ui/actionbarcompat/Basic/Basic/src/main/res/drawable-xhdpi/ic_action_refresh.png
similarity index 100%
rename from ui/actionbarcompat/Basic/src/main/res/drawable-xhdpi/ic_action_refresh.png
rename to ui/actionbarcompat/Basic/Basic/src/main/res/drawable-xhdpi/ic_action_refresh.png
Binary files differ

diff --git a/ui/actionbarcompat/Basic/src/main/res/drawable-xhdpi/ic_action_settings.png b/ui/actionbarcompat/Basic/Basic/src/main/res/drawable-xhdpi/ic_action_settings.png
similarity index 100%
rename from ui/actionbarcompat/Basic/src/main/res/drawable-xhdpi/ic_action_settings.png
rename to ui/actionbarcompat/Basic/Basic/src/main/res/drawable-xhdpi/ic_action_settings.png
Binary files differ

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

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

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

diff --git a/ui/actionbarcompat/Basic/src/main/res/menu/main.xml b/ui/actionbarcompat/Basic/Basic/src/main/res/menu/main.xml
similarity index 100%
rename from ui/actionbarcompat/Basic/src/main/res/menu/main.xml
rename to ui/actionbarcompat/Basic/Basic/src/main/res/menu/main.xml

diff --git a/ui/actionbarcompat/Basic/src/main/res/values/ids.xml b/ui/actionbarcompat/Basic/Basic/src/main/res/values/ids.xml
similarity index 100%
rename from ui/actionbarcompat/Basic/src/main/res/values/ids.xml
rename to ui/actionbarcompat/Basic/Basic/src/main/res/values/ids.xml

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

diff --git a/ui/actionbarcompat/Basic/src/main/src/com/example/android/actionbarcompat/basic/MainActivity.java b/ui/actionbarcompat/Basic/Basic/src/main/src/com/example/android/actionbarcompat/basic/MainActivity.java
similarity index 100%
rename from ui/actionbarcompat/Basic/src/main/src/com/example/android/actionbarcompat/basic/MainActivity.java
rename to ui/actionbarcompat/Basic/Basic/src/main/src/com/example/android/actionbarcompat/basic/MainActivity.java

diff --git a/ui/actionbarcompat/Basic/build.gradle b/ui/actionbarcompat/Basic/build.gradle
index 13f4f48..495c503 100644
--- a/ui/actionbarcompat/Basic/build.gradle
+++ b/ui/actionbarcompat/Basic/build.gradle

@@ -1,19 +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.+"
-    compile "com.android.support:appcompat-v7: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/ui/actionbarcompat/Basic/settings.gradle b/ui/actionbarcompat/Basic/settings.gradle
new file mode 100644
index 0000000..56d763b
--- /dev/null
+++ b/ui/actionbarcompat/Basic/settings.gradle

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