bitPickups/android-audio-recorder
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'audiorecorder-1.2.6'

Browse source
This commit is contained in:
Alexey Kuznetsov 2017-02-08 22:10:48 +03:00
commit a5cc8dcff9
4 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/build.gradle
View file

@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 25
buildToolsVersion "25.0.0"
buildToolsVersion "25.0.2"
defaultConfig {
applicationId "com.github.axet.audiorecorder"
minSdkVersion 9
targetSdkVersion 23
versionCode 93
versionName "1.2.5"
versionCode 94
versionName "1.2.6"
}
signingConfigs {
release {
@ -38,10 +38,10 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:25.1.0'
compile 'com.android.support:support-v4:25.1.0'
compile 'com.android.support:design:25.1.0'
compile 'com.android.support:appcompat-v7:25.1.1'
compile 'com.android.support:support-v4:25.1.1'
compile 'com.android.support:design:25.1.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.6.9' // compile project(':android-library')
compile 'com.github.axet:android-library:1.7.4' // compile project(':android-library')
}

4
app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java
View file

@ -631,7 +631,9 @@ public class MainActivity extends AppCompatActivity implements AbsListView.OnScr
}
}
public static final String[] PERMISSIONS = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
public static final String READ_EXTERNAL_STORAGE = "android.permission.READ_EXTERNAL_STORAGE"; // Manifest.permission.READ_EXTERNAL_STORAGE
public static final String[] PERMISSIONS = new String[]{READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
boolean permitted(String[] ss) {
if (Build.VERSION.SDK_INT < 11)

2
app/src/main/java/com/github/axet/audiorecorder/widgets/PitchView.java
View file

@ -137,10 +137,8 @@ public class PitchView extends ViewGroup {
@Override
void post(long delay) {
if (delay < slow) {
Log.d(TAG, "fallback " + delay + " " + slow);
this.fallback.run();
} else {
Log.d(TAG, "run " + delay + " " + slow);
this.run.run();
}
if (delay > 0)

2
app/src/main/res/layout/activity_main.xml
View file

@ -18,9 +18,7 @@
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/AppThemeLight.AppBarOverlay"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/AppThemeLight.PopupOverlay" />
</android.support.design.widget.AppBarLayout>
<include layout="@layout/content_main" />