Merge branch 'audiorecorder-1.2.1'

app/build.gradle

@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.0"
 
     defaultConfig {
         applicationId "com.github.axet.audiorecorder"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 88
-        versionName "1.2.0"
+        versionCode 89
+        versionName "1.2.1"
     }
     signingConfigs {
         release {
@@ -38,11 +38,11 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.2.1'
-    compile 'com.android.support:support-v4:23.2.1'
-    compile 'com.android.support:preference-v14:23.2.1'
-    compile 'com.android.support:design:23.2.1'
-    compile 'com.google.android.gms:play-services-appindexing:8.1.0'
+    compile 'com.android.support:appcompat-v7:25.0.1'
+    compile 'com.android.support:support-v4:25.0.1'
+    compile 'com.android.support:preference-v14:25.0.1'
+    compile 'com.android.support:design:25.0.1'
+    compile 'com.google.android.gms:play-services-appindexing:9.8.0'
     compile 'org.apache.commons:commons-math3:3.6.1'
-    compile 'com.github.axet:android-library:1.5.0' // project(':android-library')
+    compile 'com.github.axet:android-library:1.6.7' // project(':android-library')
 }

app/src/main/res/xml-ru/pref_general.xml

@@ -26,6 +26,16 @@
         android:summary="Формат выходного файла (.wav, .m4a, ...)"
         android:title="Кодировка" />
 
+    <ListPreference
+        android:defaultValue="1"
+        android:entries="@array/channels_text"
+        android:entryValues="@array/channels_values"
+        android:key="channels"
+        android:negativeButtonText="@null"
+        android:positiveButtonText="@null"
+        android:summary="Режим записи"
+        android:title="Режим" />
+
     <SwitchPreference
         android:defaultValue="true"
         android:key="call"

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.1'
+        classpath 'com.android.tools.build:gradle:2.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files