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

Merge branch 'audiorecorder-1.4.14'

Browse source
This commit is contained in:
Alexey Kuznetsov 2017-03-15 17:20:44 +03:00
commit a325efdcbc
2 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle
View file

@ -8,8 +8,8 @@ android {
applicationId "com.github.axet.audiorecorder"
minSdkVersion 9
targetSdkVersion 23
versionCode 115
versionName "1.4.13"
versionCode 116
versionName "1.4.14"
}
signingConfigs {
release {
@ -43,5 +43,5 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.github.axet:android-audio-library:0.0.16' // compile project(':android-audio-library')
compile 'com.github.axet:android-audio-library:0.0.17' // compile project(':android-audio-library')
}

5
app/src/main/java/com/github/axet/audiorecorder/activities/SettingsActivity.java
View file

@ -269,11 +269,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity implements Sha
addPreferencesFromResource(R.xml.pref_general);
setHasOptionsMenu(true);
if (!Storage.permitted(getActivity(), PERMISSIONS)) {
Preference p = findPreference(MainApplication.PREFERENCE_STORAGE);
getPreferenceScreen().removePreference(p);
}
ListPreference enc = (ListPreference) findPreference(MainApplication.PREFERENCE_ENCODING);
String v = enc.getValue();
CharSequence[] ee = Factory.getEncodingTexts(getActivity());