Merge pull request #174 from mutahirqureshi/asset-cleanup

Launcher assets cleanup & remove gradle 0.12.0 manifest merging bug workaround
yixia · Jul 4, 2014 · 8d31248 · 8d31248
2 parents 7ad594c + 29e3b71
commit 8d31248
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 4 deletions.
diff --git a/vitamio-sample/build.gradle b/vitamio-sample/build.gradle
@@ -7,7 +7,6 @@ dependencies {
 android {
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
     buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
-    useOldManifestMerger true
 
     defaultConfig {
         minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)

diff --git a/vitamio/AndroidManifest.xml b/vitamio/AndroidManifest.xml
@@ -7,9 +7,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
-    <application
-            android:icon="@drawable/ic_launcher"
-            android:label="Vitamio">
+    <application>
         <activity
                 android:name="io.vov.vitamio.activity.InitActivity"
                 android:configChanges="orientation|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"

diff --git a/vitamio/res/drawable-hdpi/ic_launcher.png b/vitamio/res/drawable-hdpi/ic_launcher.png
diff --git a/vitamio/res/drawable-ldpi/ic_launcher.png b/vitamio/res/drawable-ldpi/ic_launcher.png
diff --git a/vitamio/res/drawable-mdpi/ic_launcher.png b/vitamio/res/drawable-mdpi/ic_launcher.png
diff --git a/vitamio/res/drawable-xhdpi/ic_launcher.png b/vitamio/res/drawable-xhdpi/ic_launcher.png