Merge pull request sephiroth74#75 from sephiroth74/overlays

Overlays

build.gradle

@@ -1,11 +1,11 @@
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
         mavenLocal()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.2'
+        classpath 'com.android.tools.build:gradle:1.2.3'
     }
 }
 
@@ -26,5 +26,5 @@ allprojects {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '1.12'
+    gradleVersion = '2.4'
 }

demo/AndroidManifest.xml

@@ -11,7 +11,8 @@
     <application
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:hardwareAccelerated="true" >
+        android:hardwareAccelerated="true"
+	    android:largeHeap="true">
         <activity android:name=".ImageViewTestActivity" 
             android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>

demo/build.gradle

@@ -1,19 +1,19 @@
 
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 dependencies {
     compile project(':library')
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '20.0.0'
+    compileSdkVersion 21
+    buildToolsVersion '22.0.1'
 
     defaultConfig {
         versionCode 1
         versionName '1.0.0'
         minSdkVersion 9
-        targetSdkVersion 19
+        targetSdkVersion 21
     }
 
     sourceSets {

demo/res/layout/main.xml

@@ -4,6 +4,13 @@
 	android:layout_height="fill_parent"
 	android:orientation="vertical">
 
+	<!--<it.sephiroth.android.library.imagezoom.test.ImageViewOverlay-->
+		<!--android:padding="0dip"-->
+		<!--android:id="@+id/image"-->
+		<!--android:layout_width="match_parent"-->
+		<!--android:layout_height="0dp"-->
+		<!--android:layout_weight="1" />-->
+
 	<it.sephiroth.android.library.imagezoom.ImageViewTouch
 		android:id="@+id/image"
 		android:layout_width="match_parent"