From 9b5780bbb00ad2065e5a45e56a5794f730869c98 Mon Sep 17 00:00:00 2001 From: jendib Date: Tue, 24 Mar 2015 01:07:32 +0100 Subject: [PATCH] Android: API 22 --- docs-android/app/app.iml | 34 +++++++++--------- docs-android/app/build.gradle | 12 +++---- docs-android/app/src/main/AndroidManifest.xml | 8 ++++- .../com/sismics/docs/MainApplication.java | 1 + .../main/res/layout/file_viewpager_item.xml | 2 +- .../ic_launcher.png | Bin .../ic_launcher.png | Bin 7 files changed, 33 insertions(+), 24 deletions(-) rename docs-android/app/src/main/res/{drawable-xhdpi => mipmap-xhdpi}/ic_launcher.png (100%) rename docs-android/app/src/main/res/{drawable-xxhdpi => mipmap-xxhdpi}/ic_launcher.png (100%) diff --git a/docs-android/app/app.iml b/docs-android/app/app.iml index 59404e26..11564944 100644 --- a/docs-android/app/app.iml +++ b/docs-android/app/app.iml @@ -1,5 +1,5 @@ - + @@ -9,11 +9,13 @@ + @@ -32,12 +35,12 @@ - - - - - - + + + + + + @@ -95,19 +98,18 @@ - + - - + - - + + + - - + \ No newline at end of file diff --git a/docs-android/app/build.gradle b/docs-android/app/build.gradle index 4e0567b0..6777c39e 100644 --- a/docs-android/app/build.gradle +++ b/docs-android/app/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.android.tools.build:gradle:1.1.0' } } apply plugin: 'com.android.application' @@ -13,12 +13,12 @@ repositories { } android { - compileSdkVersion 21 - buildToolsVersion "21.1.2" + compileSdkVersion 22 + buildToolsVersion "22.0.1" defaultConfig { minSdkVersion 14 - targetSdkVersion 21 + targetSdkVersion 22 versionCode 1 versionName "1.0" } @@ -31,8 +31,8 @@ android { dependencies { compile fileTree(dir: 'libs', include: '*.jar') - compile 'com.android.support:appcompat-v7:21.0.3' - compile 'com.android.support:recyclerview-v7:21.0.0' + compile 'com.android.support:appcompat-v7:22.0.0' + compile 'com.android.support:recyclerview-v7:22.0.0' compile 'com.loopj.android:android-async-http:1.4.6' compile 'it.sephiroth.android.library.imagezoom:imagezoom:1.0.5' compile 'de.greenrobot:eventbus:2.4.0' diff --git a/docs-android/app/src/main/AndroidManifest.xml b/docs-android/app/src/main/AndroidManifest.xml index c30d847e..b38e3f46 100644 --- a/docs-android/app/src/main/AndroidManifest.xml +++ b/docs-android/app/src/main/AndroidManifest.xml @@ -11,7 +11,7 @@ + + + + + + + android:src="@mipmap/ic_launcher"/> diff --git a/docs-android/app/src/main/res/drawable-xhdpi/ic_launcher.png b/docs-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from docs-android/app/src/main/res/drawable-xhdpi/ic_launcher.png rename to docs-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/docs-android/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/docs-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from docs-android/app/src/main/res/drawable-xxhdpi/ic_launcher.png rename to docs-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png