Merge branch 'audiorecorder-1.1.49'

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.github.axet.audiorecorder"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 70
-        versionName "1.1.48"
+        versionCode 71
+        versionName "1.1.49"
     }
     signingConfigs {
         release {
@@ -44,5 +44,5 @@ dependencies {
     compile 'com.android.support:design:23.2.1'
     compile 'com.google.android.gms:play-services-appindexing:8.1.0'
     compile 'org.apache.commons:commons-math3:3.6.1'
-    compile 'com.github.axet:android-library:1.1.3' // project(':android-library')
+    compile 'com.github.axet:android-library:1.5.0' // project(':android-library')
 }

app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java

@@ -10,7 +10,6 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.graphics.Point;
 import android.graphics.drawable.ColorDrawable;
 import android.media.AudioFormat;
 import android.media.AudioRecord;
@@ -28,7 +27,6 @@ import android.telephony.PhoneStateListener;
 import android.telephony.TelephonyManager;
 import android.util.DisplayMetrics;
 import android.util.Log;
-import android.view.Display;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowManager;
@@ -37,8 +35,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.github.axet.audiorecorder.R;
 import com.github.axet.androidlibrary.animations.MarginBottomAnimation;
+import com.github.axet.audiorecorder.R;
 import com.github.axet.audiorecorder.app.MainApplication;
 import com.github.axet.audiorecorder.app.RawSamples;
 import com.github.axet.audiorecorder.app.Sound;
@@ -787,6 +785,7 @@ public class RecordingActivity extends AppCompatActivity {
         d.setTitle(getString(R.string.encoding_title));
         d.setMessage(".../" + targetFile.getName());
         d.setMax(100);
+        d.setCancelable(false);
         d.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
         d.setIndeterminate(false);
         d.show();

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -19,7 +19,7 @@ allprojects {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.14.1'
+    gradleVersion = '3.0'
 }
 
 task clean(type: Delete) {